Allow building all applets in or out of process

*Use --enable-in-process selector for in-process builds

*Accessx-status: mark as incompatable with wayland

*Accessx-status: Fix in-process runtime warning

*Stickynote, Geyes: style fixes

5 files changed, 59 insertions, 20 deletions

diff --git a/multiload/data/Makefile.am b/multiload/data/Makefile.am
index c98d4ff5..377ddc3f 100644
--- a/multiload/data/Makefile.am
+++ b/multiload/data/Makefile.am
@@ -1,35 +1,52 @@
 NULL =
 
-APPLET_LOCATION = $(libdir)/mate-applets/libmate-multiload-applet.so
+applet_in_files = org.mate.applets.MultiLoadApplet.mate-panel-applet.desktop.in
+service_in_files = org.mate.panel.applet.MultiLoadAppletFactory.service.in
+gschema_in_files = org.mate.panel.applet.multiload.gschema.xml.in
 
-multiload_gschema_in_files = org.mate.panel.applet.multiload.gschema.xml.in
-gsettings_SCHEMAS = $(multiload_gschema_in_files:.xml.in=.xml)
+if ENABLE_IN_PROCESS
+APPLET_LOCATION = $(pkglibdir)/libmate-multiload-applet.so
+else !ENABLE_IN_PROCESS
+APPLET_LOCATION = $(libexecdir)/mate-multiload-applet
+endif !ENABLE_IN_PROCESS
+
+gsettings_SCHEMAS = $(gschema_in_files:.xml.in=.xml)
 @GSETTINGS_RULES@
 
 appletdir          = $(datadir)/mate-panel/applets
-applet_in_in_files = org.mate.applets.MultiLoadApplet.mate-panel-applet.desktop.in.in
-applet_in_files    = $(applet_in_in_files:.desktop.in.in=.desktop.in)
 applet_DATA        = $(applet_in_files:.mate-panel-applet.desktop.in=.mate-panel-applet)
 
 $(applet_in_files): $(applet_in_files).in Makefile
 	$(AM_V_GEN)sed \
             -e "s|\@APPLET_LOCATION\@|$(APPLET_LOCATION)|" \
+            -e "s|\@APPLET_IN_PROCESS\@|$(APPLET_IN_PROCESS)|" \
             -e "s|\@VERSION\@|$(PACKAGE_VERSION)|" \
             $< > $@
 
 $(applet_DATA): $(applet_in_files) Makefile
 	$(AM_V_GEN) $(MSGFMT) --desktop --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@
 
+if !ENABLE_IN_PROCESS
+servicedir = $(datadir)/dbus-1/services
+service_DATA = $(service_in_files:.service.in=.service)
+
+$(service_DATA): $(service_in_files) Makefile
+	$(AM_V_GEN)sed \
+		-e "s|\@APPLET_LOCATION\@|$(APPLET_LOCATION)|" \
+		$< > $@
+endif !ENABLE_IN_PROCESS
 
 CLEANFILES = \
 	$(applet_DATA) \
 	$(applet_in_files) \
+	$(service_DATA) \
 	$(gsettings_SCHEMAS) \
 	*.gschema.valid
 
 EXTRA_DIST = \
-	$(applet_in_in_files) \
-	$(multiload_gschema_in_files) \
+	$(applet_in_files).in \
+	$(service_in_files) \
+	$(gschema_in_files) \
 	multiload-applet-menu.xml \
 	multiload-resources.gresource.xml \
 	properties.ui
diff --git a/multiload/data/org.mate.applets.MultiLoadApplet.mate-panel-applet.desktop.in.in b/multiload/data/org.mate.applets.MultiLoadApplet.mate-panel-applet.desktop.in.in
index 7ce492c2..a2b9de2d 100644
--- a/multiload/data/org.mate.applets.MultiLoadApplet.mate-panel-applet.desktop.in.in
+++ b/multiload/data/org.mate.applets.MultiLoadApplet.mate-panel-applet.desktop.in.in
@@ -1,7 +1,7 @@
 [Applet Factory]
 Id=MultiLoadAppletFactory
 Location=@APPLET_LOCATION@
-InProcess=true
+InProcess=@APPLET_IN_PROCESS@
 Name=MultiLoad Applet Factory
 Description=Factory for creating the load applet.
 
diff --git a/multiload/data/org.mate.panel.applet.MultiLoadAppletFactory.service.in b/multiload/data/org.mate.panel.applet.MultiLoadAppletFactory.service.in
new file mode 100644
index 00000000..0c75e063
--- /dev/null
+++ b/multiload/data/org.mate.panel.applet.MultiLoadAppletFactory.service.in
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=org.mate.panel.applet.MultiLoadAppletFactory
+Exec=@APPLET_LOCATION@
diff --git a/multiload/src/Makefile.am b/multiload/src/Makefile.am
index 6efa6796..6b42871f 100644
--- a/multiload/src/Makefile.am
+++ b/multiload/src/Makefile.am
@@ -1,8 +1,5 @@
 NULL =
 
-mate_multiload_applet_libdir= $(pkglibdir)
-mate_multiload_applet_lib_LTLIBRARIES=libmate-multiload-applet.la
-
 AM_CPPFLAGS = \
 	-I$(srcdir) \
 	-DMULTILOAD_RESOURCE_PATH=\""/org/mate/mate-applets/multiload/"\" \
@@ -11,7 +8,11 @@ AM_CPPFLAGS = \
 	$(GIO_CFLAGS) \
 	${WARN_CFLAGS}
 
-libmate_multiload_applet_la_SOURCES = \
+BUILT_SOURCES = \
+	multiload-resources.c \
+	multiload-resources.h \
+	$(NULL)
+APPLET_SOURCES = \
 	global.h \
 	linux-proc.h \
 	load-graph.h \
@@ -22,16 +23,29 @@ libmate_multiload_applet_la_SOURCES = \
 	netspeed.c netspeed.h \
 	autoscaler.c \
 	autoscaler.h \
-	multiload-resources.c \
-	multiload-resources.h \
 	$(NULL)
 
-libmate_multiload_applet_la_LIBADD = \
+APPLET_LIBS = \
 	$(MATE_APPLETS4_LIBS) \
 	$(GTOP_APPLETS_LIBS) \
 	$(GIO_LIBS) \
 	-lm
 
+if ENABLE_IN_PROCESS
+pkglib_LTLIBRARIES = libmate-multiload-applet.la
+nodist_libmate_multiload_applet_la_SOURCES = $(BUILT_SOURCES)
+libmate_multiload_applet_la_SOURCES = $(APPLET_SOURCES)
+libmate_multiload_applet_la_CFLAGS = $(AM_CFLAGS)
+libmate_multiload_applet_la_LDFLAGS = -module -avoid-version
+libmate_multiload_applet_la_LIBADD = $(APPLET_LIBS)
+else !ENABLE_IN_PROCESS
+libexec_PROGRAMS = mate-multiload-applet
+nodist_mate_multiload_applet_SOURCES = $(BUILT_SOURCES)
+mate_multiload_applet_SOURCES = $(APPLET_SOURCES)
+mate_multiload_applet_CFLAGS = $(AM_CFLAGS)
+mate_multiload_applet_LDADD = $(APPLET_LIBS)
+endif !ENABLE_IN_PROCESS
+
 multiload-resources.c: $(srcdir)/../data/multiload-resources.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)/../data --generate-dependencies $(srcdir)/../data/multiload-resources.gresource.xml)
 	$(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)/../data --generate --c-name multiload $<
 
@@ -39,6 +53,7 @@ multiload-resources.h: $(srcdir)/../data/multiload-resources.gresource.xml $(she
 	$(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)/../data --generate --c-name multiload $<
 
 CLEANFILES = \
+	$(BUILT_SOURCES) \
 	$(NULL)
 
 -include $(top_srcdir)/git.mk
diff --git a/multiload/src/main.c b/multiload/src/main.c
index 80d365cd..9439b320 100644
--- a/multiload/src/main.c
+++ b/multiload/src/main.c
@@ -495,6 +495,10 @@ multiload_applet_new(MatePanelApplet *applet, const gchar *iid, gpointer data)
     ma->prop_dialog = NULL;
         ma->last_clicked = 0;
 
+#ifndef ENABLE_IN_PROCESS
+    g_set_application_name (_("System Monitor"));
+#endif
+
     gtk_window_set_default_icon_name ("utilities-system-monitor");
 
     ma->settings = mate_panel_applet_settings_new (applet, "org.mate.panel.applet.multiload");
@@ -573,8 +577,8 @@ multiload_factory (MatePanelApplet *applet,
     return retval;
 }
 
-MATE_PANEL_APPLET_IN_PROCESS_FACTORY ("MultiLoadAppletFactory",
-                                       PANEL_TYPE_APPLET,
-                                       "multiload",
-                                       multiload_factory,
-                                       NULL)
+PANEL_APPLET_FACTORY ("MultiLoadAppletFactory",
+                      PANEL_TYPE_APPLET,
+                      "multiload",
+                      multiload_factory,
+                      NULL)