diff options
Diffstat (limited to 'netspeed/src/netspeed.c')
| -rw-r--r-- | netspeed/src/netspeed.c | 108 |
1 files changed, 59 insertions, 49 deletions
diff --git a/netspeed/src/netspeed.c b/netspeed/src/netspeed.c index 22e2331b..73185abd 100644 --- a/netspeed/src/netspeed.c +++ b/netspeed/src/netspeed.c @@ -1438,7 +1438,6 @@ update_tooltip (NetspeedApplet *netspeed) g_string_free (tooltip, TRUE); } - static gboolean netspeed_applet_enter_notify_event (GtkWidget *widget, GdkEventCrossing *event) @@ -1568,13 +1567,17 @@ netspeed_applet_factory (MatePanelApplet *applet, int i; GtkWidget *spacer, *spacer_box; GtkActionGroup *action_group; + AtkObject *atk_obj; char *tmp; if (strcmp (iid, "NetspeedApplet")) return FALSE; 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,62 +1683,61 @@ netspeed_applet_factory (MatePanelApplet *applet, netspeed->timeout_id = g_timeout_add (REFRESH_TIME, (GSourceFunc)timeout_function, netspeed); + g_signal_connect_object (applet, "change-size", + G_CALLBACK (applet_change_size_or_orient), + netspeed, 0); - g_signal_connect (applet, "change_size", - G_CALLBACK (applet_change_size_or_orient), - netspeed); - - g_signal_connect (netspeed->icon_theme, "changed", - G_CALLBACK (icon_theme_changed_cb), - netspeed); + g_signal_connect_object (netspeed->icon_theme, "changed", + G_CALLBACK (icon_theme_changed_cb), + netspeed, 0); - g_signal_connect (applet, "change_orient", - G_CALLBACK (applet_change_size_or_orient), - netspeed); + g_signal_connect_object (applet, "change-orient", + G_CALLBACK (applet_change_size_or_orient), + netspeed, 0); - g_signal_connect (netspeed->in_label, "size_allocate", - G_CALLBACK (label_size_allocate_cb), - netspeed); + g_signal_connect_object (netspeed->in_label, "size-allocate", + G_CALLBACK (label_size_allocate_cb), + netspeed, 0); - g_signal_connect (netspeed->out_label, "size_allocate", - G_CALLBACK (label_size_allocate_cb), - netspeed); + g_signal_connect_object (netspeed->out_label, "size-allocate", + G_CALLBACK (label_size_allocate_cb), + netspeed, 0); - g_signal_connect (netspeed->sum_label, "size_allocate", - G_CALLBACK (label_size_allocate_cb), - netspeed); + g_signal_connect_object (netspeed->sum_label, "size-allocate", + G_CALLBACK (label_size_allocate_cb), + netspeed, 0); - g_signal_connect (netspeed->settings, "changed::auto-change-device", - G_CALLBACK (auto_change_device_settings_changed), - netspeed); + g_signal_connect_object (netspeed->settings, "changed::auto-change-device", + G_CALLBACK (auto_change_device_settings_changed), + netspeed, 0); - g_signal_connect (netspeed->settings, "changed::device", - G_CALLBACK (device_settings_changed), - netspeed); + g_signal_connect_object (netspeed->settings, "changed::device", + G_CALLBACK (device_settings_changed), + netspeed, 0); - g_signal_connect (netspeed->settings, "changed::show-all-addresses", - G_CALLBACK (showalladdresses_settings_changed), - netspeed); + g_signal_connect_object (netspeed->settings, "changed::show-all-addresses", + G_CALLBACK (showalladdresses_settings_changed), + netspeed, 0); - g_signal_connect (netspeed->settings, "changed::show-sum", - G_CALLBACK (showsum_settings_changed), - netspeed); + g_signal_connect_object (netspeed->settings, "changed::show-sum", + G_CALLBACK (showsum_settings_changed), + netspeed, 0); - g_signal_connect (netspeed->settings, "changed::show-bits", - G_CALLBACK (showbits_settings_changed), - netspeed); + g_signal_connect_object (netspeed->settings, "changed::show-bits", + G_CALLBACK (showbits_settings_changed), + netspeed, 0); - g_signal_connect (netspeed->settings, "changed::change-icon", - G_CALLBACK (changeicon_settings_changed), - netspeed); + g_signal_connect_object (netspeed->settings, "changed::change-icon", + G_CALLBACK (changeicon_settings_changed), + netspeed, 0); - g_signal_connect (netspeed->settings, "changed::show-icon", - G_CALLBACK (showicon_settings_changed), - netspeed); + g_signal_connect_object (netspeed->settings, "changed::show-icon", + G_CALLBACK (showicon_settings_changed), + netspeed, 0); - g_signal_connect (netspeed->settings, "changed::show-quality-icon", - G_CALLBACK (showqualityicon_settings_changed), - netspeed); + g_signal_connect_object (netspeed->settings, "changed::show-quality-icon", + 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); @@ -1748,13 +1750,21 @@ netspeed_applet_factory (MatePanelApplet *applet, NETSPEED_RESOURCE_PATH "netspeed-menu.xml", action_group); + atk_obj = gtk_widget_get_accessible (GTK_WIDGET (applet)); + + if (GTK_IS_ACCESSIBLE (atk_obj)) { + atk_object_set_name (atk_obj, _("MATE Netspeed")); + atk_object_set_description (atk_obj, + _("A little applet that displays some information on the traffic on the specified network device")); + } + g_object_unref (action_group); return TRUE; } -MATE_PANEL_APPLET_OUT_PROCESS_FACTORY ("NetspeedAppletFactory", - NETSPEED_TYPE_APPLET, - "NetspeedApplet", - netspeed_applet_factory, - NULL) +PANEL_APPLET_FACTORY ("NetspeedAppletFactory", + NETSPEED_TYPE_APPLET, + "NetspeedApplet", + netspeed_applet_factory, + NULL) |