[meego-commits] 5129: Changes to MeeGo:1.0:Netbook:Update:Testing/evolution

[Michael Meeks]

Hi,
I have made the following changes to evolution in project MeeGo:1.0:Netbook:Update:Testing. Please review and accept ASAP.

Thank You,
Michael Meeks

[This message was auto-generated]

---

Request #5129:

  submit:   home:mmeeks:branches:MeeGo:1.0:Netbook:Update:Testing/evolution(r3)(cleanup) -> MeeGo:1.0:Netbook:Update:Testing/evolution


Message:
    fix bmo#182 - requires corresponding e-d-s submission to function

State:   new          2010-06-30T09:58:22 mmeeks
Comment: None



changes files:
--------------
--- evolution.changes
+++ evolution.changes
@@ -0,0 +1,4 @@
+* Tue Jun 29 2010 Michael Meeks <michael.meeks at novell.com> 2.30.0~20100423
+- bmc#182 - add SOCKS proxy support patches from Federico 
+- bmc#1510 - fix the other half of the NSS issues.
+

new:
----
  evolution-camel-socks-proxy-bmo-182.patch

spec files:
-----------
--- evolution.spec
+++ evolution.spec
@@ -79,9 +79,10 @@
 Patch30: evolution-calendar-meeting-bug-1901.patch
 Patch31: evolution-capplet-l10n-bug-1104.patch
 Patch32: evolution-create-folder-transience-bug-2393.patch
-# Patch33: evolution-system-nssdb-bug-1510.patch
+Patch33: evolution-system-nssdb-bug-1510.patch
 Patch34: evolution-composer-transience-bug-1704.patch
 Patch35: evolution-allow-edit-accounts-bug-3286.patch
+Patch36: evolution-camel-socks-proxy-bmo-182.patch
 
 ## Dependencies ###
 
@@ -221,9 +222,10 @@
 %patch30 -p1 -b .evolution-calendar-meeting-bug-1901
 %patch31 -p1 -b .evolution-capplet-l10n-bug-1104
 %patch32 -p1 -b .evolution-create-folder-transience-bug-2393
-# %patch33 -p1 -b .evolution-system-nssdb-bug-1510
+%patch33 -p1 -b .evolution-system-nssdb-bug-1510
 %patch34 -p1 -b .evolution-composer-transience-bug-1704
 %patch35 -p1 -b .evolution-allow-edit-accounts-bug-3286
+%patch36 -p1 -b .evolution-camel-socks-proxy-bmo-182
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib

other changes:
--------------

++++++ evolution-camel-socks-proxy-bmo-182.patch (new)
--- evolution-camel-socks-proxy-bmo-182.patch
+++ evolution-camel-socks-proxy-bmo-182.patch
+From a689d71bd0c21d289e0979c4ada5cf039031ba10 Mon Sep 17 00:00:00 2001
+From: Federico Mena Quintero <federico at novell.com>
+Date: Mon, 31 May 2010 18:12:21 -0500
+Subject: [PATCH] Hook up GNOME's configured SOCKS4 proxy in the mail session
+
+This requires the version of libcamel which has
+camel_session_set_socks_proxy().
+
+Signed-off-by: Federico Mena Quintero <federico at novell.com>
+---
+ mail/mail-session.c |   70 ++++++++++++++++++++++++++++++++++++++++++++++++--
+ 1 files changed, 67 insertions(+), 3 deletions(-)
+
+diff --git a/mail/mail-session.c b/mail/mail-session.c
+index 86f6fa1..a06c360 100644
+--- a/mail/mail-session.c
++++ b/mail/mail-session.c
+@@ -65,7 +65,8 @@
+ #define d(x)
+ 
+ CamelSession *session;
+-static gint session_check_junk_notify_id = -1;
++static guint session_check_junk_notify_id;
++static guint session_gconf_proxy_id;
+ 
+ #define MAIL_SESSION_TYPE     (mail_session_get_type ())
+ #define MAIL_SESSION(obj)     (CAMEL_CHECK_CAST((obj), MAIL_SESSION_TYPE, MailSession))
+@@ -112,8 +113,19 @@ init (MailSession *session)
+ static void
+ finalise (MailSession *session)
+ {
+-	if (session_check_junk_notify_id != -1)
+-		gconf_client_notify_remove (mail_config_get_gconf_client (), session_check_junk_notify_id);
++	GConfClient *client;
++
++	client = mail_config_get_gconf_client ();
++
++	if (session_check_junk_notify_id != 0) {
++		gconf_client_notify_remove (client, session_check_junk_notify_id);
++		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;
++	}
+ 
+ 	mail_async_event_destroy(session->async);
+ 
+@@ -793,6 +805,56 @@ mail_session_check_junk_notify (GConfClient *gconf, guint id, GConfEntry *entry,
+ 	}
+ }
+ 
++#define DIR_PROXY "/system/proxy"
++#define KEY_SOCKS_HOST "/system/proxy/socks_host"
++#define KEY_SOCKS_PORT "/system/proxy/socks_port"
++
++static void
++set_socks_proxy_from_gconf (void)
++{
++	GConfClient *client;
++	gchar *host;
++	gint port;
++
++	client = mail_config_get_gconf_client ();
++
++	host = gconf_client_get_string (client, KEY_SOCKS_HOST, NULL); /* NULL-GError */
++	port = gconf_client_get_int (client, KEY_SOCKS_PORT, NULL); /* NULL-GError */
++	camel_session_set_socks_proxy (session, host, port);
++
++	g_free (host);
++}
++
++static void
++proxy_gconf_notify_cb (GConfClient* client, guint cnxn_id, GConfEntry *entry, gpointer user_data)
++{
++	const gchar *key;
++
++	key = gconf_entry_get_key (entry);
++
++	if (strcmp (entry->key, KEY_SOCKS_HOST) == 0
++	    || strcmp (entry->key, KEY_SOCKS_PORT) == 0)
++		set_socks_proxy_from_gconf ();
++}
++
++static void
++set_socks_proxy_gconf_watch (void)
++{
++	GConfClient *client;
++
++	client = mail_config_get_gconf_client ();
++
++	gconf_client_add_dir (client, DIR_PROXY, GCONF_CLIENT_PRELOAD_ONELEVEL, NULL); /* NULL-GError */
++	session_gconf_proxy_id = gconf_client_notify_add (client, DIR_PROXY, proxy_gconf_notify_cb, NULL, NULL, NULL); /* NULL-GError */
++}
++
++static void
++init_socks_proxy (void)
++{
++	set_socks_proxy_gconf_watch ();
++	set_socks_proxy_from_gconf ();
++}
++
+ void
+ mail_session_init (void)
+ {
+@@ -817,6 +879,8 @@ mail_session_init (void)
+ 	session->junk_plugin = NULL;
+ 
+ 	mail_config_reload_junk_headers ();
++
++	init_socks_proxy ();
+ }
+ 
+ void
+-- 
+1.6.4.2
+