commit gtk2

28 May 2006

Hello community,

here is the log from the commit of package gtk2
checked in at Mon May 29 01:08:38 CEST 2006.

--------

--- GNOME/gtk2/gtk2.changes	2006-05-24 02:16:07.000000000 +0200
+++ gtk2/gtk2.changes	2006-05-28 04:34:24.000000000 +0200
@@ -1,0 +2,7 @@
+Sun May 28 04:33:03 CEST 2006 - joeshaw@suse.de
+
+- Add gtk2-filechooserbutton-signal-disconnect-fix.patch to fix
+  a crash when a GtkFileChooserButton is destroyed but not
+  finalized and bookmarks or volumes change.  (bnc #178122)
+
+-------------------------------------------------------------------

New:
----
  gtk2-filechooserbutton-signal-disconnect-fix.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ gtk2.spec ++++++
--- /var/tmp/diff_new_pack.HWGS1v/_old	2006-05-29 01:08:21.000000000 +0200
+++ /var/tmp/diff_new_pack.HWGS1v/_new	2006-05-29 01:08:21.000000000 +0200
@@ -22,7 +22,7 @@
 Requires:       gnome-filesystem
 PreReq:         /usr/bin/touch /bin/rm /bin/rmdir
 Version:        2.8.10
-Release:        41
+Release:        43
 Summary:        Library for Creation of Graphical User Interfaces
 Source:         ftp://ftp.gnome.org/pub/GNOME/sources/gtk+/2.8/gtk+-%{version}.tar.bz2
 Source1:        SuSEconfig.gtk2
@@ -51,6 +51,7 @@
 Patch31:        gtk+-2.8.6-fontsel-fix.patch
 Patch32:        gtk2-set-invisible-char-to-circle.patch
 Patch33:        gtk+-context-translation.patch
+Patch34:        gtk2-filechooserbutton-signal-disconnect-fix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Requires:       cairo >= 0.9.2
 
@@ -196,6 +197,7 @@
 %patch31
 %patch32 -p1
 %patch33
+%patch34
 gnome-patch-translation-update
 
 %build
@@ -369,6 +371,10 @@
 %{prefix}/share/gtk-doc/html/*
 
 %changelog -n gtk2
+* Sun May 28 2006 - joeshaw@suse.de
+- Add gtk2-filechooserbutton-signal-disconnect-fix.patch to fix
+  a crash when a GtkFileChooserButton is destroyed but not
+  finalized and bookmarks or volumes change.  (bnc #178122)
 * Wed May 24 2006 - federico@novell.com
 - Updated gtk+-2.8.6-fontsel-fix.patch to fix bug
   https://bugzilla.novell.com/show_bug.cgi?id=177997.  The previous



++++++ gtk2-filechooserbutton-signal-disconnect-fix.patch ++++++
--- gtk/gtkfilechooserbutton.c
+++ gtk/gtkfilechooserbutton.c
@@ -854,8 +854,18 @@
   g_object_unref (priv->model);
   g_object_unref (priv->filter_model);
 
-  g_signal_handler_disconnect (priv->fs, priv->fs_volumes_changed_id);
-  g_signal_handler_disconnect (priv->fs, priv->fs_bookmarks_changed_id);
+  if (priv->fs_volumes_changed_id != 0)
+    {
+      g_signal_handler_disconnect (priv->fs, priv->fs_volumes_changed_id);
+      priv->fs_volumes_changed_id = 0;
+    }
+
+  if (priv->fs_volumes_changed_id != 0)
+    {
+      g_signal_handler_disconnect (priv->fs, priv->fs_bookmarks_changed_id);
+      priv->fs_bookmarks_changed_id = 0;
+    }
+
   g_object_unref (priv->fs);
 
   if (G_OBJECT_CLASS (gtk_file_chooser_button_parent_class)->finalize != NULL)
@@ -876,6 +886,18 @@
   if (priv->dialog != NULL)
     gtk_widget_destroy (priv->dialog);
 
+  if (priv->fs_volumes_changed_id != 0)
+    {
+      g_signal_handler_disconnect (priv->fs, priv->fs_volumes_changed_id);
+      priv->fs_volumes_changed_id = 0;
+    }
+
+  if (priv->fs_volumes_changed_id != 0)
+    {
+      g_signal_handler_disconnect (priv->fs, priv->fs_bookmarks_changed_id);
+      priv->fs_bookmarks_changed_id = 0;
+    }
+ 
   if (GTK_OBJECT_CLASS (gtk_file_chooser_button_parent_class)->destroy != NULL)
     (*GTK_OBJECT_CLASS (gtk_file_chooser_button_parent_class)->destroy) (object);
 }


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

    

root＠suse.de

tags

participants (1)