From 2def4a73864c87c4dee25b04180c882e72a0fee1 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Fri, 30 Sep 2011 14:09:02 +0200 Subject: Bug #601898 - SOCKS proxy does not work with mailer --- mail/e-mail-session.c | 126 +++++++++++++++++--------------------------------- mail/mail-config.ui | 67 +++++++++++++++++++++++++++ 2 files changed, 109 insertions(+), 84 deletions(-) (limited to 'mail') diff --git a/mail/e-mail-session.c b/mail/e-mail-session.c index d716357288..45c8e0209c 100644 --- a/mail/e-mail-session.c +++ b/mail/e-mail-session.c @@ -45,6 +45,7 @@ #endif #include +#include #include #include @@ -73,7 +74,6 @@ ((obj), E_TYPE_MAIL_SESSION, EMailSessionPrivate)) static guint session_check_junk_notify_id; -static guint session_gconf_proxy_id; typedef struct _AsyncContext AsyncContext; @@ -82,6 +82,7 @@ struct _EMailSessionPrivate { FILE *filter_logfile; GHashTable *junk_filters; + EProxy *proxy; }; struct _AsyncContext { @@ -440,73 +441,6 @@ ms_forward_to_cb (CamelFolder *folder, g_object_unref (client); } -/* Support for SOCKS proxy ***************************************************/ - -static GSettings *proxy_settings = NULL, *proxy_socks_settings = NULL; - -static void -set_socks_proxy_from_gsettings (CamelSession *session) -{ - gchar *mode, *host; - gint port; - - g_return_if_fail (proxy_settings != NULL); - g_return_if_fail (proxy_socks_settings != NULL); - - mode = g_settings_get_string (proxy_settings, "mode"); - if (g_strcmp0 (mode, "manual") == 0) { - host = g_settings_get_string (proxy_socks_settings, "host"); - port = g_settings_get_int (proxy_socks_settings, "port"); - camel_session_set_socks_proxy (session, host, port); - g_free (host); - } - g_free (mode); -} - -static void -proxy_gsettings_changed_cb (GSettings *settings, - const gchar *key, - CamelSession *session) -{ - set_socks_proxy_from_gsettings (session); -} - -static void -set_socks_proxy_gsettings_watch (CamelSession *session) -{ - g_return_if_fail (proxy_settings != NULL); - g_return_if_fail (proxy_socks_settings != NULL); - - g_signal_connect ( - proxy_settings, "changed::mode", - G_CALLBACK (proxy_gsettings_changed_cb), session); - - g_signal_connect ( - proxy_socks_settings, "changed", - G_CALLBACK (proxy_gsettings_changed_cb), session); -} - -static void -init_socks_proxy (CamelSession *session) -{ - g_return_if_fail (CAMEL_IS_SESSION (session)); - - if (!proxy_settings) { - proxy_settings = g_settings_new ("org.gnome.system.proxy"); - proxy_socks_settings = g_settings_get_child (proxy_settings, "socks"); - g_object_weak_ref (G_OBJECT (proxy_settings), (GWeakNotify) g_nullify_pointer, &proxy_settings); - g_object_weak_ref (G_OBJECT (proxy_socks_settings), (GWeakNotify) g_nullify_pointer, &proxy_socks_settings); - } else { - g_object_ref (proxy_settings); - g_object_ref (proxy_socks_settings); - } - - set_socks_proxy_gsettings_watch (session); - set_socks_proxy_from_gsettings (session); -} - -/*****************************************************************************/ - static void async_context_free (AsyncContext *context) { @@ -684,6 +618,7 @@ mail_session_finalize (GObject *object) priv = E_MAIL_SESSION_GET_PRIVATE (object); g_hash_table_destroy (priv->junk_filters); + g_object_unref (priv->proxy); client = gconf_client_get_default (); @@ -692,26 +627,11 @@ mail_session_finalize (GObject *object) session_check_junk_notify_id = 0; } - if (session_gconf_proxy_id != 0) { - gconf_client_notify_remove (client, session_gconf_proxy_id); - session_gconf_proxy_id = 0; - } - g_object_unref (client); g_free (mail_data_dir); g_free (mail_config_dir); - if (proxy_settings) { - g_signal_handlers_disconnect_by_func (proxy_settings, proxy_gsettings_changed_cb, CAMEL_SESSION (object)); - g_object_unref (proxy_settings); - } - - if (proxy_socks_settings) { - g_signal_handlers_disconnect_by_func (proxy_socks_settings, proxy_gsettings_changed_cb, CAMEL_SESSION (object)); - g_object_unref (proxy_socks_settings); - } - /* Chain up to parent's finalize() method. */ G_OBJECT_CLASS (e_mail_session_parent_class)->finalize (object); } @@ -1140,6 +1060,42 @@ mail_session_forward_to (CamelSession *session, return TRUE; } +static void +mail_session_get_socks_proxy (CamelSession *session, + const gchar *for_host, + gchar **host_ret, + gint *port_ret) +{ + EMailSession *mail_session; + gchar *uri; + + g_return_if_fail (session != NULL); + g_return_if_fail (for_host != NULL); + g_return_if_fail (host_ret != NULL); + g_return_if_fail (port_ret != NULL); + + mail_session = E_MAIL_SESSION (session); + g_return_if_fail (mail_session != NULL); + g_return_if_fail (mail_session->priv != NULL); + + *host_ret = NULL; + *port_ret = 0; + + uri = g_strconcat ("socks://", for_host, NULL); + + if (e_proxy_require_proxy_for_uri (mail_session->priv->proxy, uri)) { + SoupURI *suri; + + suri = e_proxy_peek_uri_for (mail_session->priv->proxy, uri); + if (suri) { + *host_ret = g_strdup (suri->host); + *port_ret = suri->port; + } + } + + g_free (uri); +} + static void e_mail_session_class_init (EMailSessionClass *class) { @@ -1164,6 +1120,7 @@ e_mail_session_class_init (EMailSessionClass *class) session_class->get_filter_driver = mail_session_get_filter_driver; session_class->lookup_addressbook = mail_session_lookup_addressbook; session_class->forward_to = mail_session_forward_to; + session_class->get_socks_proxy = mail_session_get_socks_proxy; g_object_class_install_property ( object_class, @@ -1200,6 +1157,7 @@ e_mail_session_init (EMailSession *session) session->priv->folder_cache = mail_folder_cache_new (); session->priv->junk_filters = g_hash_table_new ( (GHashFunc) g_str_hash, (GEqualFunc) g_str_equal); + session->priv->proxy = e_proxy_new (); /* Initialize the EAccount setup. */ e_account_writable (NULL, E_ACCOUNT_SOURCE_SAVE_PASSWD); @@ -1219,7 +1177,7 @@ e_mail_session_init (EMailSession *session) mail_config_reload_junk_headers (session); - init_socks_proxy (CAMEL_SESSION (session)); + e_proxy_setup_proxy (session->priv->proxy); g_object_unref (client); } diff --git a/mail/mail-config.ui b/mail/mail-config.ui index 5d934aafa2..7567d18603 100644 --- a/mail/mail-config.ui +++ b/mail/mail-config.ui @@ -409,6 +409,11 @@ for display purposes only. 1 10 + + 65535 + 1 + 10 + True True @@ -1504,6 +1509,22 @@ for display purposes only. + + + True + False + 0 + SOC_KS Proxy: + True + txtSocksHost + + + 2 + 3 + GTK_FILL + + + True @@ -1546,6 +1567,20 @@ for display purposes only. + + + True + True + ● + + + 1 + 2 + 2 + 3 + + + True @@ -1576,6 +1611,22 @@ for display purposes only. + + + True + False + 0 + Port: + + + 2 + 3 + 2 + 3 + GTK_FILL + + + True @@ -1606,6 +1657,22 @@ for display purposes only. + + + True + True + ● + adjustment6 + 1 + + + 3 + 4 + 2 + 3 + + + True -- cgit v1.2.3