summaryrefslogtreecommitdiff
path: root/drivemount/data
diff options
context:
space:
mode:
Diffstat (limited to 'drivemount/data')
-rw-r--r--drivemount/data/Makefile.am15
-rw-r--r--drivemount/data/org.mate.applets.DriveMountApplet.mate-panel-applet.desktop.in.in4
-rw-r--r--drivemount/data/org.mate.panel.applet.DriveMountAppletFactory.service.in3
3 files changed, 6 insertions, 16 deletions
diff --git a/drivemount/data/Makefile.am b/drivemount/data/Makefile.am
index b0dc7718..642baf0d 100644
--- a/drivemount/data/Makefile.am
+++ b/drivemount/data/Makefile.am
@@ -1,5 +1,7 @@
NULL =
+APPLET_LOCATION = $(libdir)/mate-applets/libmate-drivemount-applet.so
+
drivemount_gschema_in_files = org.mate.drivemount.gschema.xml.in
gsettings_SCHEMAS = $(drivemount_gschema_in_files:.xml.in=.xml)
@GSETTINGS_RULES@
@@ -10,26 +12,16 @@ 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|\@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.DriveMountAppletFactory.service.in
-service_DATA = $(service_in_files:.service.in=.service)
-
-org.mate.panel.applet.DriveMountAppletFactory.service: $(service_in_files)
- $(AM_V_GEN)sed \
- -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \
- $< > $@
-
CLEANFILES = \
$(applet_DATA) \
$(applet_in_files) \
- $(service_DATA) \
$(gsettings_SCHEMAS) \
*.gschema.valid \
$(NULL)
@@ -37,7 +29,6 @@ CLEANFILES = \
EXTRA_DIST = \
$(applet_in_files:=.in) \
$(drivemount_gschema_in_files) \
- $(service_in_files) \
drivemount-applet-menu.xml \
drivemount-resources.gresource.xml \
$(NULL)
diff --git a/drivemount/data/org.mate.applets.DriveMountApplet.mate-panel-applet.desktop.in.in b/drivemount/data/org.mate.applets.DriveMountApplet.mate-panel-applet.desktop.in.in
index 637628d2..852b7678 100644
--- a/drivemount/data/org.mate.applets.DriveMountApplet.mate-panel-applet.desktop.in.in
+++ b/drivemount/data/org.mate.applets.DriveMountApplet.mate-panel-applet.desktop.in.in
@@ -1,6 +1,7 @@
[Applet Factory]
Id=DriveMountAppletFactory
-Location=@LIBEXECDIR@/mate-drivemount-applet
+Location=@APPLET_LOCATION@
+InProcess=true
Name=Drive Mount Applet Factory
Description=Factory for drive mount applet
@@ -10,6 +11,7 @@ Description=Mount local disks and devices
# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
Icon=media-floppy
MateComponentId=OAFIID:MATE_DriveMountApplet
+Platforms=X11;Wayland;
X-MATE-Bugzilla-Bugzilla=MATE
X-MATE-Bugzilla-Product=mate-applets
X-MATE-Bugzilla-Component=Disk Mounter (drivemount)
diff --git a/drivemount/data/org.mate.panel.applet.DriveMountAppletFactory.service.in b/drivemount/data/org.mate.panel.applet.DriveMountAppletFactory.service.in
deleted file mode 100644
index 90d44b42..00000000
--- a/drivemount/data/org.mate.panel.applet.DriveMountAppletFactory.service.in
+++ /dev/null
@@ -1,3 +0,0 @@
-[D-BUS Service]
-Name=org.mate.panel.applet.DriveMountAppletFactory
-Exec=@LIBEXECDIR@/mate-drivemount-applet