diff options
| author | Richard Hitt <rbh00@localhost.localdomain> | 2013-06-15 17:26:13 -0700 |
|---|---|---|
| committer | Richard Hitt <rbh00@localhost.localdomain> | 2013-06-15 17:26:13 -0700 |
| commit | 6a7557da0156b235b8bad58b255e16625a8ed47e (patch) | |
| tree | c75ffec369055f3037abdc32af8f79083e546624 /src/fe-gtk/menu.c | |
| parent | d7045e2b6121f7750565f7b9e906bd74fecb72d9 (diff) | |
| parent | e68635b8e4b0aee7d958c482abbadfc4321cf2b0 (diff) | |
Merge branch 'master' of http://github.com/hexchat/hexchat
Diffstat (limited to 'src/fe-gtk/menu.c')
| -rw-r--r-- | src/fe-gtk/menu.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/src/fe-gtk/menu.c b/src/fe-gtk/menu.c index 3bd50b1a..1948348a 100644 --- a/src/fe-gtk/menu.c +++ b/src/fe-gtk/menu.c @@ -1016,7 +1016,7 @@ menu_chanmenu (struct session *sess, GdkEventButton * event, char *chan) str_copy); } - menu_addfavoritemenu (sess->server, menu, str_copy); + menu_addfavoritemenu (sess->server, menu, str_copy, FALSE); menu_add_plugin_items (menu, "\x5$CHAN", str_copy); menu_popup (menu, event, NULL); @@ -1035,8 +1035,10 @@ menu_addfav_cb (GtkWidget *item, server *serv) } void -menu_addfavoritemenu (server *serv, GtkWidget *menu, char *channel) +menu_addfavoritemenu (server *serv, GtkWidget *menu, char *channel, gboolean istree) { + char *str; + if (!serv->network) return; @@ -1046,14 +1048,19 @@ menu_addfavoritemenu (server *serv, GtkWidget *menu, char *channel) free (str_copy); str_copy = strdup (channel); } + + if (istree) + str = _("_Autojoin"); + else + str = _("Autojoin Channel"); if (joinlist_is_in_list (serv, channel)) { - menu_toggle_item (_("_Autojoin"), menu, menu_delfav_cb, serv, TRUE); + menu_toggle_item (str, menu, menu_delfav_cb, serv, TRUE); } else { - menu_toggle_item (_("_Autojoin"), menu, menu_addfav_cb, serv, FALSE); + menu_toggle_item (str, menu, menu_addfav_cb, serv, FALSE); } } |