diff options
| -rw-r--r-- | src/common/cfgfiles.c | 2 | ||||
| -rw-r--r-- | src/common/hexchat.h | 1 | ||||
| -rw-r--r-- | src/fe-gtk/maingui.c | 12 | ||||
| -rw-r--r-- | src/fe-gtk/setup.c | 3 |
4 files changed, 0 insertions, 18 deletions
diff --git a/src/common/cfgfiles.c b/src/common/cfgfiles.c index 675a4140..62107a31 100644 --- a/src/common/cfgfiles.c +++ b/src/common/cfgfiles.c @@ -459,7 +459,6 @@ const struct prefs vars[] = {"gui_ulist_hide", P_OFFINT (hex_gui_ulist_hide), TYPE_BOOL}, {"gui_ulist_icons", P_OFFINT (hex_gui_ulist_icons), TYPE_BOOL}, {"gui_ulist_pos", P_OFFINT (hex_gui_ulist_pos), TYPE_INT}, - {"gui_ulist_resizable", P_OFFINT (hex_gui_ulist_resizable), TYPE_BOOL}, {"gui_ulist_show_hosts", P_OFFINT(hex_gui_ulist_show_hosts), TYPE_BOOL}, {"gui_ulist_sort", P_OFFINT (hex_gui_ulist_sort), TYPE_INT}, {"gui_ulist_style", P_OFFINT (hex_gui_ulist_style), TYPE_BOOL}, @@ -771,7 +770,6 @@ load_default_config(void) prefs.hex_gui_tray_blink = 1; prefs.hex_gui_ulist_count = 1; prefs.hex_gui_ulist_icons = 1; - prefs.hex_gui_ulist_resizable = 1; prefs.hex_gui_ulist_style = 1; prefs.hex_gui_win_save = 1; prefs.hex_input_flash_hilight = 1; diff --git a/src/common/hexchat.h b/src/common/hexchat.h index ec055939..2bdfb656 100644 --- a/src/common/hexchat.h +++ b/src/common/hexchat.h @@ -146,7 +146,6 @@ struct hexchatprefs unsigned int hex_gui_ulist_count; unsigned int hex_gui_ulist_hide; unsigned int hex_gui_ulist_icons; - unsigned int hex_gui_ulist_resizable; unsigned int hex_gui_ulist_show_hosts; unsigned int hex_gui_ulist_style; unsigned int hex_gui_usermenu; diff --git a/src/fe-gtk/maingui.c b/src/fe-gtk/maingui.c index 9a406703..ab4a8156 100644 --- a/src/fe-gtk/maingui.c +++ b/src/fe-gtk/maingui.c @@ -805,14 +805,6 @@ mg_decide_userlist (session *sess, gboolean switch_to_current) } } -static void -mg_userlist_toggle_cb (GtkWidget *button, gpointer userdata) -{ - prefs.hex_gui_ulist_hide = !prefs.hex_gui_ulist_hide; - mg_decide_userlist (current_sess, FALSE); - gtk_widget_grab_focus (current_sess->gui->input_box); -} - static int ul_tag = 0; static gboolean @@ -2189,10 +2181,6 @@ mg_create_topicbar (session *sess, GtkWidget *box) gui->dialogbutton_box = bbox = gtk_hbox_new (FALSE, 0); gtk_box_pack_start (GTK_BOX (hbox), bbox, 0, 0, 0); mg_create_dialogbuttons (bbox); - - if (!prefs.hex_gui_ulist_resizable) - gtkutil_button (hbox, GTK_STOCK_GOTO_LAST, _("Show/Hide userlist"), - mg_userlist_toggle_cb, 0, 0); } /* check if a word is clickable */ diff --git a/src/fe-gtk/setup.c b/src/fe-gtk/setup.c index 28117ded..265c979c 100644 --- a/src/fe-gtk/setup.c +++ b/src/fe-gtk/setup.c @@ -257,7 +257,6 @@ static const setting userlist_settings[] = {ST_TOGGLE, N_("Show icons for user modes"), P_OFFINTNL(hex_gui_ulist_icons), N_("Use graphical icons instead of text symbols in the user list."), 0, 0}, {ST_TOGGLE, N_("Color nicknames in userlist"), P_OFFINTNL(hex_gui_ulist_color), N_("Will color nicknames the same as in chat."), 0, 0}, {ST_TOGGLE, N_("Show user count in channels"), P_OFFINTNL(hex_gui_ulist_count), 0, 0, 0}, -/* {ST_TOGGLE, N_("Resizable user list"), P_OFFINTNL(hex_gui_ulist_resizable),0,0,0},*/ {ST_MENU, N_("User list sorted by:"), P_OFFINTNL(hex_gui_ulist_sort), 0, ulmenutext, 0}, {ST_MENU, N_("Show user list at:"), P_OFFINTNL(hex_gui_ulist_pos), 0, ulpos, 1}, @@ -2188,8 +2187,6 @@ setup_apply (struct hexchatprefs *pr) noapply = TRUE; if (DIFF (hex_gui_ulist_icons)) noapply = TRUE; - if (DIFF (hex_gui_ulist_resizable)) - noapply = TRUE; if (DIFF (hex_gui_ulist_show_hosts)) noapply = TRUE; if (DIFF (hex_gui_ulist_style)) |