[gnome-applets/wip/segeiger/in-process: 5/7] tracker-search-bar: switch to in-process applet

[Sebastian Geiger <segeiger src gnome org>]

commit 2f7872afed9cf0c03f4da3aff12168a7f2adb104
Author: Sebastian Geiger <sbastig gmx net>
Date:   Fri Jul 29 22:28:13 2016 +0200

    tracker-search-bar: switch to in-process applet

 tracker-search-bar/Makefile.am                     |   22 +++------
 .../org.gnome.panel.SearchBar.panel-applet.in.in   |    3 +-
 ....gnome.panel.applet.SearchBarFactory.service.in |    3 -
 tracker-search-bar/src/Makefile.am                 |   46 +++++++++++---------
 tracker-search-bar/src/tracker-applet.c            |    8 ++--
 5 files changed, 39 insertions(+), 43 deletions(-)
---
diff --git a/tracker-search-bar/Makefile.am b/tracker-search-bar/Makefile.am
index 21ba6cc..3acb019 100644
--- a/tracker-search-bar/Makefile.am
+++ b/tracker-search-bar/Makefile.am
@@ -7,9 +7,11 @@ 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|\@LIBEXECDIR\@|$(libexecdir)|"         \
+         -e "s|\@APPLET_LOCATION\@|$(APPLET_LOCATION)|"         \
          -e "s|\@VERSION\@|$(PACKAGE_VERSION)|"       \
          $< > $@
 
@@ -19,27 +21,17 @@ $(applet_in_files): $(applet_in_files).in Makefile
 uidir = $(pkgdatadir)/ui
 ui_DATA =                                             \
        tracker-search-bar.ui                         \
-       tracker-search-bar-menu.xml
-
-# DBus service file
-servicedir = $(datadir)/dbus-1/services
-service_in_files = org.gnome.panel.applet.SearchBarFactory.service.in
-service_DATA = $(service_in_files:.service.in=.service)
-
-org.gnome.panel.applet.SearchBarFactory.service: $(service_in_files)
-       $(AM_V_GEN)sed                                \
-         -e "s|\@LIBEXECDIR\@|$(libexecdir)|"        \
-         $< > $@
+       tracker-search-bar-menu.xml \
+       $(NULL)
 
-# Distribution details
 EXTRA_DIST = \
        org.gnome.panel.SearchBar.panel-applet.in.in \
        $(ui_DATA) \
-       $(service_in_files)
+       $(NULL)
 
 CLEANFILES = \
        $(applet_DATA) \
        $(applet_DATA).in \
-       $(service_DATA)
+       $(NULL)
 
 -include $(top_srcdir)/git.mk
diff --git a/tracker-search-bar/org.gnome.panel.SearchBar.panel-applet.in.in 
b/tracker-search-bar/org.gnome.panel.SearchBar.panel-applet.in.in
index 54c5c6e..4cd3e6e 100644
--- a/tracker-search-bar/org.gnome.panel.SearchBar.panel-applet.in.in
+++ b/tracker-search-bar/org.gnome.panel.SearchBar.panel-applet.in.in
@@ -1,6 +1,7 @@
 [Applet Factory]
 Id=SearchBarFactory
-Location=@LIBEXECDIR@/tracker-search-bar
+Location=@APPLET_LOCATION@
+InProcess=true
 Name=Search Bar
 Description=Find your data quickly using Tracker
 
diff --git a/tracker-search-bar/src/Makefile.am b/tracker-search-bar/src/Makefile.am
index 698b7b0..6eae134 100644
--- a/tracker-search-bar/src/Makefile.am
+++ b/tracker-search-bar/src/Makefile.am
@@ -1,35 +1,41 @@
 NULL =
 
-tracker_search_bar_CFLAGS = \
+tracker_search_bar_libdir=${pkglibdir}/${LIBPANEL_APPLET_API_VERSION}
+tracker_search_bar_lib_LTLIBRARIES=libtracker-search-bar-applet.la
+
+libtracker_search_bar_applet_la_CPPFLAGS = \
        -DGNOMELOCALEDIR=\""$(localedir)"\" \
        -DPKG_DATA_DIR=\""$(pkgdatadir)"\" \
-       -I.                                     \
-       -I$(srcdir)                             \
-       $(GNOME_APPLETS_CFLAGS)                 \
+       -I. \
+       -I$(srcdir) \
+       $(NULL)
+
+libtracker_search_bar_applet_la_CFLAGS = \
+       $(GNOME_APPLETS_CFLAGS) \
        $(TRACKER_SEARCH_BAR_CFLAGS) \
        $(WARN_CFLAGS) \
        $(AM_CFLAGS) \
        $(NULL)
 
-libexec_PROGRAMS = tracker-search-bar
-
-tracker_search_bar_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
-
-tracker_search_bar_LDFLAGS = \
+libtracker_search_bar_appet_la_LDFLAGS = \
        $(WARN_LDFLAGS) \
        $(AM_LDFLAGS) \
        $(NULL)
 
-tracker_search_bar_LDADD =                             \
-       $(GNOME_APPLETS_LIBS)                          \
-       $(TRACKER_SEARCH_BAR_LIBS)
+libtracker_search_bar_applet_la_LIBADD = \
+       $(GNOME_APPLETS_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-applet.c b/tracker-search-bar/src/tracker-applet.c
index 3b5fd62..5121ffa 100644
--- a/tracker-search-bar/src/tracker-applet.c
+++ b/tracker-search-bar/src/tracker-applet.c
@@ -457,7 +457,7 @@ applet_factory (PanelApplet *applet,
 /*
  * Generate the boilerplate to hook into GObject/Bonobo.
  */
-PANEL_APPLET_OUT_PROCESS_FACTORY ("SearchBarFactory",
-                                  PANEL_TYPE_APPLET,
-                                  applet_factory,
-                                  NULL)
+PANEL_APPLET_IN_PROCESS_FACTORY ("SearchBarFactory",
+                                 PANEL_TYPE_APPLET,
+                                 applet_factory,
+                                 NULL)