summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Alan Fitton <ajf@eth0.org.uk>2011-10-08 18:06:19 +0000
committerGravatar Alan Fitton <ajf@eth0.org.uk>2011-10-08 18:06:19 +0000
commit8a6c010f7269632c8a09ffc25fa894bc0396d42d (patch)
treec75d265fb8f42ecfc3ea1337baf46c1e3d39cfb1
parentf930813dd818ddbd88374f89394d68d485b4d1e7 (diff)
use new profiles menu in status icon
-rw-r--r--src/trg-main-window.c15
1 files changed, 10 insertions, 5 deletions
diff --git a/src/trg-main-window.c b/src/trg-main-window.c
index 02c811c..21358f1 100644
--- a/src/trg-main-window.c
+++ b/src/trg-main-window.c
@@ -1622,15 +1622,20 @@ static void trg_torrent_tv_view_menu(GtkWidget * treeview,
static void trg_status_icon_view_menu(GtkStatusIcon * icon G_GNUC_UNUSED,
GdkEventButton * event, gpointer data) {
TrgMainWindowPrivate *priv = TRG_MAIN_WINDOW_GET_PRIVATE(data);
+ TrgPrefs *prefs = trg_client_get_prefs(priv->client);
gboolean connected = trg_client_is_connected(priv->client);
- GtkWidget *menu;
+ GtkWidget *menu, *connect;
menu = gtk_menu_new();
- if (!connected) {
- trg_imagemenuitem_new(GTK_MENU_SHELL(menu), _("Connect"),
- GTK_STOCK_CONNECT, !connected, G_CALLBACK(connect_cb), data);
- } else {
+ connect = gtk_image_menu_item_new_with_label(GTK_STOCK_CONNECT);
+ gtk_image_menu_item_set_use_stock(GTK_IMAGE_MENU_ITEM(connect), TRUE);
+ gtk_image_menu_item_set_always_show_image(GTK_IMAGE_MENU_ITEM(connect), TRUE);
+ gtk_menu_item_set_label(GTK_MENU_ITEM(connect), _("Connect"));
+ gtk_menu_item_set_submenu(GTK_MENU_ITEM(connect), trg_menu_bar_file_connect_menu_new(TRG_MAIN_WINDOW(data), prefs));
+ gtk_menu_shell_append(GTK_MENU_SHELL(menu), connect);
+
+ if (connected) {
trg_imagemenuitem_new(GTK_MENU_SHELL(menu), _("Disconnect"),
GTK_STOCK_DISCONNECT, connected, G_CALLBACK(disconnect_cb),
data);