diff options
61 files changed, 774 insertions, 317 deletions
diff --git a/accessx-status/data/Makefile.am b/accessx-status/data/Makefile.am index 58df0294..357ef0fd 100644 --- a/accessx-status/data/Makefile.am +++ b/accessx-status/data/Makefile.am @@ -1,26 +1,36 @@ NULL = -appletdir = $(datadir)/mate-panel/applets applet_in_files = org.mate.applets.AccessxStatusApplet.mate-panel-applet.desktop.in +service_in_files = org.mate.panel.applet.AccessxStatusAppletFactory.service.in + +if ENABLE_IN_PROCESS +APPLET_LOCATION = $(pkglibdir)/libmate-accessx-status-applet.so +else !ENABLE_IN_PROCESS +APPLET_LOCATION = $(libexecdir)/accessx-status-applet +endif !ENABLE_IN_PROCESS + +appletdir = $(datadir)/mate-panel/applets 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|\@APPLET_IN_PROCESS\@|$(APPLET_IN_PROCESS)|" \ -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 $@ +if !ENABLE_IN_PROCESS servicedir = $(datadir)/dbus-1/services -service_in_files = org.mate.panel.applet.AccessxStatusAppletFactory.service.in service_DATA = $(service_in_files:.service.in=.service) -org.mate.panel.applet.AccessxStatusAppletFactory.service: $(service_in_files) +$(service_DATA): $(service_in_files) Makefile $(AM_V_GEN)sed \ - -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \ + -e "s|\@APPLET_LOCATION\@|$(APPLET_LOCATION)|" \ $< > $@ +endif !ENABLE_IN_PROCESS CLEANFILES = \ $(applet_DATA) \ diff --git a/accessx-status/data/org.mate.applets.AccessxStatusApplet.mate-panel-applet.desktop.in.in b/accessx-status/data/org.mate.applets.AccessxStatusApplet.mate-panel-applet.desktop.in.in index 9d9200a7..7f4b5e3e 100644 --- a/accessx-status/data/org.mate.applets.AccessxStatusApplet.mate-panel-applet.desktop.in.in +++ b/accessx-status/data/org.mate.applets.AccessxStatusApplet.mate-panel-applet.desktop.in.in @@ -1,6 +1,7 @@ [Applet Factory] Id=AccessxStatusAppletFactory -Location=@LIBEXECDIR@/accessx-status-applet +Location=@APPLET_LOCATION@ +InProcess=@APPLET_IN_PROCESS@ Name=AccessX Status Applet Factory Description=Keyboard Accessibility Status Applet Factory @@ -10,6 +11,7 @@ Description=Shows the status of keyboard accessibility features # Translators: Do NOT translate or transliterate this text (this is an icon file name)! Icon=preferences-desktop-accessibility MateComponentId=OAFIID:MATE_AccessxStatusApplet +Platforms=X11; X-MATE-Bugzilla-Bugzilla=MATE X-MATE-Bugzilla-Product=mate-applets X-MATE-Bugzilla-Component=keyboard-accessibility (accessx-status) diff --git a/accessx-status/data/org.mate.panel.applet.AccessxStatusAppletFactory.service.in b/accessx-status/data/org.mate.panel.applet.AccessxStatusAppletFactory.service.in index 7f5d055e..84abc933 100644 --- a/accessx-status/data/org.mate.panel.applet.AccessxStatusAppletFactory.service.in +++ b/accessx-status/data/org.mate.panel.applet.AccessxStatusAppletFactory.service.in @@ -1,3 +1,3 @@ [D-BUS Service] Name=org.mate.panel.applet.AccessxStatusAppletFactory -Exec=@LIBEXECDIR@/accessx-status-applet +Exec=@APPLET_LOCATION@ diff --git a/accessx-status/src/Makefile.am b/accessx-status/src/Makefile.am index 9128ae1b..3880b3f2 100644 --- a/accessx-status/src/Makefile.am +++ b/accessx-status/src/Makefile.am @@ -7,19 +7,31 @@ AM_CPPFLAGS = \ -DACCESSX_RESOURCE_PATH=\""/org/mate/mate-applets/accessx-status/"\" \ $(NULL) -libexec_PROGRAMS = accessx-status-applet - BUILT_SOURCES = accessx-status-resources.c accessx-status-resources.h -nodist_accessx_status_applet_SOURCES = $(BUILT_SOURCES) -accessx_status_applet_SOURCES = \ +APPLET_SOURCES = \ applet.c \ applet.h -accessx_status_applet_LDADD = \ +APPLET_LIBS = \ $(MATE_APPLETS4_LIBS) \ $(GIO_LIBS) \ $(X_LIBS) +if ENABLE_IN_PROCESS +pkglib_LTLIBRARIES = libmate-accessx-status-applet.la +nodist_libmate_accessx_status_applet_la_SOURCES = $(BUILT_SOURCES) +libmate_accessx_status_applet_la_SOURCES = $(APPLET_SOURCES) +libmate_accessx_status_applet_la_CFLAGS = $(AM_CFLAGS) +libmate_accessx_status_applet_la_LDFLAGS = -module -avoid-version +libmate_accessx_status_applet_la_LIBADD = $(APPLET_LIBS) +else !ENABLE_IN_PROCESS +libexec_PROGRAMS = accessx-status-applet +nodist_accessx_status_applet_SOURCES = $(BUILT_SOURCES) +accessx_status_applet_SOURCES = $(APPLET_SOURCES) +accessx_status_applet_CFLAGS = $(AM_CFLAGS) +accessx_status_applet_LDADD = $(APPLET_LIBS) +endif !ENABLE_IN_PROCESS + accessx-status-resources.c: $(srcdir)/../data/accessx-status-resources.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)/../data --generate-dependencies $(srcdir)/../data/accessx-status-resources.gresource.xml) $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)/../data --generate --c-name accessx $< diff --git a/accessx-status/src/applet.c b/accessx-status/src/applet.c index 88239c7f..dd3e6cc9 100644 --- a/accessx-status/src/applet.c +++ b/accessx-status/src/applet.c @@ -1316,7 +1316,9 @@ create_applet (MatePanelApplet* applet) GtkIconTheme *icon_theme; gint icon_size, icon_scale; +#ifndef ENABLE_IN_PROCESS g_set_application_name (_("AccessX Status")); +#endif sapplet->xkb = NULL; sapplet->xkb_display = NULL; @@ -1633,9 +1635,9 @@ accessx_status_applet_fill (MatePanelApplet* applet) } g_object_connect (sapplet->applet, - "destroy", accessx_status_applet_destroy, sapplet, - "change-orient", accessx_status_applet_reorient, sapplet, - "change-size", accessx_status_applet_resize, sapplet, + "signal::destroy", accessx_status_applet_destroy, sapplet, + "signal::change-orient", accessx_status_applet_reorient, sapplet, + "signal::change-size", accessx_status_applet_resize, sapplet, NULL); g_signal_connect (sapplet->applet, "button-press-event", @@ -1697,9 +1699,9 @@ accessx_status_applet_factory (MatePanelApplet* applet, return retval; } -MATE_PANEL_APPLET_OUT_PROCESS_FACTORY ("AccessxStatusAppletFactory", - PANEL_TYPE_APPLET, - "accessx-status", - accessx_status_applet_factory, - NULL) +PANEL_APPLET_FACTORY ("AccessxStatusAppletFactory", + PANEL_TYPE_APPLET, + "accessx-status", + accessx_status_applet_factory, + NULL) diff --git a/battstat/Makefile.am b/battstat/Makefile.am index 11379050..1a40f61b 100644 --- a/battstat/Makefile.am +++ b/battstat/Makefile.am @@ -1,7 +1,5 @@ NULL = -APPLET_LOCATION = $(libdir)/mate-applets/libmate-battstat-applet.so - ACPIINC= @ACPIINC@ if NEED_LIBAPM @@ -24,8 +22,9 @@ SUBDIRS = docs sounds $(APMDIR) DIST_SUBDIRS = docs sounds apmlib -mate_battstat_applet_libdir= $(pkglibdir) -mate_battstat_applet_lib_LTLIBRARIES=libmate-battstat-applet.la +applet_in_files = org.mate.applets.BattstatApplet.mate-panel-applet.desktop.in +service_in_files = org.mate.panel.applet.BattstatAppletFactory.service.in +gschema_in_files = org.mate.panel.applet.battstat.gschema.xml.in AM_CPPFLAGS = \ ${WARN_CFLAGS} \ @@ -38,11 +37,14 @@ AM_CPPFLAGS = \ -DBATTSTAT_RESOURCE_PATH=\""/org/mate/mate-applets/battstat/"\" \ $(NULL) - -libmate_battstat_applet_la_SOURCES = \ +BUILT_SOURCES = \ + battstat-resources.c \ + battstat-resources.h \ + $(NULL) +APPLET_SOURCES = \ battstat.h \ battstat_applet.c \ - battstat-preferences.c \ + battstat-preferences.c \ battstat-preferences.h \ power-management.c \ acpi-linux.c \ @@ -51,11 +53,9 @@ libmate_battstat_applet_la_SOURCES = \ acpi-freebsd.h \ battstat-upower.c \ battstat-upower.h \ - battstat-resources.c \ - battstat-resources.h \ $(NULL) -libmate_battstat_applet_la_LIBADD = \ +APPLET_LIBS = \ $(MATE_APPLETS4_LIBS) \ $(LIBNOTIFY_LIBS) \ $(APMLIB) \ @@ -63,23 +63,50 @@ libmate_battstat_applet_la_LIBADD = \ -lm \ $(NULL) +if ENABLE_IN_PROCESS +APPLET_LOCATION = $(pkglibdir)/libmate-battstat-applet.so + +pkglib_LTLIBRARIES = libmate-battstat-applet.la +nodist_libmate_battstat_applet_la_SOURCES = $(BUILT_SOURCES) +libmate_battstat_applet_la_SOURCES = $(APPLET_SOURCES) +libmate_battstat_applet_la_CFLAGS = $(AM_CFLAGS) +libmate_battstat_applet_la_LDFLAGS = -module -avoid-version +libmate_battstat_applet_la_LIBADD = $(APPLET_LIBS) + +else !ENABLE_IN_PROCESS +APPLET_LOCATION = $(libexecdir)/battstat-applet + +libexec_PROGRAMS = battstat-applet +nodist_battstat_applet_SOURCES = $(BUILT_SOURCES) +battstat_applet_SOURCES = $(APPLET_SOURCES) +battstat_applet_CFLAGS = $(AM_CFLAGS) +battstat_applet_LDADD = $(APPLET_LIBS) + +servicedir = $(datadir)/dbus-1/services +service_DATA = $(service_in_files:.service.in=.service) + +$(service_DATA): $(service_in_files) Makefile + $(AM_V_GEN)sed \ + -e "s|\@APPLET_LOCATION\@|$(APPLET_LOCATION)|" \ + $< > $@ +endif !ENABLE_IN_PROCESS + battstat-resources.c: battstat-resources.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/battstat-resources.gresource.xml) $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate --c-name battstat $< battstat-resources.h: battstat-resources.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/battstat-resources.gresource.xml) $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate --c-name battstat $< -batstat_gschema_in_files = org.mate.panel.applet.battstat.gschema.xml.in -gsettings_SCHEMAS = $(batstat_gschema_in_files:.xml.in=.xml) +gsettings_SCHEMAS = $(gschema_in_files:.xml.in=.xml) @GSETTINGS_RULES@ appletdir = $(datadir)/mate-panel/applets -applet_in_files = org.mate.applets.BattstatApplet.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|\@APPLET_LOCATION\@|$(APPLET_LOCATION)|" \ + -e "s|\@APPLET_IN_PROCESS\@|$(APPLET_IN_PROCESS)|" \ -e "s|\@VERSION\@|$(PACKAGE_VERSION)|" \ $< > $@ @@ -90,6 +117,7 @@ $(applet_DATA): $(applet_in_files) Makefile CLEANFILES = \ $(applet_DATA) \ $(applet_in_files) \ + $(service_DATA) \ $(gsettings_SCHEMAS) \ $(BUILT_SOURCES) \ *.gschema.valid \ @@ -100,7 +128,8 @@ EXTRA_DIST = \ battstat-preferences.ui \ battstat-resources.gresource.xml \ $(applet_in_files).in \ - $(batstat_gschema_in_files) \ + $(service_in_files) \ + $(gschema_in_files) \ $(NULL) -include $(top_srcdir)/git.mk diff --git a/battstat/battstat_applet.c b/battstat/battstat_applet.c index 2afe96f4..07203996 100644 --- a/battstat/battstat_applet.c +++ b/battstat/battstat_applet.c @@ -1130,6 +1130,10 @@ battstat_applet_fill (MatePanelApplet *applet) if (DEBUG) g_print ("main ()\n"); +#ifndef ENABLE_IN_PROCESS + g_set_application_name (_("Battery Charge Monitor")); +#endif + gtk_window_set_default_icon_name ("battery"); mate_panel_applet_set_flags (applet, @@ -1208,9 +1212,8 @@ battstat_applet_factory (MatePanelApplet *applet, return retval; } -MATE_PANEL_APPLET_IN_PROCESS_FACTORY ("BattstatAppletFactory", - PANEL_TYPE_APPLET, - "battstat", - battstat_applet_factory, - NULL) - +PANEL_APPLET_FACTORY ("BattstatAppletFactory", + PANEL_TYPE_APPLET, + "battstat", + battstat_applet_factory, + NULL) diff --git a/battstat/org.mate.applets.BattstatApplet.mate-panel-applet.desktop.in.in b/battstat/org.mate.applets.BattstatApplet.mate-panel-applet.desktop.in.in index 86f8d3d5..476c81dc 100644 --- a/battstat/org.mate.applets.BattstatApplet.mate-panel-applet.desktop.in.in +++ b/battstat/org.mate.applets.BattstatApplet.mate-panel-applet.desktop.in.in @@ -1,7 +1,7 @@ [Applet Factory] Id=BattstatAppletFactory Location=@APPLET_LOCATION@ -InProcess=true +InProcess=@APPLET_IN_PROCESS@ Name=Battstat Factory Description=Battstat Factory diff --git a/battstat/org.mate.panel.applet.BattstatAppletFactory.service.in b/battstat/org.mate.panel.applet.BattstatAppletFactory.service.in new file mode 100644 index 00000000..0ece4a0b --- /dev/null +++ b/battstat/org.mate.panel.applet.BattstatAppletFactory.service.in @@ -0,0 +1,3 @@ +[D-BUS Service] +Name=org.mate.panel.applet.BattstatAppletFactory +Exec=@APPLET_LOCATION@ diff --git a/charpick/Makefile.am b/charpick/Makefile.am index a9665974..000b3463 100644 --- a/charpick/Makefile.am +++ b/charpick/Makefile.am @@ -1,11 +1,10 @@ NULL = -APPLET_LOCATION = $(libdir)/mate-applets/libmate-charpick-applet.so - SUBDIRS = help -mate_charpick_applet_libdir= $(pkglibdir) -mate_charpick_applet_lib_LTLIBRARIES=libmate-charpick-applet.la +applet_in_files = org.mate.applets.CharpickerApplet.mate-panel-applet.desktop.in +service_in_files = org.mate.panel.applet.CharpickerAppletFactory.service.in +gschema_in_files = org.mate.panel.applet.charpick.gschema.xml.in AM_CPPFLAGS = \ -I. \ @@ -16,19 +15,48 @@ AM_CPPFLAGS = \ $(GUCHARMAP_CFLAGS) \ $(NULL) -libmate_charpick_applet_la_SOURCES = \ +BUILT_SOURCES = \ + charpick-resources.c \ + charpick-resources.h \ + $(NULL) +APPLET_SOURCES = \ charpick.c \ charpick.h \ properties.c \ - charpick-resources.c \ - charpick-resources.h \ $(NULL) -libmate_charpick_applet_la_LIBADD = \ +APPLET_LIBS = \ $(MATE_APPLETS4_LIBS) \ $(GUCHARMAP_LIBS) \ $(NULL) +if ENABLE_IN_PROCESS +APPLET_LOCATION = $(pkglibdir)/libmate-charpick-applet.so + +pkglib_LTLIBRARIES = libmate-charpick-applet.la +nodist_libmate_charpick_applet_la_SOURCES = $(BUILT_SOURCES) +libmate_charpick_applet_la_SOURCES = $(APPLET_SOURCES) +libmate_charpick_applet_la_CFLAGS = $(AM_CFLAGS) +libmate_charpick_applet_la_LDFLAGS = -module -avoid-version +libmate_charpick_applet_la_LIBADD = $(APPLET_LIBS) +else !ENABLE_IN_PROCESS +APPLET_LOCATION = $(libexecdir)/mate-charpick-applet + +libexec_PROGRAMS = mate-charpick-applet +nodist_mate_charpick_applet_SOURCES = $(BUILT_SOURCES) +mate_charpick_applet_SOURCES = $(APPLET_SOURCES) +mate_charpick_applet_CFLAGS = $(AM_CFLAGS) +mate_charpick_applet_LDADD = $(APPLET_LIBS) + +servicedir = $(datadir)/dbus-1/services +service_DATA = $(service_in_files:.service.in=.service) + +$(service_DATA): $(service_in_files) Makefile + $(AM_V_GEN)sed \ + -e "s|\@APPLET_LOCATION\@|$(APPLET_LOCATION)|" \ + $< > $@ +endif !ENABLE_IN_PROCESS + charpick-resources.c: charpick-resources.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/charpick-resources.gresource.xml) $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate --c-name charpick $< @@ -36,32 +64,34 @@ charpick-resources.h: charpick-resources.gresource.xml $(shell $(GLIB_COMPILE_RE $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate --c-name charpick $< appletdir = $(datadir)/mate-panel/applets -applet_in_files = org.mate.applets.CharpickerApplet.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|\@APPLET_LOCATION\@|$(APPLET_LOCATION)|" \ + -e "s|\@APPLET_IN_PROCESS\@|$(APPLET_IN_PROCESS)|" \ -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 $@ -charpick_gschema_in_files = org.mate.panel.applet.charpick.gschema.xml.in -gsettings_SCHEMAS = $(charpick_gschema_in_files:.xml.in=.xml) +gsettings_SCHEMAS = $(gschema_in_files:.xml.in=.xml) @GSETTINGS_RULES@ CLEANFILES = \ $(applet_DATA) \ $(applet_in_files) \ + $(service_DATA) \ $(gsettings_SCHEMAS) \ + $(BUILT_SOURCES) \ *.gschema.valid \ $(NULL) EXTRA_DIST = \ $(applet_in_files).in \ - $(charpick_gschema_in_files) \ + $(service_in_files) \ + $(gschema_in_files) \ charpick-applet-menu.xml \ charpick-resources.gresource.xml \ $(NULL) diff --git a/charpick/charpick.c b/charpick/charpick.c index 952cfd23..932c6919 100644 --- a/charpick/charpick.c +++ b/charpick/charpick.c @@ -764,6 +764,10 @@ charpicker_applet_fill (MatePanelApplet *applet) gchar *string; GtkActionGroup *action_group; +#ifndef ENABLE_IN_PROCESS + g_set_application_name (_("Character Palette")); +#endif + gtk_window_set_default_icon_name ("accessories-character-map"); mate_panel_applet_set_flags (applet, MATE_PANEL_APPLET_EXPAND_MINOR); @@ -870,9 +874,9 @@ charpicker_applet_factory (MatePanelApplet *applet, return retval; } -MATE_PANEL_APPLET_IN_PROCESS_FACTORY ("CharpickerAppletFactory", - PANEL_TYPE_APPLET, - "char-palette", - charpicker_applet_factory, - NULL) +PANEL_APPLET_FACTORY ("CharpickerAppletFactory", + PANEL_TYPE_APPLET, + "char-palette", + charpicker_applet_factory, + NULL) diff --git a/charpick/org.mate.applets.CharpickerApplet.mate-panel-applet.desktop.in.in b/charpick/org.mate.applets.CharpickerApplet.mate-panel-applet.desktop.in.in index 97febf6f..d8713c17 100644 --- a/charpick/org.mate.applets.CharpickerApplet.mate-panel-applet.desktop.in.in +++ b/charpick/org.mate.applets.CharpickerApplet.mate-panel-applet.desktop.in.in @@ -1,7 +1,7 @@ [Applet Factory] Id=CharpickerAppletFactory Location=@APPLET_LOCATION@ -InProcess=true +InProcess=@APPLET_IN_PROCESS@ Name=Charpicker Applet Factory Description=Charpicker Applet Factory diff --git a/charpick/org.mate.panel.applet.CharpickerAppletFactory.service.in b/charpick/org.mate.panel.applet.CharpickerAppletFactory.service.in index 531430b2..417b1bd4 100644 --- a/charpick/org.mate.panel.applet.CharpickerAppletFactory.service.in +++ b/charpick/org.mate.panel.applet.CharpickerAppletFactory.service.in @@ -1,3 +1,3 @@ [D-BUS Service] Name=org.mate.panel.applet.CharpickerAppletFactory -Exec=@LIBEXECDIR@/mate-charpick-applet +Exec=@APPLET_LOCATION@ diff --git a/command/data/Makefile.am b/command/data/Makefile.am index b6c82434..47709166 100644 --- a/command/data/Makefile.am +++ b/command/data/Makefile.am @@ -1,31 +1,49 @@ -APPLET_LOCATION = $(libdir)/mate-applets/libcommand-applet.so +applets_in_files = org.mate.applets.CommandApplet.mate-panel-applet.desktop.in +service_in_files = org.mate.panel.applet.CommandAppletFactory.service.in +gschema_in_files = org.mate.panel.applet.command.gschema.xml.in + +if ENABLE_IN_PROCESS +APPLET_LOCATION = $(pkglibdir)/libcommand-applet.so +else !ENABLE_IN_PROCESS +APPLET_LOCATION = $(libexecdir)/command-applet +endif !ENABLE_IN_PROCESS appletsdir = $(datadir)/mate-panel/applets -applets_in_files = org.mate.applets.CommandApplet.mate-panel-applet.desktop.in applets_DATA = $(applets_in_files:.mate-panel-applet.desktop.in=.mate-panel-applet) $(applets_in_files): $(applets_in_files).in Makefile $(AM_V_GEN)sed \ -e "s|\@APPLET_LOCATION\@|$(APPLET_LOCATION)|" \ + -e "s|\@APPLET_IN_PROCESS\@|$(APPLET_IN_PROCESS)|" \ $< > $@ $(applets_DATA): $(applets_in_files) Makefile $(AM_V_GEN) $(MSGFMT) --desktop --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@ +if !ENABLE_IN_PROCESS +servicedir = $(datadir)/dbus-1/services +service_DATA = $(service_in_files:.service.in=.service) + +$(service_DATA): $(service_in_files) Makefile + $(AM_V_GEN)sed \ + -e "s|\@APPLET_LOCATION\@|$(APPLET_LOCATION)|" \ + $< > $@ +endif !ENABLE_IN_PROCESS -command_gschema_in_files = org.mate.panel.applet.command.gschema.xml.in -gsettings_SCHEMAS = $(command_gschema_in_files:.xml.in=.xml) +gsettings_SCHEMAS = $(gschema_in_files:.xml.in=.xml) @GSETTINGS_RULES@ EXTRA_DIST = \ $(applets_in_files).in \ - $(command_gschema_in_files) \ + $(service_in_files) \ + $(gschema_in_files) \ command-preferences.ui \ command-resources.gresource.xml CLEANFILES = \ $(applets_DATA) \ $(applets_in_files) \ + $(service_DATA) \ $(gsettings_SCHEMAS) \ *.gschema.valid diff --git a/command/data/org.mate.applets.CommandApplet.mate-panel-applet.desktop.in.in b/command/data/org.mate.applets.CommandApplet.mate-panel-applet.desktop.in.in index 1b2495ee..6d14aedb 100644 --- a/command/data/org.mate.applets.CommandApplet.mate-panel-applet.desktop.in.in +++ b/command/data/org.mate.applets.CommandApplet.mate-panel-applet.desktop.in.in @@ -1,7 +1,7 @@ [Applet Factory] Id=CommandAppletFactory Location=@APPLET_LOCATION@ -InProcess=true +InProcess=@APPLET_IN_PROCESS@ Name=Command Factory Description=Command Factory diff --git a/command/data/org.mate.panel.applet.CommandAppletFactory.service.in b/command/data/org.mate.panel.applet.CommandAppletFactory.service.in new file mode 100644 index 00000000..aad043dd --- /dev/null +++ b/command/data/org.mate.panel.applet.CommandAppletFactory.service.in @@ -0,0 +1,3 @@ +[D-BUS Service] +Name=org.mate.panel.applet.CommandAppletFactory +Exec=@APPLET_LOCATION@ diff --git a/command/src/Makefile.am b/command/src/Makefile.am index 3497672d..b8a20cc1 100644 --- a/command/src/Makefile.am +++ b/command/src/Makefile.am @@ -1,27 +1,41 @@ NULL = -command_applet_libdir= $(pkglibdir) -command_applet_lib_LTLIBRARIES=libcommand-applet.la - AM_CPPFLAGS = \ + $(WARN_FLAGS) \ $(MATE_APPLETS4_CFLAGS) \ -I$(srcdir) \ $(DISABLE_DEPRECATED_CFLAGS) \ $(NULL) - -libcommand_applet_la_SOURCES = \ - command.c \ - ma-command.c \ - ma-command.h \ +BUILT_SOURCES = \ command-resources.c \ command-resources.h \ $(NULL) +APPLET_SOURCES = \ + command.c \ + ma-command.c \ + ma-command.h \ + $(NULL) -libcommand_applet_la_LIBADD = \ +APPLET_LIBS = \ $(MATE_APPLETS4_LIBS) \ $(NULL) +if ENABLE_IN_PROCESS +pkglib_LTLIBRARIES = libcommand-applet.la +nodist_libcommand_applet_la_SOURCES = $(BUILT_SOURCES) +libcommand_applet_la_SOURCES = $(APPLET_SOURCES) +libcommand_applet_la_CFLAGS = $(AM_CFLAGS) +libcommand_applet_la_LDFLAGS = -module -avoid-version +libcommand_applet_la_LIBADD = $(APPLET_LIBS) +else !ENABLE_IN_PROCESS +libexec_PROGRAMS = command-applet +nodist_command_applet_SOURCES = $(BUILT_SOURCES) +command_applet_SOURCES = $(APPLET_SOURCES) +command_applet_CFLAGS = $(AM_CFLAGS) +command_applet_LDADD = $(APPLET_LIBS) +endif !ENABLE_IN_PROCESS + command-resources.c: $(srcdir)/../data/command-resources.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)/../data --generate-dependencies $(srcdir)/../data/command-resources.gresource.xml) $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)/../data --generate --c-name command $< @@ -29,6 +43,7 @@ command-resources.h: $(srcdir)/../data/command-resources.gresource.xml $(shell $ $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)/../data --generate --c-name command $< CLEANFILES = \ + $(BUILT_SOURCES) $(NULL) -include $(top_srcdir)/git.mk diff --git a/command/src/command.c b/command/src/command.c index cc751349..c4ff027a 100644 --- a/command/src/command.c +++ b/command/src/command.c @@ -418,6 +418,10 @@ command_applet_fill (MatePanelApplet* applet) CommandApplet *command_applet; AtkObject *atk_widget; +#ifndef ENABLE_IN_PROCESS + g_set_application_name (_("Command Applet")); +#endif + gtk_window_set_default_icon_name (APPLET_ICON); mate_panel_applet_set_flags (applet, MATE_PANEL_APPLET_EXPAND_MINOR); @@ -506,8 +510,8 @@ command_factory (MatePanelApplet* applet, const char* iid, gpointer data) } /* needed by mate-panel applet library */ -MATE_PANEL_APPLET_IN_PROCESS_FACTORY("CommandAppletFactory", - PANEL_TYPE_APPLET, - "Command applet", - command_factory, - NULL) +PANEL_APPLET_FACTORY ("CommandAppletFactory", + PANEL_TYPE_APPLET, + "Command applet", + command_factory, + NULL) diff --git a/configure.ac b/configure.ac index fd8f4cf8..b44cb1b7 100644 --- a/configure.ac +++ b/configure.ac @@ -512,6 +512,27 @@ if test "$gtk_ok" = "yes"; then [Define if _NL_MEASUREMENT_MEASUREMENT is available]) fi +AC_ARG_ENABLE([in-process], + [AS_HELP_STRING([--enable-in-process], + [Build all applets in-process])], + [enable_in_process=$enableval], + [enable_in_process=no]) + +# Automake conditional on whether to build in-process +AM_CONDITIONAL([ENABLE_IN_PROCESS], [test "x$enable_in_process" = "xyes"]) +# Automake value expected to be substitued in .mate-panel-apple.* for the value of "InProcess" +AS_IF([test "x$enable_in_process" = "xyes"], + [AC_SUBST([APPLET_IN_PROCESS], [true])], + [AC_SUBST([APPLET_IN_PROCESS], [false])]) +# C conditional on whether to build in-process +AS_IF([test "x$enable_in_process" = "xyes"], + [AC_DEFINE([ENABLE_IN_PROCESS], [1], [building in-process])]) +# Convenience C define selecting the right applet factory +AS_IF([test "x$enable_in_process" = "xyes"], + [factory=MATE_PANEL_APPLET_IN_PROCESS_FACTORY], + [factory=MATE_PANEL_APPLET_OUT_PROCESS_FACTORY]) +AC_DEFINE_UNQUOTED([PANEL_APPLET_FACTORY], [$factory], [Panel applet factory]) + dnl *************************************************************************** dnl *** Honour aclocal flags *** dnl *************************************************************************** @@ -656,4 +677,5 @@ Configure summary: Using UPOWER: $HAVE_UPOWER Using libnotify: $HAVE_LIBNOTIFY Enabling IPv6: $have_ipv6 + Build in-process: $enable_in_process " >&2 diff --git a/cpufreq/data/Makefile.am b/cpufreq/data/Makefile.am index c4423f90..eeceb6ac 100644 --- a/cpufreq/data/Makefile.am +++ b/cpufreq/data/Makefile.am @@ -1,35 +1,53 @@ NULL = -cpufreq_gschema_in_files = org.mate.panel.applet.cpufreq.gschema.xml.in -gsettings_SCHEMAS = $(cpufreq_gschema_in_files:.xml.in=.xml) +applet_in_files = org.mate.applets.CPUFreqApplet.mate-panel-applet.desktop.in +service_in_files = org.mate.panel.applet.CPUFreqAppletFactory.service.in +gschema_in_files = org.mate.panel.applet.cpufreq.gschema.xml.in + +gsettings_SCHEMAS = $(gschema_in_files:.xml.in=.xml) @GSETTINGS_RULES@ -APPLET_LOCATION = $(libdir)/mate-applets/libmatecpufreqapplet.so +if ENABLE_IN_PROCESS +APPLET_LOCATION = $(pkglibdir)/libmate-cpufreq-applet.so +else !ENABLE_IN_PROCESS +APPLET_LOCATION = $(libexecdir)/mate-cpufreq-applet +endif !ENABLE_IN_PROCESS appletdir = $(datadir)/mate-panel/applets -applet_in_files = org.mate.applets.CPUFreqApplet.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|\@APPLET_LOCATION\@|$(APPLET_LOCATION)|" \ + -e "s|\@APPLET_IN_PROCESS\@|$(APPLET_IN_PROCESS)|" \ -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 $@ +if !ENABLE_IN_PROCESS +servicedir = $(datadir)/dbus-1/services +service_DATA = $(service_in_files:.service.in=.service) + +$(service_DATA): $(service_in_files) Makefile + $(AM_V_GEN)sed \ + -e "s|\@APPLET_LOCATION\@|$(APPLET_LOCATION)|" \ + $< > $@ +endif !ENABLE_IN_PROCESS CLEANFILES = \ $(applet_DATA) \ $(applet_in_files) \ + $(service_DATA) \ $(gsettings_SCHEMAS) \ *.gschema.valid \ $(NULL) EXTRA_DIST = \ $(applet_in_files).in \ - $(cpufreq_gschema_in_files) \ + $(service_in_files) \ + $(gschema_in_files) \ cpufreq-applet-menu.xml \ cpufreq-preferences.ui \ cpufreq-resources.gresource.xml \ diff --git a/cpufreq/data/org.mate.applets.CPUFreqApplet.mate-panel-applet.desktop.in.in b/cpufreq/data/org.mate.applets.CPUFreqApplet.mate-panel-applet.desktop.in.in index fd548154..4ce2aec3 100644 --- a/cpufreq/data/org.mate.applets.CPUFreqApplet.mate-panel-applet.desktop.in.in +++ b/cpufreq/data/org.mate.applets.CPUFreqApplet.mate-panel-applet.desktop.in.in @@ -1,6 +1,6 @@ [Applet Factory] Id=CPUFreqAppletFactory -InProcess=true +InProcess=@APPLET_IN_PROCESS@ Location=@APPLET_LOCATION@ Name=CPU Frequency Scaling Monitor Description=Monitor the CPU Frequency Scaling diff --git a/cpufreq/data/org.mate.panel.applet.CPUFreqAppletFactory.service.in b/cpufreq/data/org.mate.panel.applet.CPUFreqAppletFactory.service.in new file mode 100644 index 00000000..ed33b33b --- /dev/null +++ b/cpufreq/data/org.mate.panel.applet.CPUFreqAppletFactory.service.in @@ -0,0 +1,3 @@ +[D-BUS Service] +Name=org.mate.panel.applet.CPUFreqAppletFactory +Exec=@APPLET_LOCATION@ diff --git a/cpufreq/src/Makefile.am b/cpufreq/src/Makefile.am index 8324fe9e..e02b612d 100644 --- a/cpufreq/src/Makefile.am +++ b/cpufreq/src/Makefile.am @@ -5,68 +5,70 @@ endif SUBDIRS = $(selector_SUBDIR) AM_CPPFLAGS = \ - $(MATE_APPLETS4_CFLAGS) - -cpufreq_libdir= $(pkglibdir) -cpufreq_lib_LTLIBRARIES=libmatecpufreqapplet.la - -libmatecpufreqapplet_la_CPPFLAGS = \ - -I$(top_builddir) \ - -I$(top_srcdir) \ - -DGTK_BUILDERDIR=\""$(pkgdatadir)/builder"\" \ -DCPUFREQ_RESOURCE_PATH=\""/org/mate/mate-applets/cpufreq/"\" \ $(NULL) -libmatecpufreqapplet_la_CFLAGS = \ +AM_CFLAGS = \ $(MATE_APPLETS4_CFLAGS) \ $(GIO_CFLAGS) \ $(WARN_CFLAGS) \ - $(AM_CFLAGS) \ $(NULL) -libmatecpufreqapplet_la_SOURCES = \ - cpufreq-applet.c \ - cpufreq-applet.h \ +BUILT_SOURCES = \ + cpufreq-resources.c \ + cpufreq-resources.h \ + $(NULL) +APPLET_SOURCES = \ + cpufreq-applet.c \ + cpufreq-applet.h \ cpufreq-utils.c \ - cpufreq-utils.h \ - cpufreq-prefs.c \ - cpufreq-prefs.h \ + cpufreq-utils.h \ + cpufreq-prefs.c \ + cpufreq-prefs.h \ cpufreq-selector.c \ - cpufreq-selector.h \ - cpufreq-popup.c \ - cpufreq-popup.h \ - cpufreq-monitor.c \ - cpufreq-monitor.h \ + cpufreq-selector.h \ + cpufreq-popup.c \ + cpufreq-popup.h \ + cpufreq-monitor.c \ + cpufreq-monitor.h \ cpufreq-monitor-factory.c \ - cpufreq-monitor-factory.h \ - cpufreq-resources.c \ - cpufreq-resources.h \ + cpufreq-monitor-factory.h \ $(NULL) -libmatecpufreqapplet_la_LDFLAGS = \ - -module -avoid-version \ - $(WARN_LDFLAGS) \ - $(AM_LDFLAGS) \ +if HAVE_LIBCPUFREQ +APPLET_SOURCES += \ + cpufreq-monitor-libcpufreq.c \ + cpufreq-monitor-libcpufreq.h \ $(NULL) +else +APPLET_SOURCES += \ + cpufreq-monitor-cpuinfo.c \ + cpufreq-monitor-cpuinfo.h \ + cpufreq-monitor-sysfs.c \ + cpufreq-monitor-sysfs.h \ + $(NULL) +endif -libmatecpufreqapplet_la_LIBADD = \ +APPLET_LIBS = \ $(MATE_APPLETS4_LIBS) \ $(LIBCPUFREQ_LIBS) \ $(NULL) -if HAVE_LIBCPUFREQ -libmatecpufreqapplet_la_SOURCES += \ - cpufreq-monitor-libcpufreq.c \ - cpufreq-monitor-libcpufreq.h \ - $(NULL) -else -libmatecpufreqapplet_la_SOURCES += \ - cpufreq-monitor-cpuinfo.c \ - cpufreq-monitor-cpuinfo.h \ - cpufreq-monitor-sysfs.c \ - cpufreq-monitor-sysfs.h \ - $(NULL) -endif + +if ENABLE_IN_PROCESS +pkglib_LTLIBRARIES = libmate-cpufreq-applet.la +nodist_libmate_cpufreq_applet_la_SOURCES = $(BUILT_SOURCES) +libmate_cpufreq_applet_la_SOURCES = $(APPLET_SOURCES) +libmate_cpufreq_applet_la_CFLAGS = $(AM_CFLAGS) +libmate_cpufreq_applet_la_LDFLAGS = -module -avoid-version +libmate_cpufreq_applet_la_LIBADD = $(APPLET_LIBS) +else !ENABLE_IN_PROCESS +libexec_PROGRAMS = mate-cpufreq-applet +nodist_mate_cpufreq_applet_SOURCES = $(BUILT_SOURCES) +mate_cpufreq_applet_SOURCES = $(APPLET_SOURCES) +mate_cpufreq_applet_CFLAGS = $(AM_CFLAGS) +mate_cpufreq_applet_LDADD = $(APPLET_LIBS) +endif !ENABLE_IN_PROCESS cpufreq-resources.c: $(top_srcdir)/cpufreq/data/cpufreq-resources.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(top_srcdir)/cpufreq/data --generate-dependencies $(top_srcdir)/cpufreq/data/cpufreq-resources.gresource.xml) $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(top_srcdir)/cpufreq/data --generate --c-name cpufreq $< @@ -75,8 +77,7 @@ cpufreq-resources.h: $(top_srcdir)/cpufreq/data/cpufreq-resources.gresource.xml $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(top_srcdir)/cpufreq/data --generate --c-name cpufreq $< CLEANFILES = \ - cpufreq-resources.c \ - cpufreq-resources.h \ + $(BUILT_SOURCES) \ $(NULL) -include $(top_srcdir)/git.mk diff --git a/cpufreq/src/cpufreq-applet.c b/cpufreq/src/cpufreq-applet.c index 7e02b6ca..b1509eaa 100644 --- a/cpufreq/src/cpufreq-applet.c +++ b/cpufreq/src/cpufreq-applet.c @@ -787,6 +787,10 @@ cpufreq_applet_setup (CPUFreqApplet *applet) AtkObject *atk_obj; GSettings *settings; +#ifndef ENABLE_IN_PROCESS + g_set_application_name (_("CPU Frequency Scaling Monitor")); +#endif + gtk_window_set_default_icon_name ("mate-cpu-frequency-applet"); /* Preferences */ @@ -865,8 +869,8 @@ cpufreq_applet_factory (CPUFreqApplet *applet, return retval; } -MATE_PANEL_APPLET_IN_PROCESS_FACTORY ("CPUFreqAppletFactory", - CPUFREQ_TYPE_APPLET, - "cpufreq-applet", - (MatePanelAppletFactoryCallback) cpufreq_applet_factory, - NULL) +PANEL_APPLET_FACTORY ("CPUFreqAppletFactory", + CPUFREQ_TYPE_APPLET, + "cpufreq-applet", + (MatePanelAppletFactoryCallback) cpufreq_applet_factory, + NULL) diff --git a/drivemount/data/Makefile.am b/drivemount/data/Makefile.am index 642baf0d..5c7205a7 100644 --- a/drivemount/data/Makefile.am +++ b/drivemount/data/Makefile.am @@ -1,36 +1,55 @@ NULL = -APPLET_LOCATION = $(libdir)/mate-applets/libmate-drivemount-applet.so +applet_in_files = org.mate.applets.DriveMountApplet.mate-panel-applet.desktop.in +service_in_files = org.mate.panel.applet.DriveMountAppletFactory.service.in +gschema_in_files = org.mate.drivemount.gschema.xml.in + +if ENABLE_IN_PROCESS +APPLET_LOCATION = $(pkglibdir)/libmate-drivemount-applet.so +else !ENABLE_IN_PROCESS +APPLET_LOCATION = $(libexecdir)/mate-drivemount-applet +endif !ENABLE_IN_PROCESS -drivemount_gschema_in_files = org.mate.drivemount.gschema.xml.in -gsettings_SCHEMAS = $(drivemount_gschema_in_files:.xml.in=.xml) +gsettings_SCHEMAS = $(gschema_in_files:.xml.in=.xml) @GSETTINGS_RULES@ appletdir = $(datadir)/mate-panel/applets -applet_in_files = org.mate.applets.DriveMountApplet.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|\@APPLET_LOCATION\@|$(APPLET_LOCATION)|" \ + -e "s|\@APPLET_IN_PROCESS\@|$(APPLET_IN_PROCESS)|" \ -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 $@ +if !ENABLE_IN_PROCESS +servicedir = $(datadir)/dbus-1/services +service_DATA = $(service_in_files:.service.in=.service) + +$(service_DATA): $(service_in_files) Makefile + $(AM_V_GEN)sed \ + -e "s|\@APPLET_LOCATION\@|$(APPLET_LOCATION)|" \ + $< > $@ +endif !ENABLE_IN_PROCESS + CLEANFILES = \ $(applet_DATA) \ $(applet_in_files) \ + $(service_DATA) \ $(gsettings_SCHEMAS) \ *.gschema.valid \ $(NULL) -EXTRA_DIST = \ - $(applet_in_files:=.in) \ - $(drivemount_gschema_in_files) \ - drivemount-applet-menu.xml \ - drivemount-resources.gresource.xml \ +EXTRA_DIST = \ + $(applet_in_files:=.in) \ + $(gschema_in_files) \ + $(service_in_files) \ + drivemount-applet-menu.xml \ + drivemount-resources.gresource.xml \ $(NULL) -include $(top_srcdir)/git.mk 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 852b7678..01e12296 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,7 +1,7 @@ [Applet Factory] Id=DriveMountAppletFactory Location=@APPLET_LOCATION@ -InProcess=true +InProcess=@APPLET_IN_PROCESS@ Name=Drive Mount Applet Factory Description=Factory for drive mount applet diff --git a/drivemount/data/org.mate.panel.applet.DriveMountAppletFactory.service.in b/drivemount/data/org.mate.panel.applet.DriveMountAppletFactory.service.in new file mode 100644 index 00000000..8034ae4d --- /dev/null +++ b/drivemount/data/org.mate.panel.applet.DriveMountAppletFactory.service.in @@ -0,0 +1,3 @@ +[D-BUS Service] +Name=org.mate.panel.applet.DriveMountAppletFactory +Exec=@APPLET_LOCATION@ diff --git a/drivemount/src/Makefile.am b/drivemount/src/Makefile.am index a5b60c1e..a887b1e5 100644 --- a/drivemount/src/Makefile.am +++ b/drivemount/src/Makefile.am @@ -1,8 +1,5 @@ NULL = -mate_drivemount_applet_libdir= $(pkglibdir) -mate_drivemount_applet_lib_LTLIBRARIES=libmate-drivemount-applet.la - AM_CPPFLAGS = \ -I. \ -I$(srcdir) \ @@ -11,18 +8,34 @@ AM_CPPFLAGS = \ $(MATE_APPLETS4_CFLAGS) \ $(NULL) -libmate_drivemount_applet_la_SOURCES = \ +BUILT_SOURCES = \ + drivemount-resources.c \ + drivemount-resources.h \ + $(NULL) +APPLET_SOURCES = \ drivemount.c \ drive-list.c \ drive-list.h \ drive-button.c \ drive-button.h \ - drivemount-resources.c \ - drivemount-resources.h \ $(NULL) -libmate_drivemount_applet_la_LIBADD = \ - $(MATE_APPLETS4_LIBS) +APPLET_LIBS = $(MATE_APPLETS4_LIBS) + +if ENABLE_IN_PROCESS +pkglib_LTLIBRARIES = libmate-drivemount-applet.la +nodist_libmate_drivemount_applet_la_SOURCES = $(BUILT_SOURCES) +libmate_drivemount_applet_la_SOURCES = $(APPLET_SOURCES) +libmate_drivemount_applet_la_CFLAGS = $(AM_CFLAGS) +libmate_drivemount_applet_la_LDFLAGS = -module -avoid-version +libmate_drivemount_applet_la_LIBADD = $(APPLET_LIBS) +else !ENABLE_IN_PROCESS +libexec_PROGRAMS = mate-drivemount-applet +nodist_mate_drivemount_applet_SOURCES = $(BUILT_SOURCES) +mate_drivemount_applet_SOURCES = $(APPLET_SOURCES) +mate_drivemount_applet_CFLAGS = $(AM_CFLAGS) +mate_drivemount_applet_LDADD = $(APPLET_LIBS) +endif !ENABLE_IN_PROCESS drivemount-resources.c: ../data/drivemount-resources.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)/../data/ --generate-dependencies $(srcdir)/../data/drivemount-resources.gresource.xml) $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)/../data/ --generate --c-name drivemount $< @@ -31,6 +44,7 @@ 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 6b10f9fa..408c7645 100644 --- a/drivemount/src/drivemount.c +++ b/drivemount/src/drivemount.c @@ -179,6 +179,10 @@ applet_factory (MatePanelApplet *applet, GtkActionGroup *action_group; if (!strcmp (iid, drivemount_iid)) { +#ifndef ENABLE_IN_PROCESS + g_set_application_name (_("Disk Mounter")); +#endif + gtk_window_set_default_icon_name ("media-floppy"); mate_panel_applet_set_flags (applet, MATE_PANEL_APPLET_EXPAND_MINOR); @@ -221,8 +225,7 @@ applet_factory (MatePanelApplet *applet, return ret; } -MATE_PANEL_APPLET_IN_PROCESS_FACTORY (factory_iid, - PANEL_TYPE_APPLET, - "Drive-Mount-Applet", - applet_factory, NULL) - +PANEL_APPLET_FACTORY (factory_iid, + PANEL_TYPE_APPLET, + "Drive-Mount-Applet", + applet_factory, NULL) diff --git a/geyes/src/geyes.c b/geyes/src/geyes.c index 8bf793b3..a8337447 100644 --- a/geyes/src/geyes.c +++ b/geyes/src/geyes.c @@ -140,8 +140,10 @@ timer_cb (EyesApplet *eyes_applet) display = gtk_widget_get_display (GTK_WIDGET (eyes_applet->applet)); seat = gdk_display_get_default_seat (display); - for (i = 0; i < eyes_applet->num_eyes; i++) { - if (gtk_widget_get_realized (eyes_applet->eyes[i])) { + for (i = 0; i < eyes_applet->num_eyes; i++) + { + if (gtk_widget_get_realized (eyes_applet->eyes[i])) + { gdk_window_get_device_position (gtk_widget_get_window (eyes_applet->eyes[i]), gdk_seat_get_pointer (seat), &x, &y, NULL); diff --git a/mateweather/data/Makefile.am b/mateweather/data/Makefile.am index a6bf5ceb..d200608b 100644 --- a/mateweather/data/Makefile.am +++ b/mateweather/data/Makefile.am @@ -1,29 +1,47 @@ -APPLET_LOCATION = $(libdir)/mate-applets/libmateweather-applet.so +applet_in_files = org.mate.applets.MateWeatherApplet.mate-panel-applet.desktop.in +service_in_files = org.mate.panel.applet.MateWeatherAppletFactory.service.in + +if ENABLE_IN_PROCESS +APPLET_LOCATION = $(pkglibdir)/libmateweather-applet.so +else !ENABLE_IN_PROCESS +APPLET_LOCATION = $(libexecdir)/mateweather-applet +endif !ENABLE_IN_PROCESS 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|\@APPLET_LOCATION\@|$(APPLET_LOCATION)|" \ + -e "s|\@APPLET_IN_PROCESS\@|$(APPLET_IN_PROCESS)|" \ -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 $@ +if !ENABLE_IN_PROCESS +servicedir = $(datadir)/dbus-1/services +service_DATA = $(service_in_files:.service.in=.service) +$(service_DATA): $(service_in_files) Makefile + $(AM_V_GEN)sed \ + -e "s|\@APPLET_LOCATION\@|$(APPLET_LOCATION)|" \ + $< > $@ +endif !ENABLE_IN_PROCESS CLEANFILES = \ $(applet_DATA) \ - $(applet_in_files) + $(applet_in_files) \ + $(service_DATA) \ + $(NULL) 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 99b4dff4..959d019a 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,6 @@ [Applet Factory] Id=MateWeatherAppletFactory -InProcess=true +InProcess=@APPLET_IN_PROCESS@ Location=@APPLET_LOCATION@ Name=Mateweather Applet Factory Description=Factory for creating the weather applet. diff --git a/mateweather/data/org.mate.panel.applet.MateWeatherAppletFactory.service.in b/mateweather/data/org.mate.panel.applet.MateWeatherAppletFactory.service.in new file mode 100644 index 00000000..493a544c --- /dev/null +++ b/mateweather/data/org.mate.panel.applet.MateWeatherAppletFactory.service.in @@ -0,0 +1,3 @@ +[D-BUS Service] +Name=org.mate.panel.applet.MateWeatherAppletFactory +Exec=@APPLET_LOCATION@ diff --git a/mateweather/src/Makefile.am b/mateweather/src/Makefile.am index d032a98f..e30affd6 100644 --- a/mateweather/src/Makefile.am +++ b/mateweather/src/Makefile.am @@ -1,8 +1,5 @@ NULL = -mateweather_applet_libdir= $(pkglibdir) -mateweather_applet_lib_LTLIBRARIES=libmateweather-applet.la - AM_CPPFLAGS = \ -I$(srcdir) \ -I$(top_srcdir) \ @@ -12,24 +9,41 @@ AM_CPPFLAGS = \ $(LIBMATEWEATHER_CFLAGS) \ ${WARN_CFLAGS} -libmateweather_applet_la_SOURCES = \ - mateweather.h \ - main.c \ - mateweather-about.c mateweather-about.h \ - mateweather-pref.c mateweather-pref.h \ - mateweather-dialog.c mateweather-dialog.h \ - mateweather-applet.c mateweather-applet.h \ - mateweather-resources.c \ - mateweather-resources.h \ +BUILT_SOURCES = \ + mateweather-resources.c \ + mateweather-resources.h \ + $(NULL) +APPLET_SOURCES = \ + mateweather.h \ + main.c \ + mateweather-about.c mateweather-about.h \ + mateweather-pref.c mateweather-pref.h \ + mateweather-dialog.c mateweather-dialog.h \ + mateweather-applet.c mateweather-applet.h \ $(NULL) -libmateweather_applet_la_LIBADD = \ +APPLET_LIBS = \ $(LIBNOTIFY_LIBS) \ $(MATE_APPLETS4_LIBS) \ $(MATE_LIBS2_LIBS) \ - $(LIBMATEWEATHER_LIBS) \ + $(LIBMATEWEATHER_LIBS) \ $(NULL) +if ENABLE_IN_PROCESS +pkglib_LTLIBRARIES = libmateweather-applet.la +nodist_libmateweather_applet_la_SOURCES = $(BUILT_SOURCES) +libmateweather_applet_la_SOURCES = $(APPLET_SOURCES) +libmateweather_applet_la_CFLAGS = $(AM_CFLAGS) +libmateweather_applet_la_LDFLAGS = -module -avoid-version +libmateweather_applet_la_LIBADD = $(APPLET_LIBS) +else !ENABLE_IN_PROCESS +libexec_PROGRAMS = mateweather-applet +nodist_mateweather_applet_SOURCES = $(BUILT_SOURCES) +mateweather_applet_SOURCES = $(APPLET_SOURCES) +mateweather_applet_CFLAGS = $(AM_CFLAGS) +mateweather_applet_LDADD = $(APPLET_LIBS) +endif !ENABLE_IN_PROCESS + mateweather-resources.c: ../data/mateweather-resources.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)/../data/ --generate-dependencies $(srcdir)/../data/mateweather-resources.gresource.xml) $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)/../data/ --generate --c-name mateweather $< diff --git a/mateweather/src/main.c b/mateweather/src/main.c index af128dea..e16ef9e0 100644 --- a/mateweather/src/main.c +++ b/mateweather/src/main.c @@ -54,4 +54,4 @@ static gboolean mateweather_applet_factory(MatePanelApplet* applet, const gchar* return retval; } -MATE_PANEL_APPLET_IN_PROCESS_FACTORY("MateWeatherAppletFactory", PANEL_TYPE_APPLET, "mateweather", mateweather_applet_factory, NULL) +PANEL_APPLET_FACTORY("MateWeatherAppletFactory", PANEL_TYPE_APPLET, "mateweather", mateweather_applet_factory, NULL) diff --git a/mateweather/src/mateweather-applet.c b/mateweather/src/mateweather-applet.c index 48bc7dbe..efb2c308 100644 --- a/mateweather/src/mateweather-applet.c +++ b/mateweather/src/mateweather-applet.c @@ -341,6 +341,10 @@ void mateweather_applet_create (MateWeatherApplet *gw_applet) mate_panel_applet_set_flags (gw_applet->applet, MATE_PANEL_APPLET_EXPAND_MINOR); +#ifndef ENABLE_IN_PROCESS + g_set_application_name (_("Weather Report")); +#endif + gtk_window_set_default_icon_name ("weather-storm"); g_signal_connect (gw_applet->applet, "change-orient", diff --git a/multiload/data/Makefile.am b/multiload/data/Makefile.am index c98d4ff5..377ddc3f 100644 --- a/multiload/data/Makefile.am +++ b/multiload/data/Makefile.am @@ -1,35 +1,52 @@ NULL = -APPLET_LOCATION = $(libdir)/mate-applets/libmate-multiload-applet.so +applet_in_files = org.mate.applets.MultiLoadApplet.mate-panel-applet.desktop.in +service_in_files = org.mate.panel.applet.MultiLoadAppletFactory.service.in +gschema_in_files = org.mate.panel.applet.multiload.gschema.xml.in -multiload_gschema_in_files = org.mate.panel.applet.multiload.gschema.xml.in -gsettings_SCHEMAS = $(multiload_gschema_in_files:.xml.in=.xml) +if ENABLE_IN_PROCESS +APPLET_LOCATION = $(pkglibdir)/libmate-multiload-applet.so +else !ENABLE_IN_PROCESS +APPLET_LOCATION = $(libexecdir)/mate-multiload-applet +endif !ENABLE_IN_PROCESS + +gsettings_SCHEMAS = $(gschema_in_files:.xml.in=.xml) @GSETTINGS_RULES@ appletdir = $(datadir)/mate-panel/applets -applet_in_in_files = org.mate.applets.MultiLoadApplet.mate-panel-applet.desktop.in.in -applet_in_files = $(applet_in_in_files:.desktop.in.in=.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|\@APPLET_LOCATION\@|$(APPLET_LOCATION)|" \ + -e "s|\@APPLET_IN_PROCESS\@|$(APPLET_IN_PROCESS)|" \ -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 $@ +if !ENABLE_IN_PROCESS +servicedir = $(datadir)/dbus-1/services +service_DATA = $(service_in_files:.service.in=.service) + +$(service_DATA): $(service_in_files) Makefile + $(AM_V_GEN)sed \ + -e "s|\@APPLET_LOCATION\@|$(APPLET_LOCATION)|" \ + $< > $@ +endif !ENABLE_IN_PROCESS CLEANFILES = \ $(applet_DATA) \ $(applet_in_files) \ + $(service_DATA) \ $(gsettings_SCHEMAS) \ *.gschema.valid EXTRA_DIST = \ - $(applet_in_in_files) \ - $(multiload_gschema_in_files) \ + $(applet_in_files).in \ + $(service_in_files) \ + $(gschema_in_files) \ multiload-applet-menu.xml \ multiload-resources.gresource.xml \ properties.ui diff --git a/multiload/data/org.mate.applets.MultiLoadApplet.mate-panel-applet.desktop.in.in b/multiload/data/org.mate.applets.MultiLoadApplet.mate-panel-applet.desktop.in.in index 7ce492c2..a2b9de2d 100644 --- a/multiload/data/org.mate.applets.MultiLoadApplet.mate-panel-applet.desktop.in.in +++ b/multiload/data/org.mate.applets.MultiLoadApplet.mate-panel-applet.desktop.in.in @@ -1,7 +1,7 @@ [Applet Factory] Id=MultiLoadAppletFactory Location=@APPLET_LOCATION@ -InProcess=true +InProcess=@APPLET_IN_PROCESS@ Name=MultiLoad Applet Factory Description=Factory for creating the load applet. diff --git a/multiload/data/org.mate.panel.applet.MultiLoadAppletFactory.service.in b/multiload/data/org.mate.panel.applet.MultiLoadAppletFactory.service.in new file mode 100644 index 00000000..0c75e063 --- /dev/null +++ b/multiload/data/org.mate.panel.applet.MultiLoadAppletFactory.service.in @@ -0,0 +1,3 @@ +[D-BUS Service] +Name=org.mate.panel.applet.MultiLoadAppletFactory +Exec=@APPLET_LOCATION@ diff --git a/multiload/src/Makefile.am b/multiload/src/Makefile.am index 6efa6796..6b42871f 100644 --- a/multiload/src/Makefile.am +++ b/multiload/src/Makefile.am @@ -1,8 +1,5 @@ NULL = -mate_multiload_applet_libdir= $(pkglibdir) -mate_multiload_applet_lib_LTLIBRARIES=libmate-multiload-applet.la - AM_CPPFLAGS = \ -I$(srcdir) \ -DMULTILOAD_RESOURCE_PATH=\""/org/mate/mate-applets/multiload/"\" \ @@ -11,7 +8,11 @@ AM_CPPFLAGS = \ $(GIO_CFLAGS) \ ${WARN_CFLAGS} -libmate_multiload_applet_la_SOURCES = \ +BUILT_SOURCES = \ + multiload-resources.c \ + multiload-resources.h \ + $(NULL) +APPLET_SOURCES = \ global.h \ linux-proc.h \ load-graph.h \ @@ -22,16 +23,29 @@ libmate_multiload_applet_la_SOURCES = \ netspeed.c netspeed.h \ autoscaler.c \ autoscaler.h \ - multiload-resources.c \ - multiload-resources.h \ $(NULL) -libmate_multiload_applet_la_LIBADD = \ +APPLET_LIBS = \ $(MATE_APPLETS4_LIBS) \ $(GTOP_APPLETS_LIBS) \ $(GIO_LIBS) \ -lm +if ENABLE_IN_PROCESS +pkglib_LTLIBRARIES = libmate-multiload-applet.la +nodist_libmate_multiload_applet_la_SOURCES = $(BUILT_SOURCES) +libmate_multiload_applet_la_SOURCES = $(APPLET_SOURCES) +libmate_multiload_applet_la_CFLAGS = $(AM_CFLAGS) +libmate_multiload_applet_la_LDFLAGS = -module -avoid-version +libmate_multiload_applet_la_LIBADD = $(APPLET_LIBS) +else !ENABLE_IN_PROCESS +libexec_PROGRAMS = mate-multiload-applet +nodist_mate_multiload_applet_SOURCES = $(BUILT_SOURCES) +mate_multiload_applet_SOURCES = $(APPLET_SOURCES) +mate_multiload_applet_CFLAGS = $(AM_CFLAGS) +mate_multiload_applet_LDADD = $(APPLET_LIBS) +endif !ENABLE_IN_PROCESS + multiload-resources.c: $(srcdir)/../data/multiload-resources.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)/../data --generate-dependencies $(srcdir)/../data/multiload-resources.gresource.xml) $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)/../data --generate --c-name multiload $< @@ -39,6 +53,7 @@ multiload-resources.h: $(srcdir)/../data/multiload-resources.gresource.xml $(she $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)/../data --generate --c-name multiload $< CLEANFILES = \ + $(BUILT_SOURCES) \ $(NULL) -include $(top_srcdir)/git.mk diff --git a/multiload/src/main.c b/multiload/src/main.c index 80d365cd..9439b320 100644 --- a/multiload/src/main.c +++ b/multiload/src/main.c @@ -495,6 +495,10 @@ multiload_applet_new(MatePanelApplet *applet, const gchar *iid, gpointer data) ma->prop_dialog = NULL; ma->last_clicked = 0; +#ifndef ENABLE_IN_PROCESS + g_set_application_name (_("System Monitor")); +#endif + gtk_window_set_default_icon_name ("utilities-system-monitor"); ma->settings = mate_panel_applet_settings_new (applet, "org.mate.panel.applet.multiload"); @@ -573,8 +577,8 @@ multiload_factory (MatePanelApplet *applet, return retval; } -MATE_PANEL_APPLET_IN_PROCESS_FACTORY ("MultiLoadAppletFactory", - PANEL_TYPE_APPLET, - "multiload", - multiload_factory, - NULL) +PANEL_APPLET_FACTORY ("MultiLoadAppletFactory", + PANEL_TYPE_APPLET, + "multiload", + multiload_factory, + NULL) diff --git a/netspeed/data/Makefile.am b/netspeed/data/Makefile.am index e8bec0e1..b6cb4875 100644 --- a/netspeed/data/Makefile.am +++ b/netspeed/data/Makefile.am @@ -1,26 +1,44 @@ NULL = -APPLET_LOCATION = $(libdir)/mate-applets/libmate-netspeed-applet.so +applet_in_files = org.mate.applets.NetspeedApplet.mate-panel-applet.desktop.in +service_in_files = org.mate.panel.applet.NetspeedAppletFactory.service.in +gschema_in_files = org.mate.panel.applet.netspeed.gschema.xml.in + +if ENABLE_IN_PROCESS +APPLET_LOCATION = $(pkglibdir)/libmate-netspeed-applet.so +else !ENABLE_IN_PROCESS +APPLET_LOCATION = $(libexecdir)/mate-netspeed-applet +endif !ENABLE_IN_PROCESS appletdir = $(datadir)/mate-panel/applets -applet_in_files = org.mate.applets.NetspeedApplet.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|\@APPLET_LOCATION\@|$(APPLET_LOCATION)|" \ + -e "s|\@APPLET_IN_PROCESS\@|$(APPLET_IN_PROCESS)|" \ $< > $@ $(applet_DATA): $(applet_in_files) Makefile $(AM_V_GEN) $(MSGFMT) --desktop --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@ -netspeed_gschema_in_files = org.mate.panel.applet.netspeed.gschema.xml.in -gsettings_SCHEMAS = $(netspeed_gschema_in_files:.xml.in=.xml) +if !ENABLE_IN_PROCESS +servicedir = $(datadir)/dbus-1/services +service_DATA = $(service_in_files:.service.in=.service) + +$(service_DATA): $(service_in_files) Makefile + $(AM_V_GEN)sed \ + -e "s|\@APPLET_LOCATION\@|$(APPLET_LOCATION)|" \ + $< > $@ +endif !ENABLE_IN_PROCESS + +gsettings_SCHEMAS = $(gschema_in_files:.xml.in=.xml) @GSETTINGS_RULES@ EXTRA_DIST = \ $(applet_in_files).in \ - $(netspeed_gschema_in_files) \ + $(service_in_files) \ + $(gschema_in_files) \ netspeed-details.ui \ netspeed-menu.xml \ netspeed-preferences.ui \ @@ -29,6 +47,7 @@ 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 5b63e7c2..2d156785 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,7 +1,7 @@ [Applet Factory] Id=NetspeedAppletFactory Location=@APPLET_LOCATION@ -InProcess=true +InProcess=@APPLET_IN_PROCESS@ Name=Netspeed Applet Factory Description=Netspeed Applet diff --git a/netspeed/data/org.mate.panel.applet.NetspeedAppletFactory.service.in b/netspeed/data/org.mate.panel.applet.NetspeedAppletFactory.service.in new file mode 100644 index 00000000..49f7ff15 --- /dev/null +++ b/netspeed/data/org.mate.panel.applet.NetspeedAppletFactory.service.in @@ -0,0 +1,3 @@ +[D-BUS Service] +Name=org.mate.panel.applet.NetspeedAppletFactory +Exec=@APPLET_LOCATION@ diff --git a/netspeed/src/Makefile.am b/netspeed/src/Makefile.am index e91c1b34..ceec7342 100644 --- a/netspeed/src/Makefile.am +++ b/netspeed/src/Makefile.am @@ -1,8 +1,5 @@ NULL = -mate_netspeed_applet_libdir= $(pkglibdir) -mate_netspeed_applet_lib_LTLIBRARIES=libmate-netspeed-applet.la - AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(includedir) \ @@ -16,35 +13,54 @@ if HAVE_NL AM_CPPFLAGS += $(NL_CFLAGS) endif -libmate_netspeed_applet_la_SOURCES = \ +BUILT_SOURCES = \ + netspeed-resources.c \ + netspeed-resources.h \ + $(NULL) +APPLET_SOURCES = \ backend.h \ backend.c \ netspeed.c \ netspeed.h \ netspeed-preferences.c \ netspeed-preferences.h \ - netspeed-resources.c \ - netspeed-resources.h \ $(NULL) if HAVE_NL -libmate_netspeed_applet_la_SOURCES += \ +APPLET_SOURCES += \ nl80211.h \ ieee80211.h \ $(NULL) endif -libmate_netspeed_applet_la_LIBADD = $(GIO_LIBS) $(GTOP_APPLETS_LIBS) \ - $(MATE_APPLETS4_LIBS) \ - $(INTLLIBS) -lm +APPLET_LIBS = \ + $(GIO_LIBS) \ + $(GTOP_APPLETS_LIBS) \ + $(MATE_APPLETS4_LIBS) \ + $(INTLLIBS) -lm if HAVE_IW -libmate_netspeed_applet_la_LIBADD += $(IW_LIBS) +APPLET_LIBS += $(IW_LIBS) endif if HAVE_NL -libmate_netspeed_applet_la_LIBADD += $(NL_LIBS) +APPLET_LIBS += $(NL_LIBS) endif +if ENABLE_IN_PROCESS +pkglib_LTLIBRARIES = libmate-netspeed-applet.la +nodist_libmate_netspeed_applet_la_SOURCES = $(BUILT_SOURCES) +libmate_netspeed_applet_la_SOURCES = $(APPLET_SOURCES) +libmate_netspeed_applet_la_CFLAGS = $(AM_CFLAGS) +libmate_netspeed_applet_la_LDFLAGS = -module -avoid-version +libmate_netspeed_applet_la_LIBADD = $(APPLET_LIBS) +else !ENABLE_IN_PROCESS +libexec_PROGRAMS = mate-netspeed-applet +nodist_mate_netspeed_applet_SOURCES = $(BUILT_SOURCES) +mate_netspeed_applet_SOURCES = $(APPLET_SOURCES) +mate_netspeed_applet_CFLAGS = $(AM_CFLAGS) +mate_netspeed_applet_LDADD = $(APPLET_LIBS) +endif !ENABLE_IN_PROCESS + netspeed-resources.c: $(srcdir)/../data/netspeed-resources.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)/../data --generate-dependencies $(srcdir)/../data/netspeed-resources.gresource.xml) $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)/../data --generate --c-name netspeed $< @@ -52,6 +68,7 @@ netspeed-resources.h: $(srcdir)/../data/netspeed-resources.gresource.xml $(shell $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)/../data --generate --c-name netspeed $< CLEANFILES = \ + $(BUILT_SOURCES) \ $(NULL) -include $(top_srcdir)/git.mk diff --git a/netspeed/src/netspeed.c b/netspeed/src/netspeed.c index 441f314f..73185abd 100644 --- a/netspeed/src/netspeed.c +++ b/netspeed/src/netspeed.c @@ -1575,6 +1575,10 @@ netspeed_applet_factory (MatePanelApplet *applet, glibtop_init (); +#ifndef ENABLE_IN_PROCESS + g_set_application_name (_("MATE Netspeed")); +#endif + netspeed = NETSPEED_APPLET (applet); netspeed->icon_theme = gtk_icon_theme_get_default (); @@ -1680,60 +1684,60 @@ netspeed_applet_factory (MatePanelApplet *applet, (GSourceFunc)timeout_function, netspeed); g_signal_connect_object (applet, "change-size", - G_CALLBACK (applet_change_size_or_orient), - netspeed, 0); + G_CALLBACK (applet_change_size_or_orient), + netspeed, 0); g_signal_connect_object (netspeed->icon_theme, "changed", - G_CALLBACK (icon_theme_changed_cb), - netspeed, 0); + G_CALLBACK (icon_theme_changed_cb), + netspeed, 0); g_signal_connect_object (applet, "change-orient", - G_CALLBACK (applet_change_size_or_orient), - netspeed, 0); + G_CALLBACK (applet_change_size_or_orient), + netspeed, 0); g_signal_connect_object (netspeed->in_label, "size-allocate", - G_CALLBACK (label_size_allocate_cb), - netspeed, 0); + G_CALLBACK (label_size_allocate_cb), + netspeed, 0); g_signal_connect_object (netspeed->out_label, "size-allocate", - G_CALLBACK (label_size_allocate_cb), - netspeed, 0); + G_CALLBACK (label_size_allocate_cb), + netspeed, 0); g_signal_connect_object (netspeed->sum_label, "size-allocate", - G_CALLBACK (label_size_allocate_cb), - netspeed, 0); + G_CALLBACK (label_size_allocate_cb), + netspeed, 0); g_signal_connect_object (netspeed->settings, "changed::auto-change-device", - G_CALLBACK (auto_change_device_settings_changed), - netspeed, 0); + G_CALLBACK (auto_change_device_settings_changed), + netspeed, 0); g_signal_connect_object (netspeed->settings, "changed::device", - G_CALLBACK (device_settings_changed), - netspeed, 0); + G_CALLBACK (device_settings_changed), + netspeed, 0); g_signal_connect_object (netspeed->settings, "changed::show-all-addresses", - G_CALLBACK (showalladdresses_settings_changed), - netspeed, 0); + G_CALLBACK (showalladdresses_settings_changed), + netspeed, 0); g_signal_connect_object (netspeed->settings, "changed::show-sum", - G_CALLBACK (showsum_settings_changed), - netspeed, 0); + G_CALLBACK (showsum_settings_changed), + netspeed, 0); g_signal_connect_object (netspeed->settings, "changed::show-bits", - G_CALLBACK (showbits_settings_changed), - netspeed, 0); + G_CALLBACK (showbits_settings_changed), + netspeed, 0); g_signal_connect_object (netspeed->settings, "changed::change-icon", - G_CALLBACK (changeicon_settings_changed), - netspeed, 0); + G_CALLBACK (changeicon_settings_changed), + netspeed, 0); g_signal_connect_object (netspeed->settings, "changed::show-icon", - G_CALLBACK (showicon_settings_changed), - netspeed, 0); + G_CALLBACK (showicon_settings_changed), + netspeed, 0); g_signal_connect_object (netspeed->settings, "changed::show-quality-icon", - G_CALLBACK (showqualityicon_settings_changed), - netspeed, 0); + G_CALLBACK (showqualityicon_settings_changed), + netspeed, 0); action_group = gtk_action_group_new ("Netspeed Applet Actions"); gtk_action_group_set_translation_domain (action_group, GETTEXT_PACKAGE); @@ -1759,8 +1763,8 @@ netspeed_applet_factory (MatePanelApplet *applet, return TRUE; } -MATE_PANEL_APPLET_IN_PROCESS_FACTORY ("NetspeedAppletFactory", - NETSPEED_TYPE_APPLET, - "NetspeedApplet", - netspeed_applet_factory, - NULL) +PANEL_APPLET_FACTORY ("NetspeedAppletFactory", + NETSPEED_TYPE_APPLET, + "NetspeedApplet", + netspeed_applet_factory, + NULL) diff --git a/stickynotes/Makefile.am b/stickynotes/Makefile.am index 2057f587..6f51c130 100644 --- a/stickynotes/Makefile.am +++ b/stickynotes/Makefile.am @@ -1,11 +1,7 @@ NULL = -APPLET_LOCATION = $(libdir)/mate-applets/libmate-stickynotes-applet.so - SUBDIRS = pixmaps docs -mate_stickynotes_applet_libdir= $(pkglibdir) -mate_stickynotes_applet_lib_LTLIBRARIES=libmate-stickynotes-applet.la applet_in_files = org.mate.applets.StickyNotesApplet.mate-panel-applet.desktop.in service_in_files = org.mate.panel.applet.StickyNotesAppletFactory.service.in schemas_in_files = stickynotes.schemas.in @@ -22,7 +18,11 @@ AM_CPPFLAGS = \ ${WARN_CFLAGS} \ $(NULL) -libmate_stickynotes_applet_la_SOURCES = \ +BUILT_SOURCES = \ + sticky-notes-resources.c \ + sticky-notes-resources.h \ + $(NULL) +APPLET_SOURCES = \ util.h \ util.c \ stickynotes.h \ @@ -33,11 +33,9 @@ libmate_stickynotes_applet_la_SOURCES = \ stickynotes_callbacks.c \ stickynotes_applet.c \ stickynotes_applet_callbacks.c \ - sticky-notes-resources.c \ - sticky-notes-resources.h \ $(NULL) -libmate_stickynotes_applet_la_LIBADD = \ +APPLET_LIBS = \ $(STICKYNOTES_LIBS) \ $(MATE_APPLETS4_LIBS) \ $(LIBWNCK_LIBS) \ @@ -45,6 +43,31 @@ libmate_stickynotes_applet_la_LIBADD = \ -lX11 \ $(NULL) +if ENABLE_IN_PROCESS +APPLET_LOCATION = $(pkglibdir)/libmate-stickynotes-applet.so +pkglib_LTLIBRARIES = libmate-stickynotes-applet.la +nodist_libmate_stickynotes_applet_la_SOURCES = $(BUILT_SOURCES) +libmate_stickynotes_applet_la_SOURCES = $(APPLET_SOURCES) +libmate_stickynotes_applet_la_CFLAGS = $(AM_CFLAGS) +libmate_stickynotes_applet_la_LDFLAGS = -module -avoid-version +libmate_stickynotes_applet_la_LIBADD = $(APPLET_LIBS) +else !ENABLE_IN_PROCESS +APPLET_LOCATION = $(libexecdir)/stickynotes-applet +libexec_PROGRAMS = stickynotes-applet +nodist_stickynotes_applet_SOURCES = $(BUILT_SOURCES) +stickynotes_applet_SOURCES = $(APPLET_SOURCES) +stickynotes_applet_CFLAGS = $(AM_CFLAGS) +stickynotes_applet_LDADD = $(APPLET_LIBS) + +servicedir = $(datadir)/dbus-1/services +service_DATA = $(service_in_files:.service.in=.service) + +$(service_DATA): $(service_in_files) Makefile + $(AM_V_GEN)sed \ + -e "s|\@APPLET_LOCATION\@|$(APPLET_LOCATION)|" \ + $< > $@ +endif !ENABLE_IN_PROCESS + stickynotes_gschema_in_files = org.mate.stickynotes.gschema.xml.in gsettings_SCHEMAS = $(stickynotes_gschema_in_files:.xml.in=.xml) @GSETTINGS_RULES@ @@ -61,6 +84,7 @@ 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|\@APPLET_LOCATION\@|$(APPLET_LOCATION)|" \ + -e "s|\@APPLET_IN_PROCESS\@|$(APPLET_IN_PROCESS)|" \ -e "s|\@VERSION\@|$(PACKAGE_VERSION)|" \ $< > $@ @@ -70,16 +94,19 @@ $(applet_DATA): $(applet_in_files) Makefile CLEANFILES = \ $(applet_DATA) \ $(applet_in_files) \ + $(service_DATA) \ $(gsettings_SCHEMAS) \ sticky-notes-resources.c \ sticky-notes-resources.h \ *.gschema.valid \ + $(BUILT_SOURCES) \ $(NULL) endif EXTRA_DIST = \ $(stickynotes_gschema_in_files) \ + $(service_in_files) \ $(applet_in_files:=.in) \ sticky-notes-delete.ui \ sticky-notes-delete-all.ui \ diff --git a/stickynotes/org.mate.applets.StickyNotesApplet.mate-panel-applet.desktop.in.in b/stickynotes/org.mate.applets.StickyNotesApplet.mate-panel-applet.desktop.in.in index 097a8fdd..44a1e460 100644 --- a/stickynotes/org.mate.applets.StickyNotesApplet.mate-panel-applet.desktop.in.in +++ b/stickynotes/org.mate.applets.StickyNotesApplet.mate-panel-applet.desktop.in.in @@ -1,7 +1,7 @@ [Applet Factory] Id=StickyNotesAppletFactory Location=@APPLET_LOCATION@ -InProcess=true +InProcess=@APPLET_IN_PROCESS@ Name=Sticky Notes Applet Factory Description=Sticky Notes Applet Factory diff --git a/stickynotes/org.mate.panel.applet.StickyNotesAppletFactory.service.in b/stickynotes/org.mate.panel.applet.StickyNotesAppletFactory.service.in new file mode 100644 index 00000000..bde79ac3 --- /dev/null +++ b/stickynotes/org.mate.panel.applet.StickyNotesAppletFactory.service.in @@ -0,0 +1,3 @@ +[D-BUS Service] +Name=org.mate.panel.applet.StickyNotesAppletFactory +Exec=@APPLET_LOCATION@ diff --git a/stickynotes/stickynotes.c b/stickynotes/stickynotes.c index 3f5c7985..85afdc3d 100644 --- a/stickynotes/stickynotes.c +++ b/stickynotes/stickynotes.c @@ -822,8 +822,8 @@ stickynotes_save_now (void) xmlDocSetRootElement (doc, root); xmlNewProp (root, XML_CHAR ("version"), XML_CHAR (VERSION)); #ifdef GDK_WINDOWING_X11 - GdkDisplay *display = gdk_screen_get_display(gdk_screen_get_default()); - if (GDK_IS_X11_DISPLAY(display)) + GdkDisplay *display = gdk_screen_get_display (gdk_screen_get_default()); + if (GDK_IS_X11_DISPLAY (display)) { WnckScreen *wnck_screen = wnck_screen_get_default (); wnck_screen_force_update (wnck_screen); @@ -955,7 +955,7 @@ stickynotes_load (GdkScreen *screen) GList *new_nodes; /* Lists of xmlNodePtr's */ int x, y, w, h; #ifdef GDK_WINDOWING_X11 - GdkDisplay *display = gdk_screen_get_display(gdk_screen_get_default()); + GdkDisplay *display = gdk_screen_get_display (gdk_screen_get_default()); #endif /* The XML file is $HOME/.config/mate/stickynotes-applet, most probably */ diff --git a/stickynotes/stickynotes_applet.c b/stickynotes/stickynotes_applet.c index 88785fb3..d88709da 100644 --- a/stickynotes/stickynotes_applet.c +++ b/stickynotes/stickynotes_applet.c @@ -84,11 +84,11 @@ stickynotes_applet_factory (MatePanelApplet *mate_panel_applet, } /* Sticky Notes applet factory */ -MATE_PANEL_APPLET_IN_PROCESS_FACTORY ("StickyNotesAppletFactory", - PANEL_TYPE_APPLET, - "stickynotes_applet", - stickynotes_applet_factory, - NULL) +PANEL_APPLET_FACTORY ("StickyNotesAppletFactory", + PANEL_TYPE_APPLET, + "stickynotes_applet", + stickynotes_applet_factory, + NULL) /* colorshift a surface */ static void @@ -178,6 +178,9 @@ stickynotes_applet_init (MatePanelApplet *mate_panel_applet) size = mate_panel_applet_get_size (mate_panel_applet); scale = gtk_widget_get_scale_factor (GTK_WIDGET (mate_panel_applet)); +#ifndef ENABLE_IN_PROCESS + g_set_application_name (_("Sticky Notes")); +#endif gtk_window_set_default_icon_name ("mate-sticky-notes-applet"); stickynotes->icon_normal = diff --git a/timerapplet/data/Makefile.am b/timerapplet/data/Makefile.am index 2b8cebd4..ae0139b6 100644 --- a/timerapplet/data/Makefile.am +++ b/timerapplet/data/Makefile.am @@ -1,26 +1,44 @@ NULL = -APPLET_LOCATION = $(libdir)/mate-applets/libmate-timer-applet.so +applets_in_files = org.mate.applets.TimerApplet.mate-panel-applet.desktop.in +service_in_files = org.mate.panel.applet.TimerAppletFactory.service.in +gschema_in_files = org.mate.panel.applet.timer.gschema.xml.in + +if ENABLE_IN_PROCESS +APPLET_LOCATION = $(pkglibdir)/libmate-timer-applet.so +else !ENABLE_IN_PROCESS +APPLET_LOCATION = $(libexecdir)/timer-applet +endif !ENABLE_IN_PROCESS appletsdir = $(datadir)/mate-panel/applets -applets_in_files = org.mate.applets.TimerApplet.mate-panel-applet.desktop.in applets_DATA = $(applets_in_files:.mate-panel-applet.desktop.in=.mate-panel-applet) $(applets_in_files): $(applets_in_files).in Makefile $(AM_V_GEN)sed \ -e "s|\@APPLET_LOCATION\@|$(APPLET_LOCATION)|" \ + -e "s|\@APPLET_IN_PROCESS\@|$(APPLET_IN_PROCESS)|" \ $< > $@ + $(applets_DATA): $(applets_in_files) Makefile $(AM_V_GEN) $(MSGFMT) --desktop --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@ +if !ENABLE_IN_PROCESS +servicedir = $(datadir)/dbus-1/services +service_DATA = $(service_in_files:.service.in=.service) + +$(service_DATA): $(service_in_files) Makefile + $(AM_V_GEN)sed \ + -e "s|\@APPLET_LOCATION\@|$(APPLET_LOCATION)|" \ + $< > $@ +endif !ENABLE_IN_PROCESS -timer_gschema_in_files = org.mate.panel.applet.timer.gschema.xml.in -gsettings_SCHEMAS = $(timer_gschema_in_files:.xml.in=.xml) +gsettings_SCHEMAS = $(gschema_in_files:.xml.in=.xml) @GSETTINGS_RULES@ EXTRA_DIST = \ $(applets_in_files).in \ - $(timer_gschema_in_files) \ + $(service_in_files) \ + $(gschema_in_files) \ timerapplet-preferences.ui \ timerapplet-resources.gresource.xml \ $(NULL) @@ -28,6 +46,7 @@ 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 86b18021..53fdd9ea 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,13 +1,13 @@ [Applet Factory] Id=TimerAppletFactory Location=@APPLET_LOCATION@ -InProcess=true +InProcess=@APPLET_IN_PROCESS@ Name=Timer Factory Description=Timer Factory [TimerApplet] Name=Timer Description=Start a timer and receive a notification when it is finished -Platforms=X11;Wayland +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 new file mode 100644 index 00000000..6e9f0a84 --- /dev/null +++ b/timerapplet/data/org.mate.panel.applet.TimerAppletFactory.service.in @@ -0,0 +1,3 @@ +[D-BUS Service] +Name=org.mate.panel.applet.TimerAppletFactory +Exec=@APPLET_LOCATION@ diff --git a/timerapplet/src/Makefile.am b/timerapplet/src/Makefile.am index 5341cc16..75688baa 100644 --- a/timerapplet/src/Makefile.am +++ b/timerapplet/src/Makefile.am @@ -1,8 +1,5 @@ NULL = -mate_timer_applet_libdir= $(pkglibdir) -mate_timer_applet_lib_LTLIBRARIES=libmate-timer-applet.la - AM_CPPFLAGS = \ $(MATE_APPLETS4_CFLAGS) \ $(LIBNOTIFY_CFLAGS) \ @@ -10,18 +7,35 @@ AM_CPPFLAGS = \ $(DISABLE_DEPRECATED_CFLAGS) \ $(NULL) -libmate_timer_applet_la_SOURCES = \ - timerapplet.c \ - timerapplet-resources.c \ - timerapplet-resources.h \ +AM_CFLAGS = $(WARN_CFLAGS) + +BUILT_SOURCES = \ + timerapplet-resources.c \ + timerapplet-resources.h \ + $(NULL) +APPLET_SOURCES = \ + timerapplet.c \ $(NULL) -libmate_timer_applet_la_LIBADD = \ +APPLET_LIBS = \ $(MATE_APPLETS4_LIBS) \ $(LIBNOTIFY_LIBS) \ $(NULL) -libmate_timer_applet_la_CFLAGS = $(WARN_CFLAGS) +if ENABLE_IN_PROCESS +pkglib_LTLIBRARIES = libmate-timer-applet.la +nodist_libmate_timer_applet_la_SOURCES = $(BUILT_SOURCES) +libmate_timer_applet_la_SOURCES = $(APPLET_SOURCES) +libmate_timer_applet_la_CFLAGS = $(AM_CFLAGS) +libmate_timer_applet_la_LDFLAGS = -module -avoid-version +libmate_timer_applet_la_LIBADD = $(APPLET_LIBS) +else !ENABLE_IN_PROCESS +libexec_PROGRAMS = timer-applet +nodist_timer_applet_SOURCES = $(BUILT_SOURCES) +timer_applet_SOURCES = $(APPLET_SOURCES) +timer_applet_CFLAGS = $(AM_CFLAGS) +timer_applet_LDADD = $(APPLET_LIBS) +endif !ENABLE_IN_PROCESS timerapplet-resources.c: $(srcdir)/../data/timerapplet-resources.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)/../data --generate-dependencies $(srcdir)/../data/timerapplet-resources.gresource.xml) $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)/../data --generate --c-name timerapplet $< @@ -30,6 +44,7 @@ timerapplet-resources.h: $(srcdir)/../data/timerapplet-resources.gresource.xml $ $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)/../data --generate --c-name timerapplet $< CLEANFILES = \ + $(BUILT_SOURCES) \ $(NULL) -include $(top_srcdir)/git.mk diff --git a/timerapplet/src/timerapplet.c b/timerapplet/src/timerapplet.c index f2fcfc1e..2c397b16 100644 --- a/timerapplet/src/timerapplet.c +++ b/timerapplet/src/timerapplet.c @@ -376,6 +376,9 @@ timer_applet_fill (MatePanelApplet* applet_widget) TimerApplet *applet; AtkObject *atk_obj; +#ifndef ENABLE_IN_PROCESS + g_set_application_name (_("Timer Applet")); +#endif gtk_window_set_default_icon_name (APPLET_ICON); if (!notify_is_initted ()) @@ -456,8 +459,8 @@ timer_factory (MatePanelApplet* applet, const char* iid, gpointer data) } /* needed by mate-panel applet library */ -MATE_PANEL_APPLET_IN_PROCESS_FACTORY("TimerAppletFactory", - PANEL_TYPE_APPLET, - "Timer applet", - timer_factory, - NULL) +PANEL_APPLET_FACTORY ("TimerAppletFactory", + PANEL_TYPE_APPLET, + "Timer applet", + timer_factory, + NULL) diff --git a/trashapplet/data/Makefile.am b/trashapplet/data/Makefile.am index f318e0fb..8449ac6e 100644 --- a/trashapplet/data/Makefile.am +++ b/trashapplet/data/Makefile.am @@ -1,25 +1,42 @@ -APPLET_LOCATION = $(libdir)/mate-applets/libtrashapplet.so +applet_in_files = org.mate.applets.TrashApplet.mate-panel-applet.desktop.in +service_in_files = org.mate.panel.applet.TrashAppletFactory.service.in + +if ENABLE_IN_PROCESS +APPLET_LOCATION = $(pkglibdir)/libmate-trash-applet.so +else !ENABLE_IN_PROCESS +APPLET_LOCATION = $(libexecdir)/trashapplet +endif !ENABLE_IN_PROCESS appletdir = $(datadir)/mate-panel/applets -applet_in_files = org.mate.applets.TrashApplet.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|\@APPLET_LOCATION\@|$(APPLET_LOCATION)|" \ + -e "s|\@APPLET_IN_PROCESS\@|$(APPLET_IN_PROCESS)|" \ -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 $@ +if !ENABLE_IN_PROCESS +servicedir = $(datadir)/dbus-1/services +service_DATA = $(service_in_files:.service.in=.service) + +$(service_DATA): $(service_in_files) Makefile + $(AM_V_GEN)sed \ + -e "s|\@APPLET_LOCATION\@|$(APPLET_LOCATION)|" \ + $< > $@ +endif !ENABLE_IN_PROCESS -EXTRA_DIST = \ - $(applet_in_files).in \ - trashapplet-empty-progress.ui \ - trashapplet-menu.xml \ +EXTRA_DIST = \ + $(applet_in_files).in \ + $(service_in_files) \ + trashapplet-empty-progress.ui \ + trashapplet-menu.xml \ trashapplet-resources.gresource.xml -CLEANFILES = $(applet_DATA) $(applet_in_files) +CLEANFILES = $(applet_DATA) $(applet_in_files) $(service_DATA) -include $(top_srcdir)/git.mk diff --git a/trashapplet/data/org.mate.applets.TrashApplet.mate-panel-applet.desktop.in.in b/trashapplet/data/org.mate.applets.TrashApplet.mate-panel-applet.desktop.in.in index d62a5a74..349d2116 100644 --- a/trashapplet/data/org.mate.applets.TrashApplet.mate-panel-applet.desktop.in.in +++ b/trashapplet/data/org.mate.applets.TrashApplet.mate-panel-applet.desktop.in.in @@ -1,6 +1,6 @@ [Applet Factory] Id=TrashAppletFactory -InProcess=true +InProcess=@APPLET_IN_PROCESS@ Location=@APPLET_LOCATION@ Name=Trash Applet Factory Description=Trash Applet Factory diff --git a/trashapplet/data/org.mate.panel.applet.TrashAppletFactory.service.in b/trashapplet/data/org.mate.panel.applet.TrashAppletFactory.service.in new file mode 100644 index 00000000..9a406173 --- /dev/null +++ b/trashapplet/data/org.mate.panel.applet.TrashAppletFactory.service.in @@ -0,0 +1,3 @@ +[D-BUS Service] +Name=org.mate.panel.applet.TrashAppletFactory +Exec=@APPLET_LOCATION@ diff --git a/trashapplet/src/Makefile.am b/trashapplet/src/Makefile.am index 1cad7acd..6cb5ef0a 100644 --- a/trashapplet/src/Makefile.am +++ b/trashapplet/src/Makefile.am @@ -4,31 +4,46 @@ AM_CPPFLAGS = -I$(top_srcdir) \ -DGRESOURCE=\""/org/mate/mate-applets/trash/\"" \ ${WARN_CFLAGS} -trashapplet_libdir= $(pkglibdir) -trashapplet_lib_LTLIBRARIES=libtrashapplet.la - -libtrashapplet_la_SOURCES = \ - trashapplet.c \ - trash-empty.h \ - trash-empty.c \ - xstuff.c \ - xstuff.h \ - trashapplet-resources.c \ - trashapplet-resources.h \ +BUILT_SOURCES = \ + trashapplet-resources.c \ + trashapplet-resources.h \ + $(NULL) +APPLET_SOURCES = \ + trashapplet.c \ + trash-empty.h \ + trash-empty.c \ + xstuff.c \ + xstuff.h \ $(NULL) -libtrashapplet_la_LIBADD = \ - $(MATE_APPLETS4_LIBS) \ - $(GIO_LIBS) \ +APPLET_LIBS = \ + $(MATE_APPLETS4_LIBS) \ + $(GIO_LIBS) \ -lX11 +if ENABLE_IN_PROCESS +pkglib_LTLIBRARIES = libmate-trash-applet.la +nodist_libmate_trash_applet_la_SOURCES = $(BUILT_SOURCES) +libmate_trash_applet_la_SOURCES = $(APPLET_SOURCES) +libmate_trash_applet_la_CFLAGS = $(AM_CFLAGS) +libmate_trash_applet_la_LDFLAGS = -module -avoid-version +libmate_trash_applet_la_LIBADD = $(APPLET_LIBS) +else !ENABLE_IN_PROCESS +libexec_PROGRAMS = trashapplet +nodist_trashapplet_SOURCES = $(BUILT_SOURCES) +trashapplet_SOURCES = $(APPLET_SOURCES) +trashapplet_CFLAGS = $(AM_CFLAGS) +trashapplet_LDADD = $(APPLET_LIBS) +endif !ENABLE_IN_PROCESS + trashapplet-resources.c: ../data/trashapplet-resources.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)/../data/ --generate-dependencies $(srcdir)/../data/trashapplet-resources.gresource.xml) $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)/../data/ --generate --c-name trashapplet $< trashapplet-resources.h: ../data/trashapplet-resources.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)/../data/ --generate-dependencies $(srcdir)/../data/trashapplet-resources.gresource.xml) $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)/../data/ --generate --c-name trashapplet $< -CLEANFILES = \ +CLEANFILES = \ + $(BUILT_SOURCES) \ $(NULL) -include $(top_srcdir)/git.mk diff --git a/trashapplet/src/trashapplet.c b/trashapplet/src/trashapplet.c index 515bab10..f8a1bfc6 100644 --- a/trashapplet/src/trashapplet.c +++ b/trashapplet/src/trashapplet.c @@ -631,6 +631,10 @@ trash_applet_factory (MatePanelApplet *applet, AtkObject *atk_obj; GtkActionGroup *action_group; +#ifndef ENABLE_IN_PROCESS + g_set_application_name (_("Trash Applet")); +#endif + gtk_window_set_default_icon_name ("user-trash"); /* Set up the menu */ @@ -659,8 +663,8 @@ trash_applet_factory (MatePanelApplet *applet, return retval; } -MATE_PANEL_APPLET_IN_PROCESS_FACTORY ("TrashAppletFactory", - TRASH_TYPE_APPLET, - "TrashApplet", - trash_applet_factory, - NULL) +PANEL_APPLET_FACTORY ("TrashAppletFactory", + TRASH_TYPE_APPLET, + "TrashApplet", + trash_applet_factory, + NULL) |