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

- Update to 2.23.4

Browse Source
This commit is contained in:
Tomas Bzatek 2008-06-17 08:48:30 +00:00
parent b3a2e2aa17
commit b04540e104
5 changed files with 7 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.cvsignore
View File

@ -1 +1 @@
nautilus-2.23.3.tar.bz2
nautilus-2.23.4.tar.bz2

13
nautilus-2.23.3-wrong-unref.patch
View File

@ -1,13 +0,0 @@
Index: libnautilus-private/nautilus-dnd.c
===================================================================
--- libnautilus-private/nautilus-dnd.c (révision 14260)
+++ libnautilus-private/nautilus-dnd.c (copie de travail)
@@ -422,7 +422,7 @@
*action = GDK_ACTION_MOVE;
}
- g_free (target);
+ g_object_unref (target);
nautilus_file_unref (dropped_file);
nautilus_file_unref (target_file);
return;

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

@ -1,37 +0,0 @@
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);

15
nautilus.spec
View File

@ -18,8 +18,8 @@
Name: nautilus
Summary: Nautilus is a file manager for GNOME
Version: 2.23.3
Release: 2%{?dist}
Version: 2.23.4
Release: 1%{?dist}
License: GPLv2+
Group: User Interface/Desktops
Source: http://download.gnome.org/sources/%{name}/2.23/%{name}-%{version}.tar.bz2
@ -89,9 +89,6 @@ Patch8: nautilus-2.22.1-hide-white-screen.patch
Patch10: nautilus-gvfs-desktop-key.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=528675
Patch11: nautilus-fix-open-folder.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=444639
Patch14: nautilus-2.22-default-to-asking.patch
@ -101,9 +98,6 @@ Patch15: nautilus-2.22.0-treeview-xds-dnd.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=519743
Patch17: nautilus-filetype-symlink-fix.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=537995
Patch18: nautilus-2.23.3-wrong-unref.patch
%description
Nautilus integrates access to files, applications, media,
Internet-based resources and the Web. Nautilus delivers a dynamic and
@ -140,11 +134,9 @@ for writing nautilus extensions.
%patch7 -p1 -b .rtl-fix
# %patch8 -p1 -b .hide-white-screen
%patch10 -p0 -b .gvfs-desktop-key
%patch11 -p1 -b .fix-open-folder
%patch14 -p1 -b .default-to-asking
%patch15 -p1 -b .xds
%patch17 -p0 -b .symlink
%patch18 -p0 -b .dnd-segv
%build
@ -263,6 +255,9 @@ fi
%changelog
* Tue Jun 17 2008 Tomas Bzatek <tbzatek@redhat.com> - 2.23.4-1
- Update to 2.23.4
* Thu Jun 12 2008 Tomas Bzatek <tbzatek@redhat.com> - 2.23.3-2
- Fix DnD segfaults (#450416, #450449)

2
sources
View File

@ -1 +1 @@
b01fd36ca881d79d41430dc3ebc3f522 nautilus-2.23.3.tar.bz2
6daaf064536cc1c194bb6e1d381679b9 nautilus-2.23.4.tar.bz2