[gnome-applets] multiload: switch to in-process

[Sebastian Geiger <segeiger src gnome org>]

commit 719a2e4c11372ce7b0b66a707d20443ab4ba5512
Author: Sebastian Geiger <sbastig gmx net>
Date:   Wed Sep 7 12:20:02 2016 +0200

    multiload: switch to in-process

 multiload/Makefile.am                              |   14 ++---------
 ...nome.applets.MultiLoadApplet.panel-applet.in.in |    3 +-
 ....panel.applet.MultiLoadAppletFactory.service.in |    3 --
 multiload/src/Makefile.am                          |   24 ++++++++++++-------
 multiload/src/main.c                               |    8 +++---
 5 files changed, 24 insertions(+), 28 deletions(-)
---
diff --git a/multiload/Makefile.am b/multiload/Makefile.am
index 3edaef3..6bbf14a 100644
--- a/multiload/Makefile.am
+++ b/multiload/Makefile.am
@@ -2,6 +2,8 @@ NULL =
 
 SUBDIRS = help src
 
+APPLET_LOCATION=$(pkglibdir)/$(LIBPANEL_APPLET_API_VERSION)/libmultiload-applet.so
+
 gsettings_schemas_in_in = \
        org.gnome.gnome-applets.multiload.gschema.xml.in.in
 
@@ -30,24 +32,14 @@ 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.MultiLoadAppletFactory.service.in
-service_DATA     = $(service_in_files:.service.in=.service)
-
-org.gnome.panel.applet.MultiLoadAppletFactory.service: $(service_in_files)
-       $(AM_V_GEN)sed \
-            -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \
-            $< > $@
-
 CLEANFILES = $(applet_DATA) \
        $(applet_DATA).in \
-       $(service_DATA) \
        $(gsettings_SCHEMAS_in) \
        $(gsettings_SCHEMAS) \
        *.gschema.valid
diff --git a/multiload/org.gnome.applets.MultiLoadApplet.panel-applet.in.in 
b/multiload/org.gnome.applets.MultiLoadApplet.panel-applet.in.in
index f229c3d..8c95e53 100644
--- a/multiload/org.gnome.applets.MultiLoadApplet.panel-applet.in.in
+++ b/multiload/org.gnome.applets.MultiLoadApplet.panel-applet.in.in
@@ -1,6 +1,7 @@
 [Applet Factory]
 Id=MultiLoadAppletFactory
-Location=@LIBEXECDIR@/multiload-applet-2
+InProcess=true
+Location=@APPLET_LOCATION@
 Name=MultiLoad Applet Factory
 Description=Factory for creating the load applet.
 
diff --git a/multiload/src/Makefile.am b/multiload/src/Makefile.am
index 0d8dff7..258df9c 100644
--- a/multiload/src/Makefile.am
+++ b/multiload/src/Makefile.am
@@ -2,12 +2,16 @@ NULL =
 
 uidir = $(pkgdatadir)/ui
 
-libexec_PROGRAMS = multiload-applet-2
+multiload_appletlibdir = $(pkglibdir)/$(LIBPANEL_APPLET_API_VERSION)
+multiload_appletlib_LTLIBRARIES = libmultiload-applet.la
 
-multiload_applet_2_CFLAGS = \
+libmultiload_applet_la_CPPFLAGS = \
        -I$(srcdir) \
        -DMULTILOAD_MENU_UI_DIR=\""$(uidir)"\" \
        -DGNOMELOCALEDIR=\""$(localedir)"\" \
+       $(NULL)
+
+libmultiload_applet_la_CFLAGS = \
        $(GNOME_APPLETS_CFLAGS) \
        $(GTOP_APPLETS_CFLAGS) \
        $(GIO_UNIX_CFLAGS) \
@@ -15,25 +19,27 @@ multiload_applet_2_CFLAGS = \
        $(AM_CFLAGS) \
        $(NULL)
 
-multiload_applet_2_SOURCES = \
+libmultiload_applet_la_SOURCES = \
+       autoscaler.c \
+       autoscaler.h \
        global.h \
+       linux-proc.c \
        linux-proc.h \
        load-graph.h \
-       linux-proc.c \
        load-graph.c \
        main.c \
+       netspeed.c \
+       netspeed.h \
        properties.c \
-       netspeed.c netspeed.h \
-       autoscaler.c \
-       autoscaler.h \
        $(NULL)
 
-multiload_applet_2_LDFLAGS = \
+libmultiload_applet_la_LDFLAGS = \
+       -avoid-version \
        $(WARN_LDFLAGS) \
        $(AM_LDFLAGS) \
        $(NULL)
 
-multiload_applet_2_LDADD = \
+libmultiload_applet_la_LIBADD = \
        $(GNOME_APPLETS_LIBS) \
        $(GTOP_APPLETS_LIBS) \
        $(GIO_UNIX_LIBS) \
diff --git a/multiload/src/main.c b/multiload/src/main.c
index 56b8da9..51bb467 100644
--- a/multiload/src/main.c
+++ b/multiload/src/main.c
@@ -536,7 +536,7 @@ multiload_factory (PanelApplet *applet,
        return retval;
 }
 
-PANEL_APPLET_OUT_PROCESS_FACTORY ("MultiLoadAppletFactory",
-                                 PANEL_TYPE_APPLET,
-                                 multiload_factory,
-                                 NULL)
+PANEL_APPLET_IN_PROCESS_FACTORY ("MultiLoadAppletFactory",
+                                 PANEL_TYPE_APPLET,
+                                 multiload_factory,
+                                 NULL)