diff options
Diffstat (limited to 'timerapplet/data')
3 files changed, 5 insertions, 16 deletions
diff --git a/timerapplet/data/Makefile.am b/timerapplet/data/Makefile.am index 2c034da3..2b8cebd4 100644 --- a/timerapplet/data/Makefile.am +++ b/timerapplet/data/Makefile.am @@ -1,6 +1,6 @@ NULL = -APPLET_LOCATION = $(libexecdir)/timer-applet +APPLET_LOCATION = $(libdir)/mate-applets/libmate-timer-applet.so appletsdir = $(datadir)/mate-panel/applets applets_in_files = org.mate.applets.TimerApplet.mate-panel-applet.desktop.in @@ -8,19 +8,11 @@ applets_DATA = $(applets_in_files:.mate-panel-applet.desktop.in=.mate-panel- $(applets_in_files): $(applets_in_files).in Makefile $(AM_V_GEN)sed \ - -e "s|\@LOCATION\@|$(APPLET_LOCATION)|" \ + -e "s|\@APPLET_LOCATION\@|$(APPLET_LOCATION)|" \ $< > $@ $(applets_DATA): $(applets_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.TimerAppletFactory.service.in -service_DATA = $(service_in_files:.service.in=.service) - -org.mate.panel.applet.TimerAppletFactory.service: $(service_in_files) - $(AM_V_GEN)sed \ - -e "s|\@LOCATION\@|$(APPLET_LOCATION)|" \ - $< > $@ timer_gschema_in_files = org.mate.panel.applet.timer.gschema.xml.in gsettings_SCHEMAS = $(timer_gschema_in_files:.xml.in=.xml) @@ -28,7 +20,6 @@ gsettings_SCHEMAS = $(timer_gschema_in_files:.xml.in=.xml) EXTRA_DIST = \ $(applets_in_files).in \ - $(service_in_files) \ $(timer_gschema_in_files) \ timerapplet-preferences.ui \ timerapplet-resources.gresource.xml \ @@ -37,7 +28,6 @@ EXTRA_DIST = \ CLEANFILES = \ $(applets_DATA) \ $(applets_in_files) \ - $(service_DATA) \ $(gsettings_SCHEMAS) \ *.gschema.valid \ $(NULL) diff --git a/timerapplet/data/org.mate.applets.TimerApplet.mate-panel-applet.desktop.in.in b/timerapplet/data/org.mate.applets.TimerApplet.mate-panel-applet.desktop.in.in index a111eb28..86b18021 100644 --- a/timerapplet/data/org.mate.applets.TimerApplet.mate-panel-applet.desktop.in.in +++ b/timerapplet/data/org.mate.applets.TimerApplet.mate-panel-applet.desktop.in.in @@ -1,11 +1,13 @@ [Applet Factory] Id=TimerAppletFactory -Location=@LOCATION@ +Location=@APPLET_LOCATION@ +InProcess=true Name=Timer Factory Description=Timer Factory [TimerApplet] Name=Timer Description=Start a timer and receive a notification when it is finished +Platforms=X11;Wayland # Translators: Do NOT translate or transliterate this text (this is an icon file name)! Icon=mate-panel-clock diff --git a/timerapplet/data/org.mate.panel.applet.TimerAppletFactory.service.in b/timerapplet/data/org.mate.panel.applet.TimerAppletFactory.service.in deleted file mode 100644 index b8cd68cc..00000000 --- a/timerapplet/data/org.mate.panel.applet.TimerAppletFactory.service.in +++ /dev/null @@ -1,3 +0,0 @@ -[D-BUS Service] -Name=org.mate.panel.applet.TimerAppletFactory -Exec=@LOCATION@ |