deepend/zoitechat
1
0
Fork 0
mirror of https://github.com/ZoiteChat/zoitechat.git synced 2026-03-13 17:20:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'saslmech'

Browse Source
This commit is contained in:
TingPing
2013-09-07 19:00:40 -04:00
parent 5feeb717a0 bdb18828e3
commit bb1062ae2a
11 changed files with 389 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/fe-gtk/servlistgui.c
View File

@@ -120,10 +120,15 @@ static int login_types_conf[] =
{
LOGIN_DEFAULT, /* default entry - we don't use this but it makes indexing consistent with login_types[] so it's nice */
LOGIN_SASL,
#ifdef USE_OPENSSL
LOGIN_SASLEXTERNAL,
#endif
LOGIN_PASS,
LOGIN_MSG_NICKSERV,
LOGIN_NICKSERV,
#ifdef USE_OPENSSL
LOGIN_CHALLENGEAUTH,
#endif
LOGIN_CUSTOM
#if 0
LOGIN_NS,
@@ -136,10 +141,15 @@ static const char *login_types[]=
{
"Default",
"SASL (username + password)",
#ifdef USE_OPENSSL
"SASL EXTERNAL (cert)",
#endif
"Server Password (/PASS password)",
"NickServ (/MSG NickServ + password)",
"NickServ (/NICKSERV + password)",
#ifdef USE_OPENSSL
"Challenge Auth (username + password)",
#endif
"Custom... (connect commands)",
#if 0
"NickServ (/NS + password)",
@@ -1513,6 +1523,12 @@ servlist_logintypecombo_cb (GtkComboBox *cb, gpointer *userdata)
{
gtk_notebook_set_current_page (GTK_NOTEBOOK (userdata), 2); /* FIXME avoid hardcoding? */
}
/* EXTERNAL uses a cert, not a pass */
if (login_types_conf[index] == LOGIN_SASLEXTERNAL)
gtk_widget_set_sensitive (edit_entry_pass, FALSE);
else
gtk_widget_set_sensitive (edit_entry_pass, TRUE);
}
@@ -1816,6 +1832,8 @@ servlist_open_edit (GtkWidget *parent, ircnet *net)
edit_entry_pass = servlist_create_entry (table3, _("Password:"), 11, net->pass, 0, _("Password used for login. If in doubt, leave blank."));
gtk_entry_set_visibility (GTK_ENTRY (edit_entry_pass), FALSE);
if (selected_net && selected_net->logintype == LOGIN_SASLEXTERNAL)
gtk_widget_set_sensitive (edit_entry_pass, FALSE);
label34 = gtk_label_new (_("Character set:"));
gtk_table_attach (GTK_TABLE (table3), label34, 0, 1, 12, 13, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), SERVLIST_X_PADDING, SERVLIST_Y_PADDING);