moparisthebest
/
hexchat
mirror of https://github.com/moparisthebest/hexchat
1
0
Fork 0
Code Issues Releases Wiki Activity

More autojoin wording tweaks

This commit is contained in:
TingPing 2013-06-13 20:53:55 -04:00
parent 9b958ed393
commit 7ef8d0d443
4 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/fe-gtk/chanlist.c
View File

@ -629,7 +629,7 @@ chanlist_button_cb (GtkTreeView *tree, GdkEventButton *event, server *serv)
chanlist_copytopic, serv); chanlist_copytopic, serv);
chan = chanlist_get_selected (serv, FALSE); chan = chanlist_get_selected (serv, FALSE);
menu_addfavoritemenu (serv, menu, chan); menu_addfavoritemenu (serv, menu, chan, FALSE);
g_free (chan); g_free (chan);
gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL, 0, event->time); gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL, 0, event->time);

2
src/fe-gtk/maingui.c
View File

@ -1617,7 +1617,7 @@ mg_create_tabmenu (session *sess, GdkEventButton *event, chan *ch)
menu_quick_item (0, 0, menu, XCMENU_SHADED, 0, 0); menu_quick_item (0, 0, menu, XCMENU_SHADED, 0, 0);
if (sess->type == SESS_CHANNEL) if (sess->type == SESS_CHANNEL)
menu_addfavoritemenu (sess->server, menu, sess->channel); menu_addfavoritemenu (sess->server, menu, sess->channel, TRUE);
else if (sess->type == SESS_SERVER) else if (sess->type == SESS_SERVER)
menu_addconnectmenu (sess->server, menu); menu_addconnectmenu (sess->server, menu);
} }

15
src/fe-gtk/menu.c
View File

@ -1016,7 +1016,7 @@ menu_chanmenu (struct session *sess, GdkEventButton * event, char *chan)
str_copy); 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_add_plugin_items (menu, "\x5$CHAN", str_copy);
menu_popup (menu, event, NULL); menu_popup (menu, event, NULL);
@ -1035,8 +1035,10 @@ menu_addfav_cb (GtkWidget *item, server *serv)
} }
void void
menu_addfavoritemenu (server *serv, GtkWidget *menu, char *channel) menu_addfavoritemenu (server *serv, GtkWidget *menu, char *channel, gboolean istree)
{ {
char *str;
if (!serv->network) if (!serv->network)
return; return;
@ -1046,14 +1048,19 @@ menu_addfavoritemenu (server *serv, GtkWidget *menu, char *channel)
free (str_copy); free (str_copy);
str_copy = strdup (channel); str_copy = strdup (channel);
} }
if (istree)
str = _("_Autojoin");
else
str = _("Autojoin Channel");
if (joinlist_is_in_list (serv, channel)) if (joinlist_is_in_list (serv, channel))
{ {
menu_toggle_item (_("_Autojoin Channel"), menu, menu_delfav_cb, serv, TRUE); menu_toggle_item (str, menu, menu_delfav_cb, serv, TRUE);
} }
else else
{ {
menu_toggle_item (_("_Autojoin Channel"), menu, menu_addfav_cb, serv, FALSE); menu_toggle_item (str, menu, menu_addfav_cb, serv, FALSE);
} }
} }

2
src/fe-gtk/menu.h
View File

@ -23,7 +23,7 @@
GtkWidget *menu_create_main (void *accel_group, int bar, int away, int toplevel, GtkWidget **menu_widgets); GtkWidget *menu_create_main (void *accel_group, int bar, int away, int toplevel, GtkWidget **menu_widgets);
void menu_urlmenu (GdkEventButton * event, char *url); void menu_urlmenu (GdkEventButton * event, char *url);
void menu_chanmenu (session *sess, GdkEventButton * event, char *chan); void menu_chanmenu (session *sess, GdkEventButton * event, char *chan);
void menu_addfavoritemenu (server *serv, GtkWidget *menu, char *channel); void menu_addfavoritemenu (server *serv, GtkWidget *menu, char *channel, gboolean istree);
void menu_addconnectmenu (server *serv, GtkWidget *menu); void menu_addconnectmenu (server *serv, GtkWidget *menu);
void menu_nickmenu (session *sess, GdkEventButton * event, char *nick, int num_sel); void menu_nickmenu (session *sess, GdkEventButton * event, char *nick, int num_sel);
void menu_middlemenu (session *sess, GdkEventButton *event); void menu_middlemenu (session *sess, GdkEventButton *event);