diff options
Diffstat (limited to 'libsylph')
| -rw-r--r-- | libsylph/prefs_account.c | 22 | ||||
| -rw-r--r-- | libsylph/prefs_account.h | 2 | ||||
| -rw-r--r-- | libsylph/session.c | 1 |
3 files changed, 13 insertions, 12 deletions
diff --git a/libsylph/prefs_account.c b/libsylph/prefs_account.c index 1eaa7231..8dd9a664 100644 --- a/libsylph/prefs_account.c +++ b/libsylph/prefs_account.c @@ -109,6 +109,17 @@ static PrefParam param[] = { {"ssl_smtp", "0", &tmp_ac_prefs.ssl_smtp, P_ENUM}, {"use_nonblocking_ssl", "1", &tmp_ac_prefs.use_nonblocking_ssl, P_BOOL}, + /* SOCKS proxy */ + {"use_socks", "FALSE", &tmp_ac_prefs.use_socks, P_BOOL}, + {"use_socks_for_recv", "TRUE", &tmp_ac_prefs.use_socks_for_recv, P_BOOL}, + {"use_socks_for_send", "TRUE", &tmp_ac_prefs.use_socks_for_send, P_BOOL}, + {"socks_type", "1", &tmp_ac_prefs.socks_type, P_ENUM}, + {"proxy_host", NULL, &tmp_ac_prefs.proxy_host, P_STRING}, + {"proxy_port", "1080", &tmp_ac_prefs.proxy_port, P_USHORT}, + {"use_proxy_auth", "FALSE", &tmp_ac_prefs.use_proxy_auth, P_BOOL}, + {"proxy_name", NULL, &tmp_ac_prefs.proxy_name, P_STRING}, + {"proxy_pass", NULL, &tmp_ac_prefs.proxy_pass, P_STRING}, + /* Advanced */ {"set_smtpport", "FALSE", &tmp_ac_prefs.set_smtpport, P_BOOL}, {"smtp_port", "25", &tmp_ac_prefs.smtpport, P_USHORT}, @@ -132,17 +143,6 @@ static PrefParam param[] = { {"set_trash_folder", "FALSE", &tmp_ac_prefs.set_trash_folder, P_BOOL}, {"trash_folder", NULL, &tmp_ac_prefs.trash_folder, P_STRING}, - /* SOCKS proxy */ - {"use_socks", "FALSE", &tmp_ac_prefs.use_socks, P_BOOL}, - {"use_socks_for_recv", "TRUE", &tmp_ac_prefs.use_socks_for_recv, P_BOOL}, - {"use_socks_for_send", "TRUE", &tmp_ac_prefs.use_socks_for_send, P_BOOL}, - {"socks_type", "1", &tmp_ac_prefs.socks_type, P_ENUM}, - {"proxy_host", NULL, &tmp_ac_prefs.proxy_host, P_STRING}, - {"proxy_port", "1080", &tmp_ac_prefs.proxy_port, P_USHORT}, - {"use_proxy_auth", "FALSE", &tmp_ac_prefs.use_proxy_auth, P_BOOL}, - {"proxy_name", NULL, &tmp_ac_prefs.proxy_name, P_STRING}, - {"proxy_pass", NULL, &tmp_ac_prefs.proxy_pass, P_STRING}, - {NULL, NULL, NULL, P_OTHER} }; diff --git a/libsylph/prefs_account.h b/libsylph/prefs_account.h index 53295801..df012c98 100644 --- a/libsylph/prefs_account.h +++ b/libsylph/prefs_account.h @@ -170,7 +170,7 @@ struct _PrefsAccount /* Compose */ gboolean sig_before_quote; - /* Advanced - SOCKS proxy */ + /* SOCKS proxy */ gboolean use_socks; gboolean use_socks_for_recv; gboolean use_socks_for_send; diff --git a/libsylph/session.c b/libsylph/session.c index f45138f0..0b52d87e 100644 --- a/libsylph/session.c +++ b/libsylph/session.c @@ -167,6 +167,7 @@ gint session_connect_full(Session *session, const gchar *server, gushort port, session->port = port; if (socks_info) { + g_return_val_if_fail(socks_info->proxy_host != NULL, -1); server = socks_info->proxy_host; port = socks_info->proxy_port; } |