Fix for bug #28778

4 files changed, 45 insertions, 5 deletions

diff --git a/gnome-base/nautilus/ChangeLog b/gnome-base/nautilus/ChangeLog
index 2e5498f7df0c..6bfe8bf7ced4 100644
--- a/gnome-base/nautilus/ChangeLog
+++ b/gnome-base/nautilus/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/nautilus
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.58 2003/09/12 23:21:53 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.59 2003/10/05 11:45:27 obz Exp $
+
+  05 Oct 2003; Mike Gardiner <obz@gentoo.org> nautilus-2.4.0.ebuild,
+  files/nautilus-2.4-startup-bonobo.patch:
+  Added patch to fix bug #28778 for nautilus-2.4.0. Shouldnt be required after
+  this version
 
   13 Sep 2003; <spider@gentoo.org> nautilus-2.4.0.ebuild:
   Fixing the HOMEPAGE tag
diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest
index 2bb434ce2fc2..79df2ce5eeef 100644
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -3,12 +3,13 @@ MD5 a6aeb0d6265095fd3b10a75b90b1673b nautilus-2.0.7.ebuild 1549
 MD5 e671b9d62fdb33d2e7f2d5546d48c141 nautilus-1.0.6-r9.ebuild 3523
 MD5 5914423f4dcac1754f14edac047dd270 nautilus-2.2.3.ebuild 1298
 MD5 84e67b452e5ca30aa47d26ef3a7f9d93 nautilus-2.2.4.ebuild 1355
-MD5 e60a4f8fae2a9eeaba093f15ee13021a ChangeLog 8752
+MD5 3c8c4dab2246b641170aab4981958b0e ChangeLog 8956
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 a2b7b5e18819628371abb172530ff5c5 nautilus-2.2.4-r5.ebuild 1564
-MD5 50f422e981cf374c634813342d7df5b2 nautilus-2.4.0.ebuild 1583
+MD5 02096982b3979fccb49baebdd770bd53 nautilus-2.4.0.ebuild 1674
 MD5 dbfcca25a47c67d13020371a1acbff7a files/nautilus-2-thumbnail_max_size.patch 1444
 MD5 b6616981e10e2a9725840198f3b29d15 files/nautilus-2-x-printers.patch 39941
+MD5 65769439a2d335132210b34a49905531 files/nautilus-2.4-startup-bonobo.patch 677
 MD5 6e4f0293f123c4fc7acf8e4d17e39990 files/digest-nautilus-2.2.4-r5 68
 MD5 3a7c7847c496aaa4230e7191aeb39c9a files/nautilus-2-snap_to_grid-r1.patch 37548
 MD5 4c62404b0162ab39572cb522fed222c4 files/nautilus-1.0.6-hyperbola.diff 1632
@@ -19,9 +20,9 @@ MD5 e7d7ddd19f8953646a1634ebe3e60e26 files/digest-nautilus-2.0.7 68
 MD5 0a040bda22d0a905a2d15c9c4df69b09 files/digest-nautilus-2.2.1 68
 MD5 eb934f4bc6062d4b539e0b3dd9a0f98b files/digest-nautilus-2.2.3 68
 MD5 6e4f0293f123c4fc7acf8e4d17e39990 files/digest-nautilus-2.2.4 68
+MD5 323fc939bd6c4e4c2a4d55fe9de94bb2 files/digest-nautilus-2.4.0 68
 MD5 94955c8317b2f5742603a9dd1d656ed3 files/nautilus-2.2-double_menu_entry_fix.patch 1322
 MD5 0596a42317e21832ae5a4899b88348e3 files/nautilus-2.2.0.2-locale.patch 351
 MD5 ddc1abbf275436c7fa5fd5c04a27cc94 files/nautilus-1.0.6-mozilla-embed-1.0_rc3.diff 526
-MD5 323fc939bd6c4e4c2a4d55fe9de94bb2 files/digest-nautilus-2.4.0 68
 MD5 7cb2f285f24e86a90c6a65b0b9356d39 files/macros/gnome.m4 16426
 MD5 486b971d706aec59655a72282d3feb0b files/macros/nautilus-macros.m4 7993
diff --git a/gnome-base/nautilus/files/nautilus-2.4-startup-bonobo.patch b/gnome-base/nautilus/files/nautilus-2.4-startup-bonobo.patch
new file mode 100644
index 000000000000..e0862e1dff24
--- /dev/null
+++ b/gnome-base/nautilus/files/nautilus-2.4-startup-bonobo.patch
@@ -0,0 +1,30 @@
+--- src/nautilus-main.c.old	2003-10-05 18:47:28.336065464 +0800
++++ src/nautilus-main.c	2003-10-05 18:48:37.015624584 +0800
+@@ -252,6 +252,8 @@
+ 	
+ 	bonobo_activate (); /* do now since we need it before main loop */
+ 
++	application = NULL;
++
+ 	/* Do either the self-check or the real work. */
+ 	if (perform_self_check) {
+ #ifndef NAUTILUS_OMIT_SELF_CHECK
+@@ -279,12 +281,17 @@
+ 		if (is_event_loop_needed ()) {
+ 			gtk_main ();
+ 		}
+-		bonobo_object_unref (application);
++
+ 	}
+ 
+ 	poptFreeContext (popt_context);
+ 
+ 	gnome_vfs_shutdown ();
++
++	if( application != NULL ) {
++		bonobo_object_unref( application );
++	}
++	
+ 	eel_debug_shut_down ();
+ 	bonobo_ui_debug_shutdown ();
+ 
diff --git a/gnome-base/nautilus/nautilus-2.4.0.ebuild b/gnome-base/nautilus/nautilus-2.4.0.ebuild
index 8e7f2662c3a0..4512f029272f 100644
--- a/gnome-base/nautilus/nautilus-2.4.0.ebuild
+++ b/gnome-base/nautilus/nautilus-2.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.4.0.ebuild,v 1.3 2003/09/12 23:21:53 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.4.0.ebuild,v 1.4 2003/10/05 11:45:27 obz Exp $
 
 inherit gnome2
 
@@ -51,6 +51,10 @@ src_unpack() {
 	unpack ${A}
 
 	cd ${S}
+
+	# patch for startup fix, see bug #28778
+	epatch ${FILESDIR}/${PN}-2.4-startup-bonobo.patch
+
 	if [ `use cups` ]; then
 		epatch ${FILESDIR}/${PN}-2-x-printers.patch
 		WANT_AUTOCONF_2_5=1 autoconf || die