rpms/gtk2/devel gtk+-2.10.4-deadlock.patch, NONE, 1.1 gtk2.spec, 1.187, 1.188

[fedora-cvs-commits at redhat.com]

Author: mclasen

Update of /cvs/dist/rpms/gtk2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15507

Modified Files:
	gtk2.spec 
Added Files:
	gtk+-2.10.4-deadlock.patch 
Log Message:
fix a possible deadlock


gtk+-2.10.4-deadlock.patch:
 gtkfilesystemunix.c |   17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 deletions(-)

--- NEW FILE gtk+-2.10.4-deadlock.patch ---
--- gtk+-2.10.4/gtk/gtkfilesystemunix.c.deadlock	2006-09-29 10:22:32.000000000 -0400
+++ gtk+-2.10.4/gtk/gtkfilesystemunix.c	2006-09-29 10:22:42.000000000 -0400
@@ -255,6 +255,7 @@
 						   const char *mime_type);
 
 static gboolean execute_callbacks_idle (gpointer data);
+static void execute_callbacks (gpointer data);
 
 static gboolean fill_in_names     (GtkFileFolderUnix  *folder_unix,
 				   GError            **error);
@@ -443,7 +444,7 @@
       system_unix->execute_callbacks_idle_id = 0;
 
       /* call pending callbacks */
-      execute_callbacks_idle (system_unix);
+      execute_callbacks (system_unix);
     }
 
   G_OBJECT_CLASS (gtk_file_system_unix_parent_class)->dispose (object);
@@ -699,15 +700,13 @@
 
 
 
-static gboolean
-execute_callbacks_idle (gpointer data)
+static void
+execute_callbacks (gpointer data)
 {
   GSList *l;
   gboolean unref_file_system = TRUE;
   GtkFileSystemUnix *system_unix = GTK_FILE_SYSTEM_UNIX (data);
 
-  GDK_THREADS_ENTER ();
-
   if (!system_unix->execute_callbacks_idle_id)
     unref_file_system = FALSE;
   else
@@ -746,6 +745,14 @@
     g_object_unref (system_unix);
 
   system_unix->execute_callbacks_idle_id = 0;
+}
+
+static gboolean
+execute_callbacks_idle (gpointer data)
+{
+  GDK_THREADS_ENTER ();
+
+  execute_callbacks(data);
 
   GDK_THREADS_LEAVE ();
 


Index: gtk2.spec
===================================================================
RCS file: /cvs/dist/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.187
retrieving revision 1.188
diff -u -r1.187 -r1.188
--- gtk2.spec	23 Sep 2006 21:44:40 -0000	1.187
+++ gtk2.spec	29 Sep 2006 14:24:49 -0000	1.188
@@ -16,7 +16,7 @@
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPL
 Group: System Environment/Libraries
 Source: gtk+-%{version}.tar.bz2
@@ -34,6 +34,9 @@
 # backport from HEAD
 Patch7: gtk+-2.10.2-cursor-blink.patch
 
+# fixed in upstream cvs
+PAtch8: gtk+-2.10.4-deadlock.patch
+
 BuildPrereq: atk-devel >= %{atk_version}
 BuildPrereq: pango-devel >= %{pango_version}
 BuildPrereq: glib2-devel >= %{glib2_version}
@@ -120,6 +123,8 @@
 
 %patch7 -p0 -b .cursor-blink
 
+%patch8 -p1 -b .deadlock
+
 for i in config.guess config.sub ; do
 	test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i .
 done
@@ -292,6 +297,10 @@
 %doc tmpdocs/examples
 
 %changelog
+* Fri Sep 29 2006 Matthias Clasen <mclasen at redhat.com> - 2.10.4-3
+- Fix a possible deadlock when not using the gnome-vfs
+  filesystem backend
+
 * Sat Sep 23 2006 Matthias Clasen <mclasen at redhat.com> - 2.10.4-2
 - Fix a problem with the search patch