[maemo-commits] [maemo-commits] r13013 - in projects/haf/trunk/osso-gnome-vfs2/debian: . patches

[From: subversion at stage.maemo.org]

Author: martyn
Date: 2007-08-03 18:37:33 +0300 (Fri, 03 Aug 2007)
New Revision: 13013

Added:
   projects/haf/trunk/osso-gnome-vfs2/debian/patches/35-NB63225-gconf-race-condition.patch
Modified:
   projects/haf/trunk/osso-gnome-vfs2/debian/changelog
Log:
Fixes: NB#63225, File manager crashes on opening


Modified: projects/haf/trunk/osso-gnome-vfs2/debian/changelog
===================================================================
--- projects/haf/trunk/osso-gnome-vfs2/debian/changelog	2007-08-03 15:13:00 UTC (rev 13012)
+++ projects/haf/trunk/osso-gnome-vfs2/debian/changelog	2007-08-03 15:37:33 UTC (rev 13013)
@@ -1,3 +1,9 @@
+osso-gnome-vfs2 (2.16.3-1osso24) unstable; urgency=low
+
+  * Fixes: NB#63225, File manager crashes on opening
+	
+ -- Martyn Russell <martyn at imendio.com>  Fri,  3 Aug 2007 16:45:00 +0100
+
 osso-gnome-vfs2 (2.16.3-1osso23) unstable; urgency=low
 
   * Fixes: NB#62068, GnomeVFS gives wrong device names for GnomeVFS drives

Added: projects/haf/trunk/osso-gnome-vfs2/debian/patches/35-NB63225-gconf-race-condition.patch
===================================================================
--- projects/haf/trunk/osso-gnome-vfs2/debian/patches/35-NB63225-gconf-race-condition.patch	2007-08-03 15:13:00 UTC (rev 13012)
+++ projects/haf/trunk/osso-gnome-vfs2/debian/patches/35-NB63225-gconf-race-condition.patch	2007-08-03 15:37:33 UTC (rev 13013)
@@ -0,0 +1,35 @@
+--- ../orig/osso-gnome-vfs-2.16.3/modules/http-proxy.c	2007-01-09 11:32:55.000000000 +0000
++++ modules/http-proxy.c	2007-08-03 16:26:13.000000000 +0100
+@@ -524,7 +524,8 @@ notify_gconf_value_changed(GConfClient *
+     }
+ }
+ 
+-void proxy_init(void)
++static gboolean 
++proxy_init_cb (gpointer user_data)
+ {
+     GError *gconf_error = NULL;
+     gboolean use_proxy;
+@@ -578,6 +579,22 @@ void proxy_init(void)
+     } else {
+ 	set_proxy_auth(use_proxy_auth);
+     }
++
++    return FALSE;
++}
++
++void proxy_init(void)
++{
++    /* This fixes NB#63225:
++     *
++     * This is a work around to a race condition caused by the GConf
++     * API being used in a thread, which shouldn't happen since GConf
++     * isn't thread safe. We use g_idle_add() here to do the GConf
++     * calls from the main thread. Note, this is fine where we have a
++     * main loop, but in cases where we don't have a main loop this
++     * work arround is not effective. 
++     */
++    g_idle_add (proxy_init_cb, NULL);
+ }
+ 
+