diff options
| -rw-r--r-- | drivemount/data/Makefile.am | 15 | ||||
| -rw-r--r-- | drivemount/data/org.mate.applets.DriveMountApplet.mate-panel-applet.desktop.in.in | 4 | ||||
| -rw-r--r-- | drivemount/data/org.mate.panel.applet.DriveMountAppletFactory.service.in | 3 | ||||
| -rw-r--r-- | drivemount/src/Makefile.am | 21 | ||||
| -rw-r--r-- | drivemount/src/drivemount.c | 4 |
5 files changed, 14 insertions, 33 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 diff --git a/drivemount/src/Makefile.am b/drivemount/src/Makefile.am index 28b273c0..a5b60c1e 100644 --- a/drivemount/src/Makefile.am +++ b/drivemount/src/Makefile.am @@ -1,5 +1,8 @@ NULL = +mate_drivemount_applet_libdir= $(pkglibdir) +mate_drivemount_applet_lib_LTLIBRARIES=libmate-drivemount-applet.la + AM_CPPFLAGS = \ -I. \ -I$(srcdir) \ @@ -8,26 +11,17 @@ AM_CPPFLAGS = \ $(MATE_APPLETS4_CFLAGS) \ $(NULL) -libexec_PROGRAMS = mate-drivemount-applet - -BUILT_SOURCES = \ - drivemount-resources.c \ - drivemount-resources.h \ - $(NULL) - -nodist_mate_drivemount_applet_SOURCES = \ - $(BUILT_SOURCES) \ - $(NULL) - -mate_drivemount_applet_SOURCES = \ +libmate_drivemount_applet_la_SOURCES = \ drivemount.c \ drive-list.c \ drive-list.h \ drive-button.c \ drive-button.h \ + drivemount-resources.c \ + drivemount-resources.h \ $(NULL) -mate_drivemount_applet_LDADD = \ +libmate_drivemount_applet_la_LIBADD = \ $(MATE_APPLETS4_LIBS) drivemount-resources.c: ../data/drivemount-resources.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)/../data/ --generate-dependencies $(srcdir)/../data/drivemount-resources.gresource.xml) @@ -37,7 +31,6 @@ drivemount-resources.h: ../data/drivemount-resources.gresource.xml $(shell $(GLI $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)/../data/ --generate --c-name drivemount $< CLEANFILES = \ - $(BUILT_SOURCES) \ $(NULL) -include $(top_srcdir)/git.mk diff --git a/drivemount/src/drivemount.c b/drivemount/src/drivemount.c index a425237b..6b10f9fa 100644 --- a/drivemount/src/drivemount.c +++ b/drivemount/src/drivemount.c @@ -179,8 +179,6 @@ applet_factory (MatePanelApplet *applet, GtkActionGroup *action_group; if (!strcmp (iid, drivemount_iid)) { - g_set_application_name (_("Disk Mounter")); - gtk_window_set_default_icon_name ("media-floppy"); mate_panel_applet_set_flags (applet, MATE_PANEL_APPLET_EXPAND_MINOR); @@ -223,7 +221,7 @@ applet_factory (MatePanelApplet *applet, return ret; } -MATE_PANEL_APPLET_OUT_PROCESS_FACTORY (factory_iid, +MATE_PANEL_APPLET_IN_PROCESS_FACTORY (factory_iid, PANEL_TYPE_APPLET, "Drive-Mount-Applet", applet_factory, NULL) |