[gnome-applets/wip/segeiger/window-picker-in-process: 1/11] windowpicker: Build applet in process

[Sebastian Geiger <segeiger src gnome org>]

commit 534bc2d37de9f058b12034700c38bcea93b8a4d3
Author: Sebastian Geiger <sbastig gmx net>
Date:   Sun Jun 7 13:16:12 2015 +0200

    windowpicker: Build applet in process

 windowpicker/data/Makefile.am                      |   19 ++++---------------
 ...g.gnome.applets.WindowPicker.panel-applet.in.in |    3 ++-
 ...ome.panel.applet.WindowPickerFactory.service.in |    3 ---
 windowpicker/src/Makefile.am                       |    7 ++++---
 windowpicker/src/applet.c                          |    2 +-
 5 files changed, 11 insertions(+), 23 deletions(-)
---
diff --git a/windowpicker/data/Makefile.am b/windowpicker/data/Makefile.am
index d9ab23a..7a2c143 100644
--- a/windowpicker/data/Makefile.am
+++ b/windowpicker/data/Makefile.am
@@ -2,6 +2,8 @@ appletdir       = $(LIBPANEL_APPLET_DIR)
 applet_in_files = org.gnome.applets.WindowPicker.panel-applet.in
 applet_DATA     = $(applet_in_files:.panel-applet.in=.panel-applet)
 
+APPLET_LOCATION=$(pkglibdir)/$(LIBPANEL_APPLET_API_VERSION)/libwindow-picker-applet.so
+
 uidir = $(datadir)/$(PACKAGE)/ui
 ui_DATA = \
        menu.xml \
@@ -9,7 +11,7 @@ ui_DATA = \
 
 $(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)|" \
        $< > $@
 
@@ -28,26 +30,13 @@ $(gsettings_file).in: $(gsettings_file).in.in
 
 %.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
 
-servicedir       = $(datadir)/dbus-1/services
-service_in_files = org.gnome.panel.applet.WindowPickerFactory.service.in
-service_DATA     = $(service_in_files:.service.in=.service)
-
-org.gnome.panel.applet.WindowPickerFactory.service: $(service_in_files)
-       $(AM_V_GEN)sed \
-       -e "s|\ LIBEXECDIR\@|$(libexecdir)|" \
-       $< > $@
-
-APPLET_LOCATION=$(libexecdir)/window-picker-applet
-
 EXTRA_DIST = \
        $(ui_DATA) \
        org.gnome.applets.WindowPicker.panel-applet.in.in \
-       $(gsettings_file).in.in \
-       $(service_in_files)
+       $(gsettings_file).in.in
 
 CLEANFILES = $(applet_DATA) \
        $(applet_DATA).in \
-       $(service_DATA) \
        $(gsettings_file).in \
        $(gsettings_file) \
        *.gschema.valid
diff --git a/windowpicker/data/org.gnome.applets.WindowPicker.panel-applet.in.in 
b/windowpicker/data/org.gnome.applets.WindowPicker.panel-applet.in.in
index 9219bb4..46e4300 100644
--- a/windowpicker/data/org.gnome.applets.WindowPicker.panel-applet.in.in
+++ b/windowpicker/data/org.gnome.applets.WindowPicker.panel-applet.in.in
@@ -1,6 +1,7 @@
 [Applet Factory]
 Id=WindowPickerFactory
-Location= LIBEXECDIR@/window-picker-applet
+Location= APPLET_LOCATION@
+InProcess=true
 _Name=Window Picker
 _Description=Factory for the window picker applet
 
diff --git a/windowpicker/src/Makefile.am b/windowpicker/src/Makefile.am
index 1eee97f..d556f87 100644
--- a/windowpicker/src/Makefile.am
+++ b/windowpicker/src/Makefile.am
@@ -1,4 +1,5 @@
-libexec_PROGRAMS=window-picker-applet
+window_picker_libdir=${pkglibdir}/${LIBPANEL_APPLET_API_VERSION}
+window_picker_lib_LTLIBRARIES=libwindow-picker-applet.la
 
 PKGDATADIR = $(datadir)/window-picker-applet
 AM_CFLAGS=\
@@ -15,11 +16,11 @@ AM_CFLAGS=\
        -DGTK_DISABLE_SINGLE_INCLUDES \
     -lm
 
-window_picker_applet_LDADD = \
+libwindow_picker_applet_la_LIBADD = \
        $(GNOME_APPLETS_LIBS) \
        $(LIBWNCK_LIBS)
 
-window_picker_applet_SOURCES = \
+libwindow_picker_applet_la_SOURCES = \
        applet.c \
        applet.h \
        task-item.c \
diff --git a/windowpicker/src/applet.c b/windowpicker/src/applet.c
index 847cfee..6b4a062 100644
--- a/windowpicker/src/applet.c
+++ b/windowpicker/src/applet.c
@@ -464,7 +464,7 @@ window_picker_applet_get_expand_task_list (WindowPickerApplet *picker) {
     return picker->priv->expand_task_list;
 }
 
-PANEL_APPLET_OUT_PROCESS_FACTORY ("WindowPickerFactory",
+PANEL_APPLET_IN_PROCESS_FACTORY ("WindowPickerFactory",
                                   WINDOW_PICKER_APPLET_TYPE,
                                   window_picker_factory,
                                   NULL);