diff options
Diffstat (limited to 'command/src/command.c')
| -rw-r--r-- | command/src/command.c | 123 |
1 files changed, 73 insertions, 50 deletions
diff --git a/command/src/command.c b/command/src/command.c index f53bef43..c4ff027a 100644 --- a/command/src/command.c +++ b/command/src/command.c @@ -90,11 +90,47 @@ static const GtkActionEntry applet_menu_actions [] = { static char *ui = "<menuitem name='Item 1' action='Preferences' />" "<menuitem name='Item 2' action='About' />"; +/* GSettings signal callbacks */ +static void +settings_command_changed (GSettings *settings, gchar *key, CommandApplet *command_applet) +{ + GError *error = NULL; + gchar *cmdline; + gchar **argv; + + cmdline = g_settings_get_string (command_applet->settings, COMMAND_KEY); + if (strlen (cmdline) == 0 || g_strcmp0(command_applet->cmdline, cmdline) == 0) + { + g_free (cmdline); + return; + } + + if (!g_shell_parse_argv (cmdline, NULL, &argv, &error)) + { + gtk_label_set_text (command_applet->label, ERROR_OUTPUT); + g_clear_error (&error); + g_free (cmdline); + return; + } + g_strfreev(argv); + + if (command_applet->cmdline) + g_free (command_applet->cmdline); + command_applet->cmdline = cmdline; + + command_execute (command_applet); +} + static void command_applet_destroy (MatePanelApplet *applet_widget, CommandApplet *command_applet) { g_assert (command_applet); + g_signal_handlers_disconnect_by_func (command_applet->settings, + G_CALLBACK (settings_command_changed), + command_applet); + + if (command_applet->timeout_id != 0) { g_source_remove (command_applet->timeout_id); @@ -125,7 +161,7 @@ command_about_callback (GtkAction *action, CommandApplet *command_applet) "title", _("About Command Applet"), "version", VERSION, "copyright", _("Copyright \xc2\xa9 2013-2014 Stefano Karapetsas\n" - "Copyright \xc2\xa9 2015-2020 MATE developers"), + "Copyright \xc2\xa9 2015-2021 MATE developers"), "authors", authors, "comments", _("Shows the output of a command"), "translator-credits", _("translator-credits"), @@ -205,40 +241,16 @@ command_settings_callback (GtkAction *action, CommandApplet *command_applet) "on_width_spinbutton_value_changed", G_CALLBACK (width_value_changed), NULL); gtk_builder_connect_signals (builder, command_applet); - g_signal_connect (dialog, "response", G_CALLBACK (gtk_widget_destroy), dialog); + + g_signal_connect (dialog, "response", + G_CALLBACK (gtk_widget_destroy), + dialog); g_object_unref (builder); gtk_widget_show_all (GTK_WIDGET (dialog)); } -/* GSettings signal callbacks */ -static void -settings_command_changed (GSettings *settings, gchar *key, CommandApplet *command_applet) -{ - GError *error = NULL; - gchar *cmdline; - gchar **argv; - - cmdline = g_settings_get_string (command_applet->settings, COMMAND_KEY); - if (strlen (cmdline) == 0 || g_strcmp0(command_applet->cmdline, cmdline) == 0) - return; - - if (!g_shell_parse_argv (cmdline, NULL, &argv, &error)) - { - gtk_label_set_text (command_applet->label, ERROR_OUTPUT); - g_clear_error (&error); - return; - } - g_strfreev(argv); - - if (command_applet->cmdline) - g_free (command_applet->cmdline); - command_applet->cmdline = cmdline; - - command_execute (command_applet); -} - static void settings_width_changed (GSettings *settings, gchar *key, CommandApplet *command_applet) { @@ -404,12 +416,15 @@ static gboolean 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); - mate_panel_applet_set_background_widget (applet, GTK_WIDGET (applet)); command_applet = g_malloc0(sizeof(CommandApplet)); command_applet->applet = applet; @@ -439,29 +454,37 @@ command_applet_fill (MatePanelApplet* applet) gtk_widget_show_all (GTK_WIDGET (command_applet->applet)); - g_signal_connect(G_OBJECT (command_applet->applet), "destroy", - G_CALLBACK (command_applet_destroy), - command_applet); + g_signal_connect (command_applet->applet, "destroy", + G_CALLBACK (command_applet_destroy), + command_applet); /* GSettings signals */ - g_signal_connect(command_applet->settings, - "changed::" COMMAND_KEY, - G_CALLBACK (settings_command_changed), - command_applet); - g_signal_connect(command_applet->settings, - "changed::" INTERVAL_KEY, - G_CALLBACK (settings_interval_changed), - command_applet); - g_signal_connect(command_applet->settings, - "changed::" WIDTH_KEY, - G_CALLBACK (settings_width_changed), - command_applet); + g_signal_connect (command_applet->settings, "changed::" COMMAND_KEY, + G_CALLBACK (settings_command_changed), + command_applet); + + g_signal_connect (command_applet->settings, "changed::" INTERVAL_KEY, + G_CALLBACK (settings_interval_changed), + command_applet); + + g_signal_connect (command_applet->settings, "changed::" WIDTH_KEY, + G_CALLBACK (settings_width_changed), + command_applet); + g_settings_bind (command_applet->settings, SHOW_ICON_KEY, command_applet->image, "visible", G_SETTINGS_BIND_DEFAULT); + atk_widget = gtk_widget_get_accessible (GTK_WIDGET (command_applet->applet)); + if (GTK_IS_ACCESSIBLE (atk_widget)) { + atk_object_set_name (atk_widget, + _("Command applet")); + atk_object_set_description (atk_widget, + _("Shows the output of a command")); + } + /* set up context menu */ GtkActionGroup *action_group = gtk_action_group_new ("Command Applet Actions"); gtk_action_group_set_translation_domain (action_group, GETTEXT_PACKAGE); @@ -487,8 +510,8 @@ command_factory (MatePanelApplet* applet, const char* iid, gpointer data) } /* needed by mate-panel applet library */ -MATE_PANEL_APPLET_OUT_PROCESS_FACTORY("CommandAppletFactory", - PANEL_TYPE_APPLET, - "Command applet", - command_factory, - NULL) +PANEL_APPLET_FACTORY ("CommandAppletFactory", + PANEL_TYPE_APPLET, + "Command applet", + command_factory, + NULL) |