From aae702d7064a8e702841f3962541b1eb7a3b8b29 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@fedoraproject.org>
Date: Apr 18 2008 02:38:51 +0000
Subject: Make "Open Folder" work as expected in media handling


---

diff --git a/nautilus-fix-open-folder.patch b/nautilus-fix-open-folder.patch
new file mode 100644
index 0000000..1622374
--- /dev/null
+++ b/nautilus-fix-open-folder.patch
@@ -0,0 +1,37 @@
+diff -up nautilus-2.22.2/libnautilus-private/nautilus-autorun.c.fix-open-folder nautilus-2.22.2/libnautilus-private/nautilus-autorun.c
+--- nautilus-2.22.2/libnautilus-private/nautilus-autorun.c.fix-open-folder	2008-04-17 22:30:04.000000000 -0400
++++ nautilus-2.22.2/libnautilus-private/nautilus-autorun.c	2008-04-17 22:30:10.000000000 -0400
+@@ -1200,15 +1200,6 @@ typedef struct {
+ 	gpointer user_data;
+ } AutorunData;
+ 
+-
+-static void
+-autorun_open_folder_for_mount (AutorunData *data)
+-{
+-	if (eel_preferences_get_boolean (NAUTILUS_PREFERENCES_MEDIA_AUTOMOUNT_OPEN) && 
+-	    data->open_window_func != NULL)
+-		data->open_window_func (data->mount, data->user_data);
+-}
+-
+ static void
+ autorun_guessed_content_type_callback (GObject *source_object,
+ 				       GAsyncResult *res,
+@@ -1237,13 +1228,14 @@ autorun_guessed_content_type_callback (G
+ 			}
+ 			g_strfreev (guessed_content_type);
+ 		} else {
+-			open_folder = TRUE;
++			if (eel_preferences_get_boolean (NAUTILUS_PREFERENCES_MEDIA_AUTOMOUNT_OPEN))
++				open_folder = TRUE;
+ 		}
+ 	}
+ 
+ 	/* only open the folder once.. */
+-	if (open_folder) {
+-		autorun_open_folder_for_mount (data);
++	if (open_folder && data->open_window_func != NULL) {
++		data->open_window_func (data->mount, data->user_data);
+ 	}
+ 
+ 	g_object_unref (data->mount);
diff --git a/nautilus.spec b/nautilus.spec
index d96fb9f..6759e8b 100644
--- a/nautilus.spec
+++ b/nautilus.spec
@@ -19,7 +19,7 @@
 Name:		nautilus
 Summary:        Nautilus is a file manager for GNOME
 Version: 	2.22.2
-Release:	4%{?dist}
+Release:	5%{?dist}
 License: 	GPLv2+
 Group:          User Interface/Desktops
 Source: 	http://download.gnome.org/sources/%{name}/2.22/%{name}-%{version}.tar.bz2
@@ -90,6 +90,9 @@ Patch9:		nautilus-2.22-fix-autorun.patch
 
 Patch10:        nautilus-gvfs-desktop-key.patch
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=528675
+Patch11:	nautilus-fix-open-folder.patch
+
 %description
 Nautilus integrates access to files, applications, media,
 Internet-based resources and the Web. Nautilus delivers a dynamic and
@@ -127,6 +130,7 @@ for writing nautilus extensions.
 %patch8 -p1 -b .hide-white-screen
 %patch9 -p0 -b .fix-autorun
 %patch10 -p0 -b .gvfs-desktop-key
+%patch11 -p1 -b .fix-open-folder
 
 %build
 
@@ -237,6 +241,9 @@ fi
 %{_libdir}/*.so
 
 %changelog
+* Thu Apr 17 2008 Matthias Clasen <mclasen@redhat.com> - 2.22.2-5
+- Make "Open Folder" work as expected for media handling
+
 * Thu Apr 17 2008 David Zeuthen <davidz@redhat.com> - 2.22.2-4
 - Put X-Gnome-Vfs-System=gio into desktop files (See #442835)