diff options
Diffstat (limited to 'src/fe-gtk')
| -rw-r--r-- | src/fe-gtk/servlistgui.c | 12 | ||||
| -rw-r--r-- | src/fe-gtk/setup.c | 8 |
2 files changed, 14 insertions, 6 deletions
diff --git a/src/fe-gtk/servlistgui.c b/src/fe-gtk/servlistgui.c index fe8aa319..40faaecc 100644 --- a/src/fe-gtk/servlistgui.c +++ b/src/fe-gtk/servlistgui.c @@ -73,6 +73,7 @@ static GtkWidget *edit_entry_user; static GtkWidget *edit_entry_real; static GtkWidget *edit_entry_join; static GtkWidget *edit_entry_pass; +static GtkWidget *edit_entry_saslpass; static GtkWidget *edit_entry_cmd; static GtkWidget *edit_entry_nickserv; static GtkWidget *edit_label_nick; @@ -490,6 +491,7 @@ servlist_edit_update (ircnet *net) servlist_update_from_entry (&net->command, edit_entry_cmd); servlist_update_from_entry (&net->nickserv, edit_entry_nickserv); servlist_update_from_entry (&net->pass, edit_entry_pass); + servlist_update_from_entry (&net->saslpass, edit_entry_saslpass); } static void @@ -1500,9 +1502,15 @@ servlist_open_edit (GtkWidget *parent, ircnet *net) _("Password for the server, if in doubt, leave blank.")); gtk_entry_set_visibility (GTK_ENTRY (edit_entry_pass), FALSE); + edit_entry_saslpass = + servlist_create_entry (table3, _("SASL password:"), 19, + net->saslpass, 0, + _("Password for SASL authentication, if in doubt, leave blank.")); + gtk_entry_set_visibility (GTK_ENTRY (edit_entry_saslpass), FALSE); + label34 = gtk_label_new (_("Character set:")); gtk_widget_show (label34); - gtk_table_attach (GTK_TABLE (table3), label34, 1, 2, 19, 20, + gtk_table_attach (GTK_TABLE (table3), label34, 1, 2, 20, 21, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); gtk_misc_set_alignment (GTK_MISC (label34), 0, 0.5); @@ -1512,7 +1520,7 @@ servlist_open_edit (GtkWidget *parent, ircnet *net) gtk_entry_set_text (GTK_ENTRY (GTK_BIN (comboboxentry_charset)->child), net->encoding ? net->encoding : "System default"); ignore_changed = FALSE; gtk_widget_show (comboboxentry_charset); - gtk_table_attach (GTK_TABLE (table3), comboboxentry_charset, 2, 3, 19, 20, + gtk_table_attach (GTK_TABLE (table3), comboboxentry_charset, 2, 3, 20, 21, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (GTK_FILL), 0, 0); diff --git a/src/fe-gtk/setup.c b/src/fe-gtk/setup.c index a83e423a..15c8dcc0 100644 --- a/src/fe-gtk/setup.c +++ b/src/fe-gtk/setup.c @@ -168,10 +168,6 @@ static const setting appearance_settings[] = {ST_EFONT, N_("Font:"), P_OFFSETNL(hex_text_font), 0, 0, sizeof prefs.hex_text_font}, #endif - {ST_HEADER, N_("Title Bar"),0,0,0}, - {ST_TOGGLE, N_("Show channel modes"), P_OFFINTNL(hex_gui_win_modes),0,0,0}, - {ST_TOGGLR, N_("Show number of users"), P_OFFINTNL(hex_gui_win_ucount),0,0,0}, - {ST_HEADER, N_("Text Box"),0,0,0}, {ST_EFILE, N_("Background image:"), P_OFFSETNL(hex_text_background), 0, 0, sizeof prefs.hex_text_background}, {ST_TOGGLE, N_("Colored nick names"), P_OFFINTNL(hex_text_color_nicks), @@ -198,6 +194,10 @@ static const setting appearance_settings[] = N_("See the strftime manpage for details."),0,sizeof prefs.hex_stamp_text_format}, #endif + {ST_HEADER, N_("Title Bar"),0,0,0}, + {ST_TOGGLE, N_("Show channel modes"), P_OFFINTNL(hex_gui_win_modes),0,0,0}, + {ST_TOGGLR, N_("Show number of users"), P_OFFINTNL(hex_gui_win_ucount),0,0,0}, + {ST_END, 0, 0, 0, 0, 0} }; |