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, 61 insertions, 21 deletions

diff --git a/timerapplet/data/Makefile.am b/timerapplet/data/Makefile.am
index 2b8cebd4..ae0139b6 100644
--- a/timerapplet/data/Makefile.am
+++ b/timerapplet/data/Makefile.am
@@ -1,26 +1,44 @@
 NULL =
 
-APPLET_LOCATION = $(libdir)/mate-applets/libmate-timer-applet.so
+applets_in_files = org.mate.applets.TimerApplet.mate-panel-applet.desktop.in
+service_in_files = org.mate.panel.applet.TimerAppletFactory.service.in
+gschema_in_files = org.mate.panel.applet.timer.gschema.xml.in
+
+if ENABLE_IN_PROCESS
+APPLET_LOCATION = $(pkglibdir)/libmate-timer-applet.so
+else !ENABLE_IN_PROCESS
+APPLET_LOCATION = $(libexecdir)/timer-applet
+endif !ENABLE_IN_PROCESS
 
 appletsdir       = $(datadir)/mate-panel/applets
-applets_in_files = org.mate.applets.TimerApplet.mate-panel-applet.desktop.in
 applets_DATA     = $(applets_in_files:.mate-panel-applet.desktop.in=.mate-panel-applet)
 
 $(applets_in_files): $(applets_in_files).in Makefile
 	$(AM_V_GEN)sed \
 		-e "s|\@APPLET_LOCATION\@|$(APPLET_LOCATION)|" \
+		-e "s|\@APPLET_IN_PROCESS\@|$(APPLET_IN_PROCESS)|" \
 		$< > $@
+
 $(applets_DATA): $(applets_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
 
-timer_gschema_in_files = org.mate.panel.applet.timer.gschema.xml.in
-gsettings_SCHEMAS = $(timer_gschema_in_files:.xml.in=.xml)
+gsettings_SCHEMAS = $(gschema_in_files:.xml.in=.xml)
 @GSETTINGS_RULES@
 
 EXTRA_DIST =					\
 	$(applets_in_files).in			\
-	$(timer_gschema_in_files)		\
+	$(service_in_files)			\
+	$(gschema_in_files)			\
 	timerapplet-preferences.ui		\
 	timerapplet-resources.gresource.xml	\
 	$(NULL)
@@ -28,6 +46,7 @@ EXTRA_DIST =					\
 CLEANFILES =			\
 	$(applets_DATA)		\
 	$(applets_in_files)	\
+	$(service_DATA)		\
 	$(gsettings_SCHEMAS)	\
 	*.gschema.valid		\
 	$(NULL)
diff --git a/timerapplet/data/org.mate.applets.TimerApplet.mate-panel-applet.desktop.in.in b/timerapplet/data/org.mate.applets.TimerApplet.mate-panel-applet.desktop.in.in
index 86b18021..53fdd9ea 100644
--- a/timerapplet/data/org.mate.applets.TimerApplet.mate-panel-applet.desktop.in.in
+++ b/timerapplet/data/org.mate.applets.TimerApplet.mate-panel-applet.desktop.in.in
@@ -1,13 +1,13 @@
 [Applet Factory]
 Id=TimerAppletFactory
 Location=@APPLET_LOCATION@
-InProcess=true
+InProcess=@APPLET_IN_PROCESS@
 Name=Timer Factory
 Description=Timer Factory
 
 [TimerApplet]
 Name=Timer
 Description=Start a timer and receive a notification when it is finished
-Platforms=X11;Wayland
+Platforms=X11;Wayland;
 # Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 Icon=mate-panel-clock
diff --git a/timerapplet/data/org.mate.panel.applet.TimerAppletFactory.service.in b/timerapplet/data/org.mate.panel.applet.TimerAppletFactory.service.in
new file mode 100644
index 00000000..6e9f0a84
--- /dev/null
+++ b/timerapplet/data/org.mate.panel.applet.TimerAppletFactory.service.in
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=org.mate.panel.applet.TimerAppletFactory
+Exec=@APPLET_LOCATION@
diff --git a/timerapplet/src/Makefile.am b/timerapplet/src/Makefile.am
index 5341cc16..75688baa 100644
--- a/timerapplet/src/Makefile.am
+++ b/timerapplet/src/Makefile.am
@@ -1,8 +1,5 @@
 NULL =
 
-mate_timer_applet_libdir= $(pkglibdir)
-mate_timer_applet_lib_LTLIBRARIES=libmate-timer-applet.la
-
 AM_CPPFLAGS =				\
 	$(MATE_APPLETS4_CFLAGS)		\
 	$(LIBNOTIFY_CFLAGS)		\
@@ -10,18 +7,35 @@ AM_CPPFLAGS =				\
 	$(DISABLE_DEPRECATED_CFLAGS)	\
 	$(NULL)
 
-libmate_timer_applet_la_SOURCES = 		\
-	timerapplet.c		\
-    timerapplet-resources.c \
-    timerapplet-resources.h  \
+AM_CFLAGS = $(WARN_CFLAGS)
+
+BUILT_SOURCES =			\
+	timerapplet-resources.c	\
+	timerapplet-resources.h	\
+	$(NULL)
+APPLET_SOURCES = 		\
+	timerapplet.c	\
 	$(NULL)
 
-libmate_timer_applet_la_LIBADD =		\
+APPLET_LIBS =			\
 	$(MATE_APPLETS4_LIBS)	\
 	$(LIBNOTIFY_LIBS)	\
 	$(NULL)
 
-libmate_timer_applet_la_CFLAGS = $(WARN_CFLAGS)
+if ENABLE_IN_PROCESS
+pkglib_LTLIBRARIES = libmate-timer-applet.la
+nodist_libmate_timer_applet_la_SOURCES = $(BUILT_SOURCES)
+libmate_timer_applet_la_SOURCES = $(APPLET_SOURCES)
+libmate_timer_applet_la_CFLAGS = $(AM_CFLAGS)
+libmate_timer_applet_la_LDFLAGS = -module -avoid-version
+libmate_timer_applet_la_LIBADD = $(APPLET_LIBS)
+else !ENABLE_IN_PROCESS
+libexec_PROGRAMS = timer-applet
+nodist_timer_applet_SOURCES = $(BUILT_SOURCES)
+timer_applet_SOURCES = $(APPLET_SOURCES)
+timer_applet_CFLAGS = $(AM_CFLAGS)
+timer_applet_LDADD = $(APPLET_LIBS)
+endif !ENABLE_IN_PROCESS
 
 timerapplet-resources.c: $(srcdir)/../data/timerapplet-resources.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)/../data --generate-dependencies $(srcdir)/../data/timerapplet-resources.gresource.xml)
 	$(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)/../data --generate --c-name timerapplet $<
@@ -30,6 +44,7 @@ timerapplet-resources.h: $(srcdir)/../data/timerapplet-resources.gresource.xml $
 	$(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)/../data --generate --c-name timerapplet $<
 
 CLEANFILES =			\
+	$(BUILT_SOURCES)	\
 	$(NULL)
 
 -include $(top_srcdir)/git.mk
diff --git a/timerapplet/src/timerapplet.c b/timerapplet/src/timerapplet.c
index f2fcfc1e..2c397b16 100644
--- a/timerapplet/src/timerapplet.c
+++ b/timerapplet/src/timerapplet.c
@@ -376,6 +376,9 @@ timer_applet_fill (MatePanelApplet* applet_widget)
     TimerApplet *applet;
     AtkObject   *atk_obj;
 
+#ifndef ENABLE_IN_PROCESS
+    g_set_application_name (_("Timer Applet"));
+#endif
     gtk_window_set_default_icon_name (APPLET_ICON);
 
     if (!notify_is_initted ())
@@ -456,8 +459,8 @@ timer_factory (MatePanelApplet* applet, const char* iid, gpointer data)
 }
 
 /* needed by mate-panel applet library */
-MATE_PANEL_APPLET_IN_PROCESS_FACTORY("TimerAppletFactory",
-                                      PANEL_TYPE_APPLET,
-                                      "Timer applet",
-                                      timer_factory,
-                                      NULL)
+PANEL_APPLET_FACTORY ("TimerAppletFactory",
+                      PANEL_TYPE_APPLET,
+                      "Timer applet",
+                      timer_factory,
+                      NULL)