diff options
| author | lukefromdc <[email protected]> | 2023-07-11 21:28:01 -0400 |
|---|---|---|
| committer | raveit65 <[email protected]> | 2023-07-17 02:47:28 +0200 |
| commit | 08bb8398e0d218daaefdfe95c44940e370802508 (patch) | |
| tree | 0c567b638dd31d831141a2ca4ef355a406883e08 /trashapplet/data | |
| parent | f94afff3bd198dca2412a75053e122c55b4b48dd (diff) | |
| download | mate-applets-08bb8398e0d218daaefdfe95c44940e370802508.tar.bz2 mate-applets-08bb8398e0d218daaefdfe95c44940e370802508.tar.xz | |
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
Diffstat (limited to 'trashapplet/data')
3 files changed, 28 insertions, 8 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@ |