diff options
author | Alan Fitton <ajf@eth0.org.uk> | 2012-01-25 21:29:22 +0000 |
---|---|---|
committer | Alan Fitton <ajf@eth0.org.uk> | 2012-01-25 21:29:22 +0000 |
commit | b8396f5447270cf04ef3279b6306833eea529091 (patch) | |
tree | 0b8f7ab6bbe701e1a6bdbd0d10ba5c6d9ddb1d67 /src | |
parent | f79c7ccd6af648e20b3fea5394cb61fb537a3249 (diff) |
changelog update and fix a small libappindicator bug
Diffstat (limited to 'src')
-rw-r--r-- | src/trg-main-window.c | 4 | ||||
-rw-r--r-- | src/trg-toolbar.c | 5 |
2 files changed, 1 insertions, 8 deletions
diff --git a/src/trg-main-window.c b/src/trg-main-window.c index 2ff5a21..672965e 100644 --- a/src/trg-main-window.c +++ b/src/trg-main-window.c @@ -1117,7 +1117,6 @@ connchange_whatever_statusicon(TrgMainWindow * win, gboolean connected) gchar *display = connected ? trg_prefs_get_string(prefs, TRG_PREFS_KEY_PROFILE_NAME, TRG_PREFS_CONNECTION) : g_strdup(_("Disconnected")); - GtkMenu *menu = trg_status_icon_view_menu(win, display); #ifdef HAVE_LIBAPPINDICATOR if (priv->appIndicator) { @@ -1125,11 +1124,10 @@ connchange_whatever_statusicon(TrgMainWindow * win, gboolean connected) app_indicator_set_menu(priv->appIndicator, menu); } #else - if (priv->iconMenu) gtk_widget_destroy(GTK_WIDGET(priv->iconMenu)); - priv->iconMenu = menu; + priv->iconMenu = trg_status_icon_view_menu(win, display); if (priv->statusIcon) gtk_status_icon_set_tooltip_text(priv->statusIcon, display); diff --git a/src/trg-toolbar.c b/src/trg-toolbar.c index 31b7ade..139f9db 100644 --- a/src/trg-toolbar.c +++ b/src/trg-toolbar.c @@ -52,12 +52,10 @@ struct _TrgToolbarPrivate { GtkWidget *tb_connect; GtkWidget *tb_disconnect; GtkWidget *tb_add; - /*GtkWidget *tb_add_url; */ GtkWidget *tb_remove; GtkWidget *tb_delete; GtkWidget *tb_resume; GtkWidget *tb_pause; - /*GtkWidget *tb_verify; */ GtkWidget *tb_props; GtkWidget *tb_remote_prefs; GtkWidget *tb_local_prefs; @@ -111,9 +109,6 @@ trg_toolbar_get_property(GObject * object, guint property_id, case PROP_PAUSE_BUTTON: g_value_set_object(value, priv->tb_pause); break; - /*case PROP_VERIFY_BUTTON: - g_value_set_object(value, priv->tb_verify); - break; */ case PROP_PROPS_BUTTON: g_value_set_object(value, priv->tb_props); break; |