From a6f05db34b538a03c05f6e29fbf41314bbd93f34 Mon Sep 17 00:00:00 2001 From: TingPing Date: Thu, 6 Jun 2013 16:12:59 -0400 Subject: Make autojoin a toggle menu --- src/fe-gtk/menu.c | 4 ++-- src/fe-gtk/servlistgui.c | 6 ------ 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/fe-gtk/menu.c b/src/fe-gtk/menu.c index 9819d7be..02bd3f1e 100644 --- a/src/fe-gtk/menu.c +++ b/src/fe-gtk/menu.c @@ -1049,11 +1049,11 @@ menu_addfavoritemenu (server *serv, GtkWidget *menu, char *channel) if (joinlist_is_in_list (serv, channel)) { - mg_create_icon_item (_("_Remove from Autojoin"), GTK_STOCK_REMOVE, menu, menu_delfav_cb, serv); + menu_toggle_item (_("_Autojoin"), menu, menu_delfav_cb, serv, TRUE); } else { - mg_create_icon_item (_("_Add to Autojoin"), GTK_STOCK_ADD, menu, menu_addfav_cb, serv); + menu_toggle_item (_("_Autojoin"), menu, menu_addfav_cb, serv, FALSE); } } diff --git a/src/fe-gtk/servlistgui.c b/src/fe-gtk/servlistgui.c index 566f4163..94cb209f 100644 --- a/src/fe-gtk/servlistgui.c +++ b/src/fe-gtk/servlistgui.c @@ -1061,24 +1061,18 @@ void servlist_autojoinedit (ircnet *net, char *channel, gboolean add) { favchannel *fav; - char *buf; if (add) { servlist_favchan_add (net, channel); servlist_save (); - buf = g_strdup_printf (_("Channel %s added to autojoin."), channel); } else { fav = servlist_favchan_find (net, channel, NULL); servlist_favchan_remove (net, fav); servlist_save (); - buf = g_strdup_printf (_("Channel %s removed from autojoin."), channel); } - - fe_message (buf, FE_MSG_INFO); - g_free (buf); } static void -- cgit 1.4.1