diff options
Diffstat (limited to 'accessx-status/src/applet.c')
| -rw-r--r-- | accessx-status/src/applet.c | 49 |
1 files changed, 21 insertions, 28 deletions
diff --git a/accessx-status/src/applet.c b/accessx-status/src/applet.c index 40a45ecf..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"), @@ -179,8 +177,9 @@ dialog_cb (GtkAction* action, &error); if (!error) { - launch_context = gdk_display_get_app_launch_context ( - gtk_widget_get_display (GTK_WIDGET (sapplet->applet))); + launch_context = + gdk_display_get_app_launch_context (gtk_widget_get_display (GTK_WIDGET (sapplet->applet))); + gdk_app_launch_context_set_screen (launch_context, screen); g_app_info_launch (appinfo, NULL, @@ -199,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); @@ -1294,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); @@ -1319,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; @@ -1625,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); } @@ -1637,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); @@ -1685,9 +1681,6 @@ accessx_status_applet_fill (MatePanelApplet* applet) accessx_status_applet_reset (sapplet); } - mate_panel_applet_set_background_widget (sapplet->applet, - GTK_WIDGET (sapplet->applet)); - return TRUE; } @@ -1706,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) |