rpms/nautilus
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Make "Open Folder" work as expected in media handling

Browse Source
This commit is contained in:
Matthias Clasen 2008-04-18 02:38:51 +00:00
parent 1b0f8c9e97
commit aae702d706
2 changed files with 45 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
nautilus-fix-open-folder.patch Normal file
View File

@ -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);

9
nautilus.spec
View File

@ -19,7 +19,7 @@
Name: nautilus Name: nautilus
Summary: Nautilus is a file manager for GNOME Summary: Nautilus is a file manager for GNOME
Version: 2.22.2 Version: 2.22.2
Release: 4%{?dist} Release: 5%{?dist}
License: GPLv2+ License: GPLv2+
Group: User Interface/Desktops Group: User Interface/Desktops
Source: http://download.gnome.org/sources/%{name}/2.22/%{name}-%{version}.tar.bz2 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 Patch10: nautilus-gvfs-desktop-key.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=528675
Patch11: nautilus-fix-open-folder.patch
%description %description
Nautilus integrates access to files, applications, media, Nautilus integrates access to files, applications, media,
Internet-based resources and the Web. Nautilus delivers a dynamic and 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 %patch8 -p1 -b .hide-white-screen
%patch9 -p0 -b .fix-autorun %patch9 -p0 -b .fix-autorun
%patch10 -p0 -b .gvfs-desktop-key %patch10 -p0 -b .gvfs-desktop-key
%patch11 -p1 -b .fix-open-folder
%build %build
@ -237,6 +241,9 @@ fi
%{_libdir}/*.so %{_libdir}/*.so
%changelog %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 * Thu Apr 17 2008 David Zeuthen <davidz@redhat.com> - 2.22.2-4
- Put X-Gnome-Vfs-System=gio into desktop files (See #442835) - Put X-Gnome-Vfs-System=gio into desktop files (See #442835)