diff options
| author | lukefromdc <[email protected]> | 2023-06-19 18:03:18 -0400 |
|---|---|---|
| committer | raveit65 <[email protected]> | 2023-07-17 02:47:28 +0200 |
| commit | 6dd9ab19ab5a72c203dab7c2c96277f77e222260 (patch) | |
| tree | 655c629bbf936cb5a63c5b840c35bc8f77649f6d /netspeed/data | |
| parent | ce52935ec89bacd417ca6065012986e83a920f48 (diff) | |
| download | mate-applets-6dd9ab19ab5a72c203dab7c2c96277f77e222260.tar.bz2 mate-applets-6dd9ab19ab5a72c203dab7c2c96277f77e222260.tar.xz | |
netspeed: port to in-process for wayland
*Also switch to automatic signal handling/disconnection
*Otherwise this applet when in-process will segfault on removal
Diffstat (limited to 'netspeed/data')
3 files changed, 5 insertions, 17 deletions
diff --git a/netspeed/data/Makefile.am b/netspeed/data/Makefile.am index 350217f2..e8bec0e1 100644 --- a/netspeed/data/Makefile.am +++ b/netspeed/data/Makefile.am @@ -1,6 +1,6 @@ NULL = -APPLET_LOCATION = $(libexecdir)/mate-netspeed-applet +APPLET_LOCATION = $(libdir)/mate-applets/libmate-netspeed-applet.so appletdir = $(datadir)/mate-panel/applets applet_in_files = org.mate.applets.NetspeedApplet.mate-panel-applet.desktop.in @@ -8,28 +8,18 @@ applet_DATA = $(applet_in_files:.mate-panel-applet.desktop.in=.mate-panel-ap $(applet_in_files): $(applet_in_files).in Makefile $(AM_V_GEN)sed \ - -e "s|\@LOCATION\@|$(APPLET_LOCATION)|" \ + -e "s|\@APPLET_LOCATION\@|$(APPLET_LOCATION)|" \ $< > $@ $(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.NetspeedAppletFactory.service.in -service_DATA = $(service_in_files:.service.in=.service) - -org.mate.panel.applet.NetspeedAppletFactory.service: $(service_in_files) - $(AM_V_GEN)sed \ - -e "s|\@LOCATION\@|$(APPLET_LOCATION)|" \ - $< > $@ - netspeed_gschema_in_files = org.mate.panel.applet.netspeed.gschema.xml.in gsettings_SCHEMAS = $(netspeed_gschema_in_files:.xml.in=.xml) @GSETTINGS_RULES@ EXTRA_DIST = \ $(applet_in_files).in \ - $(service_in_files) \ $(netspeed_gschema_in_files) \ netspeed-details.ui \ netspeed-menu.xml \ @@ -39,7 +29,6 @@ EXTRA_DIST = \ CLEANFILES = \ $(gsettings_SCHEMAS) \ - $(service_DATA) \ $(applet_in_files) \ $(applet_DATA) diff --git a/netspeed/data/org.mate.applets.NetspeedApplet.mate-panel-applet.desktop.in.in b/netspeed/data/org.mate.applets.NetspeedApplet.mate-panel-applet.desktop.in.in index fdc64666..5b63e7c2 100644 --- a/netspeed/data/org.mate.applets.NetspeedApplet.mate-panel-applet.desktop.in.in +++ b/netspeed/data/org.mate.applets.NetspeedApplet.mate-panel-applet.desktop.in.in @@ -1,6 +1,7 @@ [Applet Factory] Id=NetspeedAppletFactory -Location=@LOCATION@ +Location=@APPLET_LOCATION@ +InProcess=true Name=Netspeed Applet Factory Description=Netspeed Applet @@ -10,6 +11,7 @@ Description=Netspeed Applet # Translators: Do NOT translate or transliterate this text (this is an icon file name)! Icon=mate-netspeed-applet MateComponentId=OAFIID:MATE_NetspeedApplet +Platforms=X11;Wayland; X-MATE-Bugzilla-Bugzilla=MATE X-MATE-Bugzilla-Product=mate-netspeed X-MATE-Bugzilla-Component=netspeed diff --git a/netspeed/data/org.mate.panel.applet.NetspeedAppletFactory.service.in b/netspeed/data/org.mate.panel.applet.NetspeedAppletFactory.service.in deleted file mode 100644 index 2868eec8..00000000 --- a/netspeed/data/org.mate.panel.applet.NetspeedAppletFactory.service.in +++ /dev/null @@ -1,3 +0,0 @@ -[D-BUS Service] -Name=org.mate.panel.applet.NetspeedAppletFactory -Exec=@LOCATION@ |