diff options
| author | lukefromdc <[email protected]> | 2023-06-19 17:31:40 -0400 |
|---|---|---|
| committer | raveit65 <[email protected]> | 2023-07-17 02:47:28 +0200 |
| commit | 6133a03263321ab85fae9299968a8f069b3dfad5 (patch) | |
| tree | 3c30161fa82a4f60ffb68a30239df87571ab3e72 /multiload/data | |
| parent | ed185133fa170ee018dfa25e1010b1fcf4238c78 (diff) | |
| download | mate-applets-6133a03263321ab85fae9299968a8f069b3dfad5.tar.bz2 mate-applets-6133a03263321ab85fae9299968a8f069b3dfad5.tar.xz | |
multiload: port to in-process for wayland
*Fully functional on both x11 and wayland
Diffstat (limited to 'multiload/data')
3 files changed, 8 insertions, 15 deletions
diff --git a/multiload/data/Makefile.am b/multiload/data/Makefile.am index 0f1f9723..c98d4ff5 100644 --- a/multiload/data/Makefile.am +++ b/multiload/data/Makefile.am @@ -1,3 +1,7 @@ +NULL = + +APPLET_LOCATION = $(libdir)/mate-applets/libmate-multiload-applet.so + multiload_gschema_in_files = org.mate.panel.applet.multiload.gschema.xml.in gsettings_SCHEMAS = $(multiload_gschema_in_files:.xml.in=.xml) @GSETTINGS_RULES@ @@ -9,32 +13,22 @@ applet_DATA = $(applet_in_files:.mate-panel-applet.desktop.in=.mate-panel $(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)|" \ $< > $@ $(applet_DATA): $(applet_in_files) Makefile $(AM_V_GEN) $(MSGFMT) --desktop --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@ -servicedir = $(datadir)/dbus-1/services -service_in_files = org.mate.panel.applet.MultiLoadAppletFactory.service.in -service_DATA = $(service_in_files:.service.in=.service) - -org.mate.panel.applet.MultiLoadAppletFactory.service: $(service_in_files) - $(AM_V_GEN)sed \ - -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \ - $< > $@ CLEANFILES = \ $(applet_DATA) \ $(applet_in_files) \ - $(service_DATA) \ $(gsettings_SCHEMAS) \ *.gschema.valid EXTRA_DIST = \ $(applet_in_in_files) \ - $(service_in_files) \ $(multiload_gschema_in_files) \ multiload-applet-menu.xml \ multiload-resources.gresource.xml \ 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 3eacb2fb..7ce492c2 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,6 +1,7 @@ [Applet Factory] Id=MultiLoadAppletFactory -Location=@LIBEXECDIR@/mate-multiload-applet +Location=@APPLET_LOCATION@ +InProcess=true Name=MultiLoad Applet Factory Description=Factory for creating the load applet. @@ -10,6 +11,7 @@ Description=A system load indicator # Translators: Do NOT translate or transliterate this text (this is an icon file name)! Icon=utilities-system-monitor MateComponentId=OAFIID:MATE_MultiLoadApplet +Platforms=X11;Wayland; X-MATE-Bugzilla-Bugzilla=MATE X-MATE-Bugzilla-Product=mate-applets X-MATE-Bugzilla-Component=multiload diff --git a/multiload/data/org.mate.panel.applet.MultiLoadAppletFactory.service.in b/multiload/data/org.mate.panel.applet.MultiLoadAppletFactory.service.in deleted file mode 100644 index d4c7da3c..00000000 --- a/multiload/data/org.mate.panel.applet.MultiLoadAppletFactory.service.in +++ /dev/null @@ -1,3 +0,0 @@ -[D-BUS Service] -Name=org.mate.panel.applet.MultiLoadAppletFactory -Exec=@LIBEXECDIR@/mate-multiload-applet |