[gnome-applets] accessx-status: switch to in-process applet

[Sebastian Geiger <segeiger src gnome org>]

commit 8523213ecac7dba27d3ed20805cba1b9c13191d8
Author: Sebastian Geiger <sbastig gmx net>
Date:   Sun Sep 11 14:06:52 2016 +0200

    accessx-status: switch to in-process applet

 accessx-status/Makefile.am                         |   19 ++++++-------------
 ....applets.AccessxStatusApplet.panel-applet.in.in |    3 ++-
 ...el.applet.AccessxStatusAppletFactory.service.in |    3 ---
 accessx-status/src/Makefile.am                     |   15 ++++++++++-----
 accessx-status/src/applet.c                        |    8 ++++----
 5 files changed, 22 insertions(+), 26 deletions(-)
---
diff --git a/accessx-status/Makefile.am b/accessx-status/Makefile.am
index cc3f063..780026b 100644
--- a/accessx-status/Makefile.am
+++ b/accessx-status/Makefile.am
@@ -2,35 +2,28 @@ NULL =
 
 SUBDIRS = help pixmaps src
 
+APPLET_LOCATION = $(pkglibdir)/$(LIBPANEL_APPLET_API_VERSION)/libaccessx-status-applet.so
+
 appletdir       = $(LIBPANEL_APPLET_DIR)
 applet_in_files = org.gnome.applets.AccessxStatusApplet.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.AccessxStatusAppletFactory.service.in
-service_DATA     = $(service_in_files:.service.in=.service)
-
-org.gnome.panel.applet.AccessxStatusAppletFactory.service: $(service_in_files)
-       $(AM_V_GEN)sed \
-            -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \
-            $< > $@
-
 uidir   = $(pkgdatadir)/ui
 ui_DATA = accessx-status-applet-menu.xml
 
-CLEANFILES = $(applet_DATA) $(applet_DATA).in $(service_DATA) $(ACCESSX_STATUS_APPLET_CLEANFILES)
+CLEANFILES = $(applet_DATA) $(applet_DATA).in $(ACCESSX_STATUS_APPLET_CLEANFILES)
 
 EXTRA_DIST = \
        org.gnome.applets.AccessxStatusApplet.panel-applet.in.in \
-       $(service_in_files) \
-       $(ui_DATA)
+       $(ui_DATA) \
+       $(NULL)
 
 -include $(top_srcdir)/git.mk
diff --git a/accessx-status/org.gnome.applets.AccessxStatusApplet.panel-applet.in.in 
b/accessx-status/org.gnome.applets.AccessxStatusApplet.panel-applet.in.in
index ba91445..50bb813 100644
--- a/accessx-status/org.gnome.applets.AccessxStatusApplet.panel-applet.in.in
+++ b/accessx-status/org.gnome.applets.AccessxStatusApplet.panel-applet.in.in
@@ -1,6 +1,7 @@
 [Applet Factory]
 Id=AccessxStatusAppletFactory
-Location=@LIBEXECDIR@/accessx-status-applet
+InProcess=true
+Location=@APPLET_LOCATION@
 _Name=AccessX Status Applet Factory
 _Description=Keyboard Accessibility Status Applet Factory
 
diff --git a/accessx-status/src/Makefile.am b/accessx-status/src/Makefile.am
index a92ba3d..8309e4a 100644
--- a/accessx-status/src/Makefile.am
+++ b/accessx-status/src/Makefile.am
@@ -2,12 +2,16 @@ NULL =
 
 uidir   = $(pkgdatadir)/ui
 
-libexec_PROGRAMS = accessx-status-applet
+accessx_status_applet_libdir = $(pkglibdir)/$(LIBPANEL_APPLET_API_VERSION)
+accessx_status_applet_lib_LTLIBRARIES = libaccessx-status-applet.la
 
-accessx_status_applet_CFLAGS = \
+libaccessx_status_applet_la_CPPFLAGS = \
        -DACCESSX_PIXMAPS_DIR=\""$(pkgdatadir)/accessx-status-applet/pixmaps"\" \
        -DACCESSX_MENU_UI_DIR=\""$(uidir)"\" \
        -DGNOMELOCALEDIR=\""$(localedir)"\" \
+       $(NULL)
+
+libaccessx_status_applet_la_CFLAGS = \
        $(GNOME_APPLETS_CFLAGS) \
        $(GIO_CFLAGS) \
        $(GIO_UNIX_CFLAGS) \
@@ -15,17 +19,18 @@ accessx_status_applet_CFLAGS = \
        $(AM_CFLAGS) \
        $(NULL)
 
-accessx_status_applet_SOURCES = \
+libaccessx_status_applet_la_SOURCES = \
        applet.c \
        applet.h \
        $(NULL)
 
-accessx_status_applet_LDFLAGS = \
+libaccessx_status_applet_la_LDFLAGS = \
+       -avoid-version \
        $(WARN_LDFLAGS) \
        $(AM_LDFLAGS) \
        $(NULL)
 
-accessx_status_applet_LDADD = \
+libaccessx_status_applet_la_LIBADD = \
        $(GNOME_APPLETS_LIBS) \
        $(GIO_LIBS) \
        $(GIO_UNIX_LIBS) \
diff --git a/accessx-status/src/applet.c b/accessx-status/src/applet.c
index e264f3e..44d9a34 100644
--- a/accessx-status/src/applet.c
+++ b/accessx-status/src/applet.c
@@ -1317,7 +1317,7 @@ accessx_status_applet_factory (PanelApplet *applet,
        return retval;
 }
 
-PANEL_APPLET_OUT_PROCESS_FACTORY ("AccessxStatusAppletFactory",
-                                 PANEL_TYPE_APPLET,
-                                 accessx_status_applet_factory,
-                                 NULL)
+PANEL_APPLET_IN_PROCESS_FACTORY ("AccessxStatusAppletFactory",
+                                 PANEL_TYPE_APPLET,
+                                 accessx_status_applet_factory,
+                                 NULL)