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, 67 insertions, 28 deletions

diff --git a/trashapplet/data/Makefile.am b/trashapplet/data/Makefile.am
index f318e0fb..8449ac6e 100644
--- a/trashapplet/data/Makefile.am
+++ b/trashapplet/data/Makefile.am
@@ -1,25 +1,42 @@
-APPLET_LOCATION = $(libdir)/mate-applets/libtrashapplet.so
+applet_in_files = org.mate.applets.TrashApplet.mate-panel-applet.desktop.in
+service_in_files = org.mate.panel.applet.TrashAppletFactory.service.in
+
+if ENABLE_IN_PROCESS
+APPLET_LOCATION = $(pkglibdir)/libmate-trash-applet.so
+else !ENABLE_IN_PROCESS
+APPLET_LOCATION = $(libexecdir)/trashapplet
+endif !ENABLE_IN_PROCESS
 
 appletdir       = $(datadir)/mate-panel/applets
-applet_in_files = org.mate.applets.TrashApplet.mate-panel-applet.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
 
-EXTRA_DIST = \
-	$(applet_in_files).in	\
-	trashapplet-empty-progress.ui \
-	trashapplet-menu.xml \
+EXTRA_DIST =					\
+	$(applet_in_files).in			\
+	$(service_in_files)			\
+	trashapplet-empty-progress.ui		\
+	trashapplet-menu.xml			\
 	trashapplet-resources.gresource.xml
 
-CLEANFILES = $(applet_DATA) $(applet_in_files)
+CLEANFILES = $(applet_DATA) $(applet_in_files) $(service_DATA)
 
 -include $(top_srcdir)/git.mk
diff --git a/trashapplet/data/org.mate.applets.TrashApplet.mate-panel-applet.desktop.in.in b/trashapplet/data/org.mate.applets.TrashApplet.mate-panel-applet.desktop.in.in
index d62a5a74..349d2116 100644
--- a/trashapplet/data/org.mate.applets.TrashApplet.mate-panel-applet.desktop.in.in
+++ b/trashapplet/data/org.mate.applets.TrashApplet.mate-panel-applet.desktop.in.in
@@ -1,6 +1,6 @@
 [Applet Factory]
 Id=TrashAppletFactory
-InProcess=true
+InProcess=@APPLET_IN_PROCESS@
 Location=@APPLET_LOCATION@
 Name=Trash Applet Factory
 Description=Trash Applet Factory
diff --git a/trashapplet/data/org.mate.panel.applet.TrashAppletFactory.service.in b/trashapplet/data/org.mate.panel.applet.TrashAppletFactory.service.in
new file mode 100644
index 00000000..9a406173
--- /dev/null
+++ b/trashapplet/data/org.mate.panel.applet.TrashAppletFactory.service.in
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=org.mate.panel.applet.TrashAppletFactory
+Exec=@APPLET_LOCATION@
diff --git a/trashapplet/src/Makefile.am b/trashapplet/src/Makefile.am
index 1cad7acd..6cb5ef0a 100644
--- a/trashapplet/src/Makefile.am
+++ b/trashapplet/src/Makefile.am
@@ -4,31 +4,46 @@ AM_CPPFLAGS = -I$(top_srcdir)	\
 	-DGRESOURCE=\""/org/mate/mate-applets/trash/\"" \
 	${WARN_CFLAGS}
 
-trashapplet_libdir= $(pkglibdir)
-trashapplet_lib_LTLIBRARIES=libtrashapplet.la
-
-libtrashapplet_la_SOURCES = \
-	trashapplet.c \
-	trash-empty.h \
-	trash-empty.c \
-	xstuff.c \
-	xstuff.h \
-	trashapplet-resources.c \
-	trashapplet-resources.h \
+BUILT_SOURCES =			\
+	trashapplet-resources.c	\
+	trashapplet-resources.h	\
+	$(NULL)
+APPLET_SOURCES =	\
+	trashapplet.c	\
+	trash-empty.h	\
+	trash-empty.c	\
+	xstuff.c	\
+	xstuff.h	\
 	$(NULL)
 
-libtrashapplet_la_LIBADD = 		\
-	$(MATE_APPLETS4_LIBS) 	\
-	$(GIO_LIBS) \
+APPLET_LIBS = 			\
+	$(MATE_APPLETS4_LIBS)	\
+	$(GIO_LIBS)		\
 	-lX11
 
+if ENABLE_IN_PROCESS
+pkglib_LTLIBRARIES = libmate-trash-applet.la
+nodist_libmate_trash_applet_la_SOURCES = $(BUILT_SOURCES)
+libmate_trash_applet_la_SOURCES = $(APPLET_SOURCES)
+libmate_trash_applet_la_CFLAGS = $(AM_CFLAGS)
+libmate_trash_applet_la_LDFLAGS = -module -avoid-version
+libmate_trash_applet_la_LIBADD = $(APPLET_LIBS)
+else !ENABLE_IN_PROCESS
+libexec_PROGRAMS = trashapplet
+nodist_trashapplet_SOURCES = $(BUILT_SOURCES)
+trashapplet_SOURCES = $(APPLET_SOURCES)
+trashapplet_CFLAGS = $(AM_CFLAGS)
+trashapplet_LDADD = $(APPLET_LIBS)
+endif !ENABLE_IN_PROCESS
+
 trashapplet-resources.c: ../data/trashapplet-resources.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)/../data/ --generate-dependencies $(srcdir)/../data/trashapplet-resources.gresource.xml)
 	$(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)/../data/ --generate --c-name trashapplet $<
 
 trashapplet-resources.h: ../data/trashapplet-resources.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)/../data/ --generate-dependencies $(srcdir)/../data/trashapplet-resources.gresource.xml)
 	$(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)/../data/ --generate --c-name trashapplet $<
 
-CLEANFILES = \
+CLEANFILES =			\
+	$(BUILT_SOURCES)	\
 	$(NULL)
 
 -include $(top_srcdir)/git.mk
diff --git a/trashapplet/src/trashapplet.c b/trashapplet/src/trashapplet.c
index 515bab10..f8a1bfc6 100644
--- a/trashapplet/src/trashapplet.c
+++ b/trashapplet/src/trashapplet.c
@@ -631,6 +631,10 @@ trash_applet_factory (MatePanelApplet *applet,
       AtkObject *atk_obj;
       GtkActionGroup *action_group;
 
+#ifndef ENABLE_IN_PROCESS
+      g_set_application_name (_("Trash Applet"));
+#endif
+
       gtk_window_set_default_icon_name ("user-trash");
 
       /* Set up the menu */
@@ -659,8 +663,8 @@ trash_applet_factory (MatePanelApplet *applet,
   return retval;
 }
 
-MATE_PANEL_APPLET_IN_PROCESS_FACTORY ("TrashAppletFactory",
-				  TRASH_TYPE_APPLET,
-				  "TrashApplet",
-				  trash_applet_factory,
-				  NULL)
+PANEL_APPLET_FACTORY ("TrashAppletFactory",
+		      TRASH_TYPE_APPLET,
+		      "TrashApplet",
+		      trash_applet_factory,
+		      NULL)