diff options
Diffstat (limited to 'accessx-status')
5 files changed, 46 insertions, 20 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) |