[gnome-applets/wip/segeiger/in-process: 6/7] tracker-search-bar: move panel-applet file to data folder

[Sebastian Geiger <segeiger src gnome org>]

commit 769092d6d9f0e134b918ec2ef7445a6bb1badbd7
Author: Sebastian Geiger <sbastig gmx net>
Date:   Fri Jul 29 22:40:47 2016 +0200

    tracker-search-bar: move panel-applet file to data folder

 configure.ac                                       |    1 +
 tracker-search-bar/Makefile.am                     |   23 +----------------
 tracker-search-bar/data/Makefile.am                |   26 ++++++++++++++++++++
 ...nome.panel.TrackerSearchBar.panel-applet.in.in} |    4 +-
 tracker-search-bar/src/tracker-applet.c            |    4 +-
 5 files changed, 32 insertions(+), 26 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index aaecad8..9a5897b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -737,6 +737,7 @@ AC_CONFIG_FILES([
 
   tracker-search-bar/Makefile
   tracker-search-bar/src/Makefile
+  tracker-search-bar/data/Makefile
 
   trash/help/Makefile
   trash/Makefile
diff --git a/tracker-search-bar/Makefile.am b/tracker-search-bar/Makefile.am
index 3acb019..184f167 100644
--- a/tracker-search-bar/Makefile.am
+++ b/tracker-search-bar/Makefile.am
@@ -1,21 +1,6 @@
 NULL =
 
-SUBDIRS = src
-
-# Panel applet
-appletdir = $(LIBPANEL_APPLET_DIR)
-applet_in_files = org.gnome.panel.SearchBar.panel-applet.in
-applet_DATA = $(applet_in_files:.panel-applet.in=.panel-applet)
-
-APPLET_LOCATION=$(pkglibdir)/$(LIBPANEL_APPLET_API_VERSION)/libtracker-search-bar-applet.so
-
-$(applet_in_files): $(applet_in_files).in Makefile
-       $(AM_V_GEN)sed                                 \
-         -e "s|\@APPLET_LOCATION\@|$(APPLET_LOCATION)|"         \
-         -e "s|\@VERSION\@|$(PACKAGE_VERSION)|"       \
-         $< > $@
-
-%.panel-applet: %.panel-applet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) 
$(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
+SUBDIRS = src data
 
 # Applet UIs and menu
 uidir = $(pkgdatadir)/ui
@@ -25,13 +10,7 @@ ui_DATA =                                             \
        $(NULL)
 
 EXTRA_DIST = \
-       org.gnome.panel.SearchBar.panel-applet.in.in \
        $(ui_DATA) \
        $(NULL)
 
-CLEANFILES = \
-       $(applet_DATA) \
-       $(applet_DATA).in \
-       $(NULL)
-
 -include $(top_srcdir)/git.mk
diff --git a/tracker-search-bar/data/Makefile.am b/tracker-search-bar/data/Makefile.am
new file mode 100644
index 0000000..01880a5
--- /dev/null
+++ b/tracker-search-bar/data/Makefile.am
@@ -0,0 +1,26 @@
+NULL =
+
+appletdir = $(LIBPANEL_APPLET_DIR)
+applet_in_files = org.gnome.panel.TrackerSearchBar.panel-applet.in
+applet_DATA = $(applet_in_files:.panel-applet.in=.panel-applet)
+
+APPLET_LOCATION=$(pkglibdir)/$(LIBPANEL_APPLET_API_VERSION)/libtracker-search-bar-applet.so
+
+$(applet_in_files): $(applet_in_files).in Makefile
+       $(AM_V_GEN)sed                                 \
+         -e "s|\@APPLET_LOCATION\@|$(APPLET_LOCATION)|"         \
+         -e "s|\@VERSION\@|$(PACKAGE_VERSION)|"       \
+         $< > $@
+
+%.panel-applet: %.panel-applet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) 
$(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
+
+EXTRA_DIST = \
+       org.gnome.panel.TrackerSearchBar.panel-applet.in.in \
+       $(NULL)
+
+CLEANFILES = \
+       $(applet_DATA) \
+       $(applet_DATA).in \
+       $(NULL)
+
+-include $(top_srcdir)/git.mk
diff --git a/tracker-search-bar/org.gnome.panel.SearchBar.panel-applet.in.in 
b/tracker-search-bar/data/org.gnome.panel.TrackerSearchBar.panel-applet.in.in
similarity index 89%
rename from tracker-search-bar/org.gnome.panel.SearchBar.panel-applet.in.in
rename to tracker-search-bar/data/org.gnome.panel.TrackerSearchBar.panel-applet.in.in
index 4cd3e6e..fa57c07 100644
--- a/tracker-search-bar/org.gnome.panel.SearchBar.panel-applet.in.in
+++ b/tracker-search-bar/data/org.gnome.panel.TrackerSearchBar.panel-applet.in.in
@@ -1,11 +1,11 @@
 [Applet Factory]
-Id=SearchBarFactory
+Id=TrackerSearchBarFactory
 Location=@APPLET_LOCATION@
 InProcess=true
 Name=Search Bar
 Description=Find your data quickly using Tracker
 
-[SearchBar]
+[TrackerSearchBar]
 _Name=Tracker Search Bar
 _Description=Find your data quickly using Tracker
 Icon=system-search
diff --git a/tracker-search-bar/src/tracker-applet.c b/tracker-search-bar/src/tracker-applet.c
index 5121ffa..c080394 100644
--- a/tracker-search-bar/src/tracker-applet.c
+++ b/tracker-search-bar/src/tracker-applet.c
@@ -446,7 +446,7 @@ applet_factory (PanelApplet *applet,
                 const gchar *iid,
                 gpointer     data)
 {
-       if (!strcmp (iid, "SearchBar")) {
+       if (!strcmp (iid, "TrackerSearchBar")) {
                g_print ("Creating applet\n");
                return applet_new (applet);
        }
@@ -457,7 +457,7 @@ applet_factory (PanelApplet *applet,
 /*
  * Generate the boilerplate to hook into GObject/Bonobo.
  */
-PANEL_APPLET_IN_PROCESS_FACTORY ("SearchBarFactory",
+PANEL_APPLET_IN_PROCESS_FACTORY ("TrackerSearchBarFactory",
                                  PANEL_TYPE_APPLET,
                                  applet_factory,
                                  NULL)