[gnome-applets/wip/segeiger/in-process: 14/25] charpick: switch to in-process applet

[Sebastian Geiger <segeiger src gnome org>]

commit 9bfc45b8659baf2e8883a351b3443444123a97d0
Author: Sebastian Geiger <sbastig gmx net>
Date:   Sun Sep 11 13:47:01 2016 +0200

    charpick: switch to in-process applet

 charpick/Makefile.am                               |   16 ++++------------
 ...ome.applets.CharpickerApplet.panel-applet.in.in |    3 ++-
 ...panel.applet.CharpickerAppletFactory.service.in |    3 ---
 charpick/src/Makefile.am                           |   19 ++++++++++++++-----
 charpick/src/charpick.c                            |    9 ++++-----
 5 files changed, 24 insertions(+), 26 deletions(-)
---
diff --git a/charpick/Makefile.am b/charpick/Makefile.am
index 4034c00..a88ebb0 100644
--- a/charpick/Makefile.am
+++ b/charpick/Makefile.am
@@ -2,28 +2,21 @@ NULL =
 
 SUBDIRS = help src
 
+APPLET_LOCATION = $(pkglibdir)/$(LIBPANEL_APPLET_API_VERSION)/libcharacter-picker-applet.so
+
 appletdir       = $(LIBPANEL_APPLET_DIR)
 applet_in_files = org.gnome.applets.CharpickerApplet.panel-applet.in
 applet_DATA     = $(applet_in_files:.panel-applet.in=.panel-applet)
 
 $(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)|" \
             $< > $@
 
 %.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.CharpickerAppletFactory.service.in
-service_DATA     = $(service_in_files:.service.in=.service)
-
-org.gnome.panel.applet.CharpickerAppletFactory.service: $(service_in_files)
-       $(AM_V_GEN)sed \
-            -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \
-            $< > $@
-
-CLEANFILES = $(applet_DATA) $(applet_DATA).in $(service_DATA) \
+CLEANFILES = $(applet_DATA) $(applet_DATA).in \
        $(gsettings_SCHEMAS_in) \
        $(gsettings_SCHEMAS)    \
        *.gschema.valid 
@@ -47,7 +40,6 @@ ui_DATA = charpick-applet-menu.xml
 EXTRA_DIST =                                                   \
        $(gsettings_schemas_in_in) \
        org.gnome.applets.CharpickerApplet.panel-applet.in.in   \
-       $(service_in_files)                                     \
        $(ui_DATA)
 
 -include $(top_srcdir)/git.mk
diff --git a/charpick/org.gnome.applets.CharpickerApplet.panel-applet.in.in 
b/charpick/org.gnome.applets.CharpickerApplet.panel-applet.in.in
index 2ba718c..3566908 100644
--- a/charpick/org.gnome.applets.CharpickerApplet.panel-applet.in.in
+++ b/charpick/org.gnome.applets.CharpickerApplet.panel-applet.in.in
@@ -1,6 +1,7 @@
 [Applet Factory]
 Id=CharpickerAppletFactory
-Location=@LIBEXECDIR@/charpick_applet2
+InProcess=true
+Location=@APPLET_LOCATION@
 _Name=Charpicker Applet Factory
 _Description=Charpicker Applet Factory
 
diff --git a/charpick/src/Makefile.am b/charpick/src/Makefile.am
index df9ffa6..55f8e08 100644
--- a/charpick/src/Makefile.am
+++ b/charpick/src/Makefile.am
@@ -1,30 +1,39 @@
 NULL =
 
-libexec_PROGRAMS = charpick_applet2
+uidir = $(pkgdatadir)/ui
 
-charpick_applet2_CFLAGS = \
+charpick_applet_libdir = $(pkglibdir)/$(LIBPANEL_APPLET_API_VERSION)
+charpick_applet_lib_LTLIBRARIES = libcharacter-picker-applet.la
+
+libcharacter_picker_applet_la_CPPFLAGS = \
        -I. \
        -I$(srcdir) \
        -DCHARPICK_MENU_UI_DIR=\""$(uidir)"\" \
        -DGNOMELOCALEDIR=\""$(localedir)"\" \
+       $(NULL)
+
+libcharacter_picker_applet_la_CFLAGS = \
        $(GNOME_APPLETS_CFLAGS) \
        $(GUCHARMAP_CFLAGS) \
        $(WARN_CFLAGS) \
        $(AM_CFLAGS) \
        $(NULL)
 
-charpick_applet2_SOURCES = \
+libcharacter_picker_applet_la_SOURCES = \
        charpick.c \
        charpick.h \
        properties.c \
        $(NULL)
 
-charpick_applet2_LDFLAGS = \
+libcharacter_picker_applet_la_LDFLAGS = \
+       -avoid-version \
        $(WARN_LDFLAGS) \
        $(AM_LDFLAGS) \
        $(NULL)
 
-charpick_applet2_LDADD = \
+libcharacter_picker_applet_la_LIBADD = \
        $(GNOME_APPLETS_LIBS) \
        $(GUCHARMAP_LIBS) \
        $(NULL)
+
+-include $(top_srcdir)/git.mk
diff --git a/charpick/src/charpick.c b/charpick/src/charpick.c
index 03e9d92..70b1919 100644
--- a/charpick/src/charpick.c
+++ b/charpick/src/charpick.c
@@ -838,8 +838,7 @@ charpicker_applet_factory (PanelApplet *applet,
        return retval;
 }
 
-PANEL_APPLET_OUT_PROCESS_FACTORY ("CharpickerAppletFactory",
-                                 PANEL_TYPE_APPLET,
-                                 charpicker_applet_factory,
-                                 NULL)
-
+PANEL_APPLET_IN_PROCESS_FACTORY ("CharpickerAppletFactory",
+                                 PANEL_TYPE_APPLET,
+                                 charpicker_applet_factory,
+                                 NULL)