diff options
Diffstat (limited to 'accessx-status/src')
-rw-r--r-- | accessx-status/src/Makefile.am | 22 | ||||
-rw-r--r-- | accessx-status/src/applet.c | 41 |
2 files changed, 35 insertions, 28 deletions
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 d040a27e..dd3e6cc9 100644 --- a/accessx-status/src/applet.c +++ b/accessx-status/src/applet.c @@ -113,7 +113,7 @@ about_cb (GtkAction* action, "version", VERSION, "comments", _("Shows the state of AccessX features such as latched modifiers"), "copyright", _("Copyright \xc2\xa9 2003 Sun Microsystems\n" - "Copyright \xc2\xa9 2012-2020 MATE developers"), + "Copyright \xc2\xa9 2012-2021 MATE developers"), "authors", authors, "documenters", documenters, "translator-credits", _("translator-credits"), @@ -143,8 +143,7 @@ help_cb (GtkAction* action, _("There was an error launching the help viewer: %s"), error->message); - g_signal_connect (G_OBJECT (dialog), - "response", + g_signal_connect (dialog, "response", G_CALLBACK (gtk_widget_destroy), NULL); @@ -171,7 +170,6 @@ dialog_cb (GtkAction* action, return; } - screen = gtk_widget_get_screen (GTK_WIDGET (sapplet->applet)); appinfo = g_app_info_create_from_commandline ("mate-keyboard-properties --a11y", _("Open the keyboard preferences dialog"), @@ -200,8 +198,7 @@ dialog_cb (GtkAction* action, _("There was an error launching the keyboard preferences dialog: %s"), error->message); - g_signal_connect (G_OBJECT (dialog), - "response", + g_signal_connect (dialog, "response", G_CALLBACK (gtk_widget_destroy), NULL); @@ -1295,8 +1292,7 @@ popup_error_dialog (AccessxStatusApplet* sapplet) _("Error: %s"), error_txt); - g_signal_connect (G_OBJECT (dialog), - "response", + g_signal_connect (dialog, "response", G_CALLBACK (gtk_widget_destroy), NULL); @@ -1320,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; @@ -1626,8 +1624,7 @@ accessx_status_applet_fill (MatePanelApplet* applet) if (!gtk_widget_get_realized (sapplet->box)) { - g_signal_connect_after (G_OBJECT (sapplet->box), - "realize", + g_signal_connect_after (sapplet->box, "realize", G_CALLBACK (accessx_status_applet_realize), sapplet); } @@ -1638,18 +1635,16 @@ accessx_status_applet_fill (MatePanelApplet* applet) } g_object_connect (sapplet->applet, - "signal::destroy", accessx_status_applet_destroy, sapplet, - "signal::change_orient", accessx_status_applet_reorient, sapplet, - "signal::change_size", accessx_status_applet_resize, sapplet, - NULL); + "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", + g_signal_connect (sapplet->applet, "button-press-event", G_CALLBACK (button_press_cb), sapplet); - g_signal_connect (sapplet->applet, - "key_press_event", + g_signal_connect (sapplet->applet, "key-press-event", G_CALLBACK (key_press_cb), sapplet); @@ -1704,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) |