# HG changeset patch
# User gheet
# Date 1087471699 0
# Node ID 220a72f4553ea6e89056aa7a8ebdecc9c62cfcea
# Parent  ef81b20b1e77db942025c50d1ddf6f14c0516ab8
2004-06-17  Ghee Teo <ghee.teo@sun.com>

        * Added libgnomeui-03-mount-crashed-gedit.diff. The patch is taken from
          HEAD (also included in 2.6.1.1 tarball release). bugzilla id#139063.
          Bugtraq id 5055273. Since we are at Beta, so have to keep this patch
          for the time being and uprev after Beta, this patch can then be
          removed.

diff -r ef81b20b1e77 -r 220a72f4553e ChangeLog
--- a/ChangeLog	Wed Jun 16 16:05:04 2004 +0000
+++ b/ChangeLog	Thu Jun 17 11:28:19 2004 +0000
@@ -1,3 +1,11 @@
+2004-06-17  Ghee Teo <ghee.teo@sun.com>
+
+	* Added libgnomeui-03-mount-crashed-gedit.diff. The patch is taken from
+  	  HEAD (also included in 2.6.1.1 tarball release). bugzilla id#139063.
+  	  Bugtraq id 5055273. Since we are at Beta, so have to keep this patch
+  	  for the time being and uprev after Beta, this patch can then be 
+	  removed.
+
 2004-06-16  Damien Carbery <damien.carbery@sun.com>
 
 	* oxygen2.spec: Remove upstream applied patch.
diff -r ef81b20b1e77 -r 220a72f4553e libgnomeui.spec
--- a/libgnomeui.spec	Wed Jun 16 16:05:04 2004 +0000
+++ b/libgnomeui.spec	Thu Jun 17 11:28:19 2004 +0000
@@ -2,7 +2,7 @@
 License:      LGPL
 Group:        System/Libraries/GNOME
 Version:      2.6.0
-Release:      15
+Release:      16
 Distribution: Cinnabar
 Vendor:	      Sun Microsystems, Inc.
 Summary:      GNOME User Interface Library  
@@ -11,6 +11,7 @@
 Source2:      libgnomeui-2.3.gz
 Patch1:       libgnomeui-01-g11n-i18n-ui.diff
 Patch2:       libgnomeui-02-g11n-potfiles.diff
+Patch3:       libgnomeui-03-mount-crashed-gedit.diff
 URL:          http://www.gnome.org
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 Autoreqprov:  on
@@ -55,6 +56,7 @@
 %setup -q
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 bzcat %SOURCE1 | tar xf -
 
 %build
@@ -107,6 +109,12 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Jun 17 2004 - ghee.teo@sun.com
+- Added libgnomeui-03-mount-crashed-gedit.diff. The patch is taken from
+  HEAD (also included in 2.6.1.1 tarball release). bugzilla id#139063.
+  Bugtraq id 5055273. Since we are at Beta, so have to keep this patch
+  for the time being and uprev after Beta, this patch can then be removed.
+
 * Tue May 25 2004 - yuriy.kuznetsov@sun.com
 - Added libgnomeui-02-g11n-potfiles.diff
 
diff -r ef81b20b1e77 -r 220a72f4553e patches/libgnomeui-03-mount-crashed-gedit.diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/libgnomeui-03-mount-crashed-gedit.diff	Thu Jun 17 11:28:19 2004 +0000
@@ -0,0 +1,26 @@
+diff -ur libgnomeui-2.6.0/file-chooser/gtkfilesystemgnomevfs.c libgnomeui-2.6.0.hacked/file-chooser/gtkfilesystemgnomevfs.c
+--- libgnomeui-2.6.0/file-chooser/gtkfilesystemgnomevfs.c	2004-03-20 21:42:55.000000000 +0000
++++ libgnomeui-2.6.0.hacked/file-chooser/gtkfilesystemgnomevfs.c	2004-06-17 12:06:38.000000000 +0100
+@@ -375,14 +375,14 @@
+ #endif
+ 
+   system_vfs->volume_monitor = gnome_vfs_volume_monitor_ref (gnome_vfs_get_volume_monitor ());
+-  g_signal_connect (system_vfs->volume_monitor, "volume-mounted",
+-		    G_CALLBACK (volume_mount_unmount_cb), system_vfs);
+-  g_signal_connect (system_vfs->volume_monitor, "volume-unmounted",
+-		    G_CALLBACK (volume_mount_unmount_cb), system_vfs);
+-  g_signal_connect (system_vfs->volume_monitor, "drive-connected",
+-		    G_CALLBACK (drive_connect_disconnect_cb), system_vfs);
+-  g_signal_connect (system_vfs->volume_monitor, "drive-disconnected",
+-		    G_CALLBACK (drive_connect_disconnect_cb), system_vfs);
++  g_signal_connect_object (system_vfs->volume_monitor, "volume-mounted",
++		    G_CALLBACK (volume_mount_unmount_cb), system_vfs, 0);
++  g_signal_connect_object (system_vfs->volume_monitor, "volume-unmounted",
++		    G_CALLBACK (volume_mount_unmount_cb), system_vfs, 0);
++  g_signal_connect_object (system_vfs->volume_monitor, "drive-connected",
++		    G_CALLBACK (drive_connect_disconnect_cb), system_vfs, 0);
++  g_signal_connect_object (system_vfs->volume_monitor, "drive-disconnected",
++		    G_CALLBACK (drive_connect_disconnect_cb), system_vfs, 0);
+ 
+ }
+