diff options
Diffstat (limited to 'mateweather/data')
3 files changed, 7 insertions, 15 deletions
diff --git a/mateweather/data/Makefile.am b/mateweather/data/Makefile.am index 4dfe4884..a6bf5ceb 100644 --- a/mateweather/data/Makefile.am +++ b/mateweather/data/Makefile.am @@ -1,36 +1,29 @@ +APPLET_LOCATION = $(libdir)/mate-applets/libmateweather-applet.so + appletdir = $(datadir)/mate-panel/applets applet_in_files = org.mate.applets.MateWeatherApplet.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|\@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.MateWeatherAppletFactory.service.in -service_DATA = $(service_in_files:.service.in=.service) -org.mate.panel.applet.MateWeatherAppletFactory.service: $(service_in_files) - $(AM_V_GEN)sed \ - -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \ - $< > $@ CLEANFILES = \ $(applet_DATA) \ - $(applet_in_files) \ - $(service_DATA) + $(applet_in_files) EXTRA_DIST = \ mateweather-applet-menu.xml \ mateweather-dialog.ui \ mateweather-resources.gresource.xml \ $(applet_in_files:=.in) \ - $(service_in_files) \ $(ui_DATA) -include $(top_srcdir)/git.mk diff --git a/mateweather/data/org.mate.applets.MateWeatherApplet.mate-panel-applet.desktop.in.in b/mateweather/data/org.mate.applets.MateWeatherApplet.mate-panel-applet.desktop.in.in index 03d2b621..99b4dff4 100644 --- a/mateweather/data/org.mate.applets.MateWeatherApplet.mate-panel-applet.desktop.in.in +++ b/mateweather/data/org.mate.applets.MateWeatherApplet.mate-panel-applet.desktop.in.in @@ -1,6 +1,7 @@ [Applet Factory] Id=MateWeatherAppletFactory -Location=@LIBEXECDIR@/mateweather-applet +InProcess=true +Location=@APPLET_LOCATION@ Name=Mateweather Applet Factory Description=Factory for creating the weather applet. @@ -10,6 +11,7 @@ Description=Monitor the current weather conditions, and forecasts # Translators: Do NOT translate or transliterate this text (this is an icon file name)! Icon=weather-storm MateComponentId=OAFIID:MATE_MateWeatherApplet +Platforms=X11;Wayland; X-MATE-Bugzilla-Bugzilla=MATE X-MATE-Bugzilla-Product=mate-applets X-MATE-Bugzilla-Component=mateweather diff --git a/mateweather/data/org.mate.panel.applet.MateWeatherAppletFactory.service.in b/mateweather/data/org.mate.panel.applet.MateWeatherAppletFactory.service.in deleted file mode 100644 index e1d0174a..00000000 --- a/mateweather/data/org.mate.panel.applet.MateWeatherAppletFactory.service.in +++ /dev/null @@ -1,3 +0,0 @@ -[D-BUS Service] -Name=org.mate.panel.applet.MateWeatherAppletFactory -Exec=@LIBEXECDIR@/mateweather-applet |