[gnome-applets/wip/muktupavels/tracker-search-bar] tracker-search-bar: port to libgnome-panel

From: Alberts Muktupāvels <muktupavels src gnome org>
To: commits-list gnome org
Cc:
Subject: [gnome-applets/wip/muktupavels/tracker-search-bar] tracker-search-bar: port to libgnome-panel
Date: Tue, 31 Mar 2020 11:38:04 +0000 (UTC)
commit fc61bb7406f5e3375d7c7ac41d2d0f56df2b4bb1
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Tue Mar 31 14:30:36 2020 +0300

    tracker-search-bar: port to libgnome-panel

 Makefile.am                                        |   6 -
 configure.ac                                       |   9 +-
 gnome-applets/Makefile.am                          |  24 ++
 gnome-applets/ga-module.c                          |  19 ++
 gnome-applets/tracker-search-bar/Makefile.am       |  38 ++++
 .../tracker-search-bar}/tracker-aligned-window.c   |   0
 .../tracker-search-bar}/tracker-aligned-window.h   |   0
 .../tracker-search-bar}/tracker-applet.c           | 246 +++++++++------------
 .../tracker-search-bar}/tracker-applet.h           |  23 +-
 .../tracker-search-bar}/tracker-results-window.c   |   4 +-
 .../tracker-search-bar}/tracker-results-window.h   |   0
 .../tracker-search-bar/tracker-search-bar-menu.xml |  10 +
 .../tracker-search-bar}/tracker-search-bar.ui      |   0
 .../tracker-search-bar}/tracker-utils.c            |   0
 .../tracker-search-bar}/tracker-utils.h            |   0
 po/POTFILES.in                                     |   9 +-
 po/POTFILES.skip                                   |   1 -
 tracker-search-bar/Makefile.am                     |   3 -
 tracker-search-bar/data/Makefile.am                |  26 ---
 .../org.gnome.panel.SearchBar.panel-applet.in.in   |  15 --
 tracker-search-bar/src/Makefile.am                 |  63 ------
 tracker-search-bar/src/tracker-search-bar-menu.xml |   6 -
 .../src/tracker-search-bar-resources.gresource.xml |   7 -
 23 files changed, 210 insertions(+), 299 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 03d41bd75..2a7887431 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,9 +1,5 @@
 NULL =
 
-if HAVE_TRACKER_SEARCH_BAR
-tracker_search_bar_SUBDIR = tracker-search-bar
-endif
-
 always_built_SUBDIRS =  \
        multiload \
        sticky-notes    \
@@ -16,7 +12,6 @@ SUBDIRS = \
        help \
        po                      \
        $(always_built_SUBDIRS) \
-       $(tracker_search_bar_SUBDIR) \
        $(NULL)
 
 DIST_SUBDIRS = \
@@ -27,7 +22,6 @@ DIST_SUBDIRS = \
        multiload       \
        sticky-notes    \
        window-buttons  \
-       tracker-search-bar \
        $(NULL)
 
 EXTRA_DIST = \
diff --git a/configure.ac b/configure.ac
index 7758efbeb..30db55e20 100644
--- a/configure.ac
+++ b/configure.ac
@@ -294,6 +294,10 @@ else
    fi
 fi
 
+AS_IF([test "x$have_tracker_search_bar" = "xyes"], [
+  AC_DEFINE([HAVE_TRACKER_SEARCH_BAR], [1], [Define to 1 if building tracker-search-bar applet])
+])
+
 AM_CONDITIONAL(HAVE_TRACKER_SEARCH_BAR, test "$have_tracker_search_bar" = "yes")
 
 dnl **************************************************************************
@@ -354,6 +358,7 @@ AC_CONFIG_FILES([
   gnome-applets/mini-commander/Makefile
   gnome-applets/netspeed/Makefile
   gnome-applets/timer/Makefile
+  gnome-applets/tracker-search-bar/Makefile
   gnome-applets/trash/Makefile
   gnome-applets/window-picker/Makefile
   gnome-applets/window-title/Makefile
@@ -382,10 +387,6 @@ AC_CONFIG_FILES([
   sticky-notes/src/Makefile
   sticky-notes/pixmaps/Makefile
 
-  tracker-search-bar/Makefile
-  tracker-search-bar/src/Makefile
-  tracker-search-bar/data/Makefile
-
   window-buttons/Makefile
   window-buttons/themes/Makefile
 ])
diff --git a/gnome-applets/Makefile.am b/gnome-applets/Makefile.am
index 7acd9d6c4..db0989ddd 100644
--- a/gnome-applets/Makefile.am
+++ b/gnome-applets/Makefile.am
@@ -14,6 +14,7 @@ SUBDIRS = \
        mini-commander \
        netspeed \
        timer \
+       tracker-search-bar \
        trash \
        window-picker \
        window-title \
@@ -65,6 +66,12 @@ org_gnome_gnome_applets_la_LIBADD += \
        $(NULL)
 endif
 
+if HAVE_TRACKER_SEARCH_BAR
+org_gnome_gnome_applets_la_LIBADD += \
+       $(top_builddir)/gnome-applets/tracker-search-bar/libtracker-search-bar-applet.la \
+       $(NULL)
+endif
+
 org_gnome_gnome_applets_la_LDFLAGS = \
        -module -avoid-version \
        $(AM_LDFLAGS) \
@@ -83,6 +90,11 @@ cpufreq_ui_files = \
        cpufreq/cpufreq-preferences.ui \
        $(NULL)
 
+tracker_search_bar_ui_files = \
+       tracker-search-bar/tracker-search-bar-menu.xml \
+       tracker-search-bar/tracker-search-bar.ui \
+       $(NULL)
+
 icon_files = \
        accessx-status/icons/ax-applet.png \
        accessx-status/icons/ax-key-base.png \
@@ -156,6 +168,12 @@ ui_files += \
        $(NULL)
 endif
 
+if HAVE_TRACKER_SEARCH_BAR
+ui_files += \
+       $(tracker_search_bar_ui_files) \
+       $(NULL)
+endif
+
 gnome-applets.gresource.xml: Makefile
        $(AM_V_GEN) echo '<?xml version="1.0" encoding="UTF-8"?>' > $@; \
                echo '<gresources>' >> $@; \
@@ -211,4 +229,10 @@ EXTRA_DIST += \
        $(NULL)
 endif
 
+if !HAVE_TRACKER_SEARCH_BAR
+EXTRA_DIST += \
+       $(tracker_search_bar_ui_files) \
+       $(NULL)
+endif
+
 -include $(top_srcdir)/git.mk
diff --git a/gnome-applets/ga-module.c b/gnome-applets/ga-module.c
index cde1ce5cf..22c409658 100644
--- a/gnome-applets/ga-module.c
+++ b/gnome-applets/ga-module.c
@@ -36,6 +36,9 @@
 #include "mini-commander/mini-commander-applet.h"
 #include "netspeed/netspeed-applet.h"
 #include "timer/timer-applet.h"
+#ifdef HAVE_TRACKER_SEARCH_BAR
+#include "tracker-search-bar/tracker-applet.h"
+#endif
 #include "trash/trash-applet.h"
 #include "window-picker/wp-applet.h"
 #include "window-title/window-title.h"
@@ -142,6 +145,15 @@ ga_get_applet_info (const char *id)
       description = _("Start a timer and receive a notification when it is finished");
       icon_name = "gnome-panel-clock";
     }
+#ifdef HAVE_TRACKER_SEARCH_BAR
+  else if (g_strcmp0 (id, "tracker-search-bar") == 0)
+    {
+      type_func = tracker_applet_get_type;
+      name = _("Tracker Search Bar");
+      description = _("Find your data quickly using Tracker");
+      icon_name = "system-search";
+    }
+#endif
   else if (g_strcmp0 (id, "trash") == 0)
     {
       type_func = trash_applet_get_type;
@@ -205,6 +217,10 @@ ga_get_applet_id_from_iid (const char *iid)
     return "netspeed";
   else if (g_strcmp0 (iid, "TimerAppletFactory::TimerApplet") == 0)
     return "timer";
+#ifdef HAVE_TRACKER_SEARCH_BAR
+  else if (g_strcmp0 (iid, "SearchBarFactory::SearchBar") == 0)
+    return "tracker-search-bar";
+#endif
   else if (g_strcmp0 (iid, "TrashAppletFactory::TrashApplet") == 0)
     return "trash";
   else if (g_strcmp0 (iid, "WindowPickerFactory::WindowPicker") == 0 ||
@@ -244,6 +260,9 @@ gp_module_load (GpModule *module)
                             "mini-commander",
                             "netspeed",
                             "timer",
+#ifdef HAVE_TRACKER_SEARCH_BAR
+                            "tracker-search-bar",
+#endif
                             "trash",
                             "window-picker",
                             "window-title",
diff --git a/gnome-applets/tracker-search-bar/Makefile.am b/gnome-applets/tracker-search-bar/Makefile.am
new file mode 100644
index 000000000..bca8f45aa
--- /dev/null
+++ b/gnome-applets/tracker-search-bar/Makefile.am
@@ -0,0 +1,38 @@
+NULL =
+
+noinst_LTLIBRARIES=libtracker-search-bar-applet.la
+
+libtracker_search_bar_applet_la_CPPFLAGS = \
+       -DG_LOG_DOMAIN=\"org.gnome.gnome-applets.tracker-search-bar\" \
+       -DG_LOG_USE_STRUCTURED=1 \
+       $(NULL)
+
+libtracker_search_bar_applet_la_CFLAGS = \
+       $(GNOME_PANEL_CFLAGS) \
+       $(TRACKER_SEARCH_BAR_CFLAGS) \
+       $(WARN_CFLAGS) \
+       $(AM_CFLAGS) \
+       $(NULL)
+
+libtracker_search_bar_applet_la_LDFLAGS = \
+       $(WARN_LDFLAGS) \
+       $(AM_LDFLAGS) \
+       $(NULL)
+
+libtracker_search_bar_applet_la_LIBADD = \
+       $(GNOME_PANEL_LIBS) \
+       $(TRACKER_SEARCH_BAR_LIBS) \
+       $(NULL)
+
+libtracker_search_bar_applet_la_SOURCES = \
+       tracker-applet.c \
+       tracker-applet.h \
+       tracker-aligned-window.c \
+       tracker-aligned-window.h \
+       tracker-results-window.c \
+       tracker-results-window.h \
+       tracker-utils.c \
+       tracker-utils.h \
+       $(NULL)
+
+-include $(top_srcdir)/git.mk
diff --git a/tracker-search-bar/src/tracker-aligned-window.c 
b/gnome-applets/tracker-search-bar/tracker-aligned-window.c
similarity index 100%
rename from tracker-search-bar/src/tracker-aligned-window.c
rename to gnome-applets/tracker-search-bar/tracker-aligned-window.c
diff --git a/tracker-search-bar/src/tracker-aligned-window.h 
b/gnome-applets/tracker-search-bar/tracker-aligned-window.h
similarity index 100%
rename from tracker-search-bar/src/tracker-aligned-window.h
rename to gnome-applets/tracker-search-bar/tracker-aligned-window.h
diff --git a/tracker-search-bar/src/tracker-applet.c b/gnome-applets/tracker-search-bar/tracker-applet.c
similarity index 62%
rename from tracker-search-bar/src/tracker-applet.c
rename to gnome-applets/tracker-search-bar/tracker-applet.c
index f8f922919..8762608ea 100644
--- a/tracker-search-bar/src/tracker-applet.c
+++ b/gnome-applets/tracker-search-bar/tracker-applet.c
@@ -17,23 +17,40 @@
  * 02110-1301, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
+#include "config.h"
+#include "tracker-applet.h"
 
 #include <string.h>
 #include <stdlib.h>
 
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 
-#include <panel-applet.h>
-
-#include "tracker-applet.h"
 #include "tracker-results-window.h"
 
-#define RESOURCE_PREFIX "/org/gnome/gnome-applets/tracker-search-bar"
+struct _TrackerApplet
+{
+  GpApplet        parent;
+
+  GtkBuilder     *builder;
+
+  GtkWidget      *results;
+
+  GtkWidget      *box;
+  GtkWidget      *event_box;
+  GtkWidget      *image;
+  GtkWidget      *entry;
+
+  guint           new_search_id;
+  guint           idle_draw_id;
+
+  GtkOrientation  orient;
+  GdkPixbuf      *icon;
+  guint           size;
+};
+
+G_DEFINE_TYPE (TrackerApplet, tracker_applet, GP_TYPE_APPLET)
 
 static void applet_about_cb (GSimpleAction *action,
                              GVariant *parameter,
@@ -45,6 +62,9 @@ static const GActionEntry applet_menu_actions[] = {
          NULL,
          NULL,
          NULL,
+       },
+       {
+         NULL
        }
 };
 
@@ -95,7 +115,7 @@ applet_entry_start_search (TrackerApplet *applet)
        g_print ("Searching for: '%s'\n", text);
 
        if (!applet->results) {
-               applet->results = tracker_results_window_new (applet->parent, text);
+               applet->results = tracker_results_window_new (GTK_WIDGET (applet), text);
        } else {
                g_object_set (applet->results, "query", text, NULL);
        }
@@ -136,7 +156,7 @@ applet_entry_button_press_event_cb (GtkWidget      *widget,
                                     GdkEventButton *event,
                                     TrackerApplet  *applet)
 {
-       panel_applet_request_focus (PANEL_APPLET (applet->parent), event->time);
+       gp_applet_request_focus (GP_APPLET (applet), event->time);
 
        return FALSE;
 }
@@ -199,7 +219,7 @@ applet_draw (gpointer user_data)
                break;
        }
 
-       gtk_container_add (GTK_CONTAINER (PANEL_APPLET (applet->parent)), applet->box);
+       gtk_container_add (GTK_CONTAINER (applet), applet->box);
        gtk_widget_show (applet->box);
 
        applet->event_box = gtk_event_box_new ();
@@ -249,54 +269,39 @@ applet_queue_draw (TrackerApplet *applet)
 }
 
 static void
-applet_change_orient_cb (GtkWidget         *widget,
-                         PanelAppletOrient  orient,
-                         gpointer           user_data)
+placement_changed_cb (GpApplet        *applet,
+                      GtkOrientation   orientation,
+                      GtkPositionType  position,
+                      TrackerApplet   *self)
 {
-       TrackerApplet *applet;
-       GtkAllocation alloc;
-       guint new_size;
+  GtkAllocation alloc;
 
-       applet = user_data;
-        new_size = applet->size;
+  gtk_widget_get_allocation (GTK_WIDGET (self), &alloc);
 
-       gtk_widget_get_allocation (GTK_WIDGET (applet->parent), &alloc);
+  switch (orientation)
+    {
+      case GTK_ORIENTATION_VERTICAL:
+        self->orient = orientation;
+        self->size = alloc.width;
+        break;
 
-       switch (orient) {
-       case PANEL_APPLET_ORIENT_LEFT:
-       case PANEL_APPLET_ORIENT_RIGHT:
-               applet->orient = GTK_ORIENTATION_VERTICAL;
-               new_size = alloc.width;
-               break;
+      case GTK_ORIENTATION_HORIZONTAL:
+        self->orient = orientation;
+        self->size = alloc.height;
+        break;
+    }
 
-       case PANEL_APPLET_ORIENT_UP:
-       case PANEL_APPLET_ORIENT_DOWN:
-               applet->orient = GTK_ORIENTATION_HORIZONTAL;
-               new_size = alloc.height;
-               break;
-       }
-
-       if (new_size != applet->size) {
-               applet->size = new_size;
-       }
-
-       applet_queue_draw (applet);
+  applet_queue_draw (self);
 }
 
 static void
 applet_size_allocate_cb (GtkWidget     *widget,
                          GtkAllocation *allocation,
-                         gpointer       user_data)
+                         TrackerApplet *applet)
 {
-       TrackerApplet *applet;
-       PanelAppletOrient orient;
        gint new_size;
 
-       applet = user_data;
-
-       orient = panel_applet_get_orient (PANEL_APPLET (widget));
-       if (orient == PANEL_APPLET_ORIENT_LEFT ||
-           orient == PANEL_APPLET_ORIENT_RIGHT) {
+       if (gp_applet_get_orientation (GP_APPLET (applet)) == GTK_ORIENTATION_VERTICAL) {
                new_size = allocation->width;
        } else {
                new_size = allocation->height;
@@ -320,62 +325,17 @@ applet_size_allocate_cb (GtkWidget     *widget,
                        g_object_unref (scaled);
                }
        }
-
 }
 
-#if 0
-
 static void
-applet_destroy_cb (BonoboObject  *object,
-                   TrackerApplet *applet)
-{
-       if (applet->builder) {
-               g_object_unref (applet->builder);
-               applet->builder = NULL;
-       }
-
-       if (applet->results) {
-               gtk_widget_destroy (applet->results);
-               applet->results = NULL;
-       }
-
-       if (applet->icon) {
-               g_object_unref (applet->icon);
-               applet->icon = NULL;
-       }
-
-       if (applet->idle_draw_id) {
-               g_source_remove (applet->idle_draw_id);
-               applet->idle_draw_id = 0;
-       }
-
-       if (applet->new_search_id) {
-               g_source_remove (applet->new_search_id);
-               applet->new_search_id = 0;
-       }
-
-       g_free (applet);
-}
-
-#endif
-
-static gboolean
-applet_new (PanelApplet *parent_applet)
+tracker_applet_setup (TrackerApplet *applet)
 {
-       TrackerApplet *applet;
-       GtkBuilder *builder;
-       GSimpleActionGroup *action_group;
        const gchar *resource_name;
 
-       builder = gtk_builder_new ();
-
-       resource_name = RESOURCE_PREFIX "/tracker-search-bar.ui";
-       gtk_builder_add_from_resource (builder, resource_name, NULL);
+       applet->builder = gtk_builder_new ();
 
-       applet = g_new0 (TrackerApplet, 1);
-
-       applet->parent = GTK_WIDGET (parent_applet);
-       applet->builder = builder;
+       resource_name = GRESOURCE_PREFIX "/ui/tracker-search-bar.ui";
+       gtk_builder_add_from_resource (applet->builder, resource_name, NULL);
 
        applet->icon = gtk_icon_theme_load_icon (gtk_icon_theme_get_default (),
                                                 "edit-find",
@@ -385,64 +345,68 @@ applet_new (PanelApplet *parent_applet)
 
        applet_queue_draw (applet);
 
-       panel_applet_set_flags (PANEL_APPLET (applet->parent),
-                               PANEL_APPLET_EXPAND_MINOR);
+       gp_applet_set_flags (GP_APPLET (applet), GP_APPLET_FLAGS_EXPAND_MINOR);
 
-       action_group = g_simple_action_group_new ();
-       g_action_map_add_action_entries (G_ACTION_MAP (action_group),
-                                        applet_menu_actions,
-                                        G_N_ELEMENTS (applet_menu_actions),
-                                        applet);
+       resource_name = GRESOURCE_PREFIX "/ui/tracker-search-bar-menu.xml";
+       gp_applet_setup_menu_from_resource (GP_APPLET (applet),
+                                           resource_name,
+                                           applet_menu_actions);
 
-       resource_name = RESOURCE_PREFIX "/tracker-search-bar-menu.xml";
-       panel_applet_setup_menu_from_resource (PANEL_APPLET (applet->parent),
-                                              resource_name,
-                                              action_group,
-                                              GETTEXT_PACKAGE);
+       g_signal_connect (applet, "size-allocate",
+                         G_CALLBACK (applet_size_allocate_cb),
+                         applet);
 
-       gtk_widget_insert_action_group (GTK_WIDGET (applet->parent), "tracker-search-bar",
-                                       G_ACTION_GROUP (action_group));
+       g_signal_connect (applet, "placement-changed",
+                         G_CALLBACK (placement_changed_cb),
+                         applet);
+}
 
-       g_object_unref (action_group);
+static void
+tracker_applet_constructed (GObject *object)
+{
+  G_OBJECT_CLASS (tracker_applet_parent_class)->constructed (object);
+  tracker_applet_setup (TRACKER_APPLET (object));
+}
+
+static void
+tracker_applet_dispose (GObject *object)
+{
+  TrackerApplet *self;
+
+  self = TRACKER_APPLET (object);
 
-       gtk_widget_show (applet->parent);
+  if (self->idle_draw_id != 0)
+    {
+      g_source_remove (self->idle_draw_id);
+      self->idle_draw_id = 0;
+    }
 
-       g_signal_connect (applet->parent, "size_allocate",
-                         G_CALLBACK (applet_size_allocate_cb), applet);
-       g_signal_connect (applet->parent, "change_orient",
-                         G_CALLBACK (applet_change_orient_cb), applet);
+  if (self->new_search_id != 0)
+    {
+      g_source_remove (self->new_search_id);
+      self->new_search_id = 0;
+    }
 
-#if 0
-       g_signal_connect (panel_applet_get_control (PANEL_APPLET (applet->parent)), "destroy",
-                         G_CALLBACK (applet_destroy_cb), applet);
-#endif
+  g_clear_pointer (&self->results, gtk_widget_destroy);
 
-       /* Initialise other modules */
+  g_clear_object (&self->builder);
+  g_clear_object (&self->icon);
 
-       return TRUE;
+  G_OBJECT_CLASS (tracker_applet_parent_class)->dispose (object);
 }
 
-/*
- * The entry point for this factory. If the OAFIID matches, create an instance
- * of the applet.
- */
-static gboolean
-applet_factory (PanelApplet *applet,
-                const gchar *iid,
-                gpointer     data)
+static void
+tracker_applet_class_init (TrackerAppletClass *self_class)
 {
-       if (!strcmp (iid, "SearchBar")) {
-               g_print ("Creating applet\n");
-               return applet_new (applet);
-       }
+  GObjectClass *object_class;
 
-       return FALSE;
+  object_class = G_OBJECT_CLASS (self_class);
+
+  object_class->constructed = tracker_applet_constructed;
+  object_class->dispose = tracker_applet_dispose;
 }
 
-/*
- * Generate the boilerplate to hook into GObject/Bonobo.
- */
-PANEL_APPLET_IN_PROCESS_FACTORY ("SearchBarFactory",
-                                 PANEL_TYPE_APPLET,
-                                 applet_factory,
-                                 NULL)
+static void
+tracker_applet_init (TrackerApplet *self)
+{
+}
diff --git a/tracker-search-bar/src/tracker-applet.h b/gnome-applets/tracker-search-bar/tracker-applet.h
similarity index 75%
rename from tracker-search-bar/src/tracker-applet.h
rename to gnome-applets/tracker-search-bar/tracker-applet.h
index bcfccc8b1..c528b0163 100644
--- a/tracker-search-bar/src/tracker-applet.h
+++ b/gnome-applets/tracker-search-bar/tracker-applet.h
@@ -20,28 +20,13 @@
 #ifndef __TRACKER_APPLET_H__
 #define __TRACKER_APPLET_H__
 
-#include <gtk/gtk.h>
+#include <libgnome-panel/gp-applet.h>
 
 G_BEGIN_DECLS
 
-typedef struct {
-       GtkBuilder *builder;
-
-       GtkWidget *results;
-       GtkWidget *parent;
-
-       GtkWidget *box;
-       GtkWidget *event_box;
-       GtkWidget *image;
-       GtkWidget *entry;
-
-       guint new_search_id;
-       guint idle_draw_id;
-
-       GtkOrientation orient;
-       GdkPixbuf *icon;
-       guint size;
-} TrackerApplet;
+#define TRACKER_TYPE_APPLET (tracker_applet_get_type ())
+G_DECLARE_FINAL_TYPE (TrackerApplet, tracker_applet,
+                      TRACKER, APPLET, GpApplet)
 
 G_END_DECLS
 
diff --git a/tracker-search-bar/src/tracker-results-window.c 
b/gnome-applets/tracker-search-bar/tracker-results-window.c
similarity index 99%
rename from tracker-search-bar/src/tracker-results-window.c
rename to gnome-applets/tracker-search-bar/tracker-results-window.c
index 34db2de71..f6b9d00d5 100644
--- a/tracker-search-bar/src/tracker-results-window.c
+++ b/gnome-applets/tracker-search-bar/tracker-results-window.c
@@ -21,12 +21,10 @@
 
 #include <string.h>
 
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 
-#include <panel-applet.h>
-
 #include <libtracker-sparql/tracker-sparql.h>
 
 #include "tracker-results-window.h"
diff --git a/tracker-search-bar/src/tracker-results-window.h 
b/gnome-applets/tracker-search-bar/tracker-results-window.h
similarity index 100%
rename from tracker-search-bar/src/tracker-results-window.h
rename to gnome-applets/tracker-search-bar/tracker-results-window.h
diff --git a/gnome-applets/tracker-search-bar/tracker-search-bar-menu.xml 
b/gnome-applets/tracker-search-bar/tracker-search-bar-menu.xml
new file mode 100644
index 000000000..3257bb151
--- /dev/null
+++ b/gnome-applets/tracker-search-bar/tracker-search-bar-menu.xml
@@ -0,0 +1,10 @@
+<interface>
+  <menu id="tracker-search-bar-menu">
+    <section>
+      <item>
+        <attribute name="label" translatable="yes">_About</attribute>
+        <attribute name="action">tracker-search-bar.about</attribute>
+      </item>
+    </section>
+  </menu>
+</interface>
diff --git a/tracker-search-bar/src/tracker-search-bar.ui 
b/gnome-applets/tracker-search-bar/tracker-search-bar.ui
similarity index 100%
rename from tracker-search-bar/src/tracker-search-bar.ui
rename to gnome-applets/tracker-search-bar/tracker-search-bar.ui
diff --git a/tracker-search-bar/src/tracker-utils.c b/gnome-applets/tracker-search-bar/tracker-utils.c
similarity index 100%
rename from tracker-search-bar/src/tracker-utils.c
rename to gnome-applets/tracker-search-bar/tracker-utils.c
diff --git a/tracker-search-bar/src/tracker-utils.h b/gnome-applets/tracker-search-bar/tracker-utils.h
similarity index 100%
rename from tracker-search-bar/src/tracker-utils.h
rename to gnome-applets/tracker-search-bar/tracker-utils.h
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 5413c8482..58acae1a0 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -60,6 +60,10 @@ gnome-applets/netspeed/netspeed-applet.c
 gnome-applets/netspeed/preferences.c
 [type: gettext/glade]gnome-applets/timer/timer-applet-menu.xml
 gnome-applets/timer/timer-applet.c
+gnome-applets/tracker-search-bar/tracker-applet.c
+gnome-applets/tracker-search-bar/tracker-results-window.c
+[type: gettext/glade]gnome-applets/tracker-search-bar/tracker-search-bar-menu.xml
+[type: gettext/glade]gnome-applets/tracker-search-bar/tracker-search-bar.ui
 gnome-applets/trash/trash-applet.c
 gnome-applets/trash/trash-empty.c
 [type: gettext/glade]gnome-applets/trash/trash-empty.ui
@@ -92,11 +96,6 @@ sticky-notes/src/stickynotes_callbacks.c
 [type: gettext/glade]sticky-notes/src/sticky-notes-note.ui
 [type: gettext/glade]sticky-notes/src/sticky-notes-preferences.ui
 [type: gettext/glade]sticky-notes/src/sticky-notes-properties.ui
-[type: gettext/ini]tracker-search-bar/data/org.gnome.panel.SearchBar.panel-applet.in.in
-tracker-search-bar/src/tracker-applet.c
-tracker-search-bar/src/tracker-results-window.c
-[type: gettext/glade]tracker-search-bar/src/tracker-search-bar-menu.xml
-[type: gettext/glade]tracker-search-bar/src/tracker-search-bar.ui
 [type: gettext/ini]window-buttons/org.gnome.panel.WindowButtonsApplet.panel-applet.in.in
 window-buttons/windowbuttons.c
 [type: gettext/glade]window-buttons/windowbuttons.ui
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 5b6829c80..47a601a9f 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -19,5 +19,4 @@ data/schemas/org.gnome.gnome-applets.window-picker-applet.gschema.xml.in
 data/schemas/org.gnome.gnome-applets.window-title.gschema.xml.in
 multiload/org.gnome.applets.MultiLoadApplet.panel-applet.in
 sticky-notes/data/org.gnome.applets.StickyNotesApplet.panel-applet.in
-tracker-search-bar/data/org.gnome.panel.SearchBar.panel-applet.in
 window-buttons/org.gnome.panel.WindowButtonsApplet.panel-applet.in
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]