2009-07-23 Christian Kelly <
[email protected]>
* base-specs/nautilus.spec, patches/nautilus-13-zfs-snapshot.diff,
patches/nautilus-09-trusted-extensions.diff,
patches/nautilus-07-lockdown.diff, patches/nautilus-15-configure.diff,
patches/nautilus-14-interface-changes.diff: Bump to 2.27.4.
--- a/ChangeLog Thu Jul 23 16:16:05 2009 +0000
+++ b/ChangeLog Thu Jul 23 16:48:14 2009 +0000
@@ -1,3 +1,10 @@
+2009-07-23 Christian Kelly <[email protected]>
+
+ * base-specs/nautilus.spec, patches/nautilus-13-zfs-snapshot.diff,
+ patches/nautilus-09-trusted-extensions.diff,
+ patches/nautilus-07-lockdown.diff, patches/nautilus-15-configure.diff,
+ patches/nautilus-14-interface-changes.diff: Bump to 2.27.4.
+
2009-07-23 Ghee Teo <[email protected]>
Repatch to fix gnome-about popping up on new gdm 2.27.x login screen.
--- a/base-specs/nautilus.spec Thu Jul 23 16:16:05 2009 +0000
+++ b/base-specs/nautilus.spec Thu Jul 23 16:48:14 2009 +0000
@@ -11,7 +11,7 @@
Name: nautilus
License: GPL
Group: Productivity/File utilities
-Version: 2.26.3
+Version: 2.27.4
Release: 1
Distribution: Java Desktop System
Vendor: Sun Microsystems, Inc.
@@ -55,6 +55,8 @@
Patch13: nautilus-13-zfs-snapshot.diff
#owner:gman date:2006-04-25 type:branding
Patch14: nautilus-14-interface-changes.diff
+#owner:chrisk date:2009-07-23 type:bug
+Patch15: nautilus-15-configure.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Docdir: %{_defaultdocdir}/nautilus2
@@ -143,6 +145,7 @@
%patch11 -p1
%patch13 -p1
%patch14 -p1
+%patch15 -p1
cp %SOURCE4 icons
cp %SOURCE5 icons
@@ -244,6 +247,9 @@
%{_libdir}/pkgconfig/*.pc
%changelog
+* Thu Jul 23 2009 - [email protected]
+- Bump to 2.27.4.
+- Add patches/nautilus-15-configure.diff to fix build issue.
* Mon Jul 13 2009 - [email protected]
- Bump to 2.26.3
* Thu May 7 2009 - [email protected]
--- a/patches/nautilus-07-lockdown.diff Thu Jul 23 16:16:05 2009 +0000
+++ b/patches/nautilus-07-lockdown.diff Thu Jul 23 16:48:14 2009 +0000
@@ -13,14 +13,6 @@
/jds/bin/diff -uprN nautilus-2.26.3.old/libnautilus-private/nautilus-directory-async.c nautilus-2.26.3/libnautilus-private/nautilus-directory-async.c
--- nautilus-2.26.3.old/libnautilus-private/nautilus-directory-async.c 2009-05-13 12:30:32.000000000 +0100
+++ nautilus-2.26.3/libnautilus-private/nautilus-directory-async.c 2009-07-13 11:41:43.043014000 +0100
-@@ -33,6 +33,7 @@
- #include "nautilus-signaller.h"
- #include "nautilus-global-preferences.h"
- #include "nautilus-link.h"
-+#include "nautilus-lockdown.h"
- #include "nautilus-marshal.h"
- #include "nautilus-metafile.h"
- #include <eel/eel-glib-extensions.h>
@@ -856,6 +857,10 @@ should_skip_file (NautilusDirectory *dir
return TRUE;
}
@@ -652,14 +644,6 @@
/jds/bin/diff -uprN nautilus-2.26.3.old/src/nautilus-main.c nautilus-2.26.3/src/nautilus-main.c
--- nautilus-2.26.3.old/src/nautilus-main.c 2009-05-18 20:44:27.000000000 +0100
+++ nautilus-2.26.3/src/nautilus-main.c 2009-07-13 11:41:43.077497000 +0100
-@@ -48,6 +48,7 @@
- #include <libnautilus-private/nautilus-debug-log.h>
- #include <libnautilus-private/nautilus-directory-metafile.h>
- #include <libnautilus-private/nautilus-global-preferences.h>
-+#include <libnautilus-private/nautilus-lockdown.h>
- #include <libnautilus-private/nautilus-lib-self-check-functions.h>
- #include <libnautilus-private/nautilus-icon-names.h>
- #include <libxml/parser.h>
@@ -464,6 +465,7 @@ main (int argc, char *argv[])
(NAUTILUS_PREFERENCES_DESKTOP_IS_HOME_DIR, TRUE);
}
@@ -749,3 +733,25 @@
/* count the number of uris with local paths */
count = 0;
+diff -ruN nautilus-2.27.4.orig/libnautilus-private/nautilus-directory-async.c nautilus-2.27.4/libnautilus-private/nautilus-directory-async.c
+--- nautilus-2.27.4.orig/libnautilus-private/nautilus-directory-async.c 2009-07-23 15:47:20.972324079 +0100
++++ nautilus-2.27.4/libnautilus-private/nautilus-directory-async.c 2009-07-23 15:48:27.250174766 +0100
+@@ -32,6 +32,7 @@
+ #include "nautilus-signaller.h"
+ #include "nautilus-global-preferences.h"
+ #include "nautilus-link.h"
++#include "nautilus-lockdown.h"
+ #include "nautilus-marshal.h"
+ #include <eel/eel-glib-extensions.h>
+ #include <eel/eel-string.h>
+diff -ruN nautilus-2.27.4.orig/src/nautilus-main.c nautilus-2.27.4/src/nautilus-main.c
+--- nautilus-2.27.4.orig/src/nautilus-main.c 2009-07-23 15:47:20.959902926 +0100
++++ nautilus-2.27.4/src/nautilus-main.c 2009-07-23 15:49:22.737922718 +0100
+@@ -47,6 +47,7 @@
+ #include <gio/gdesktopappinfo.h>
+ #include <libnautilus-private/nautilus-debug-log.h>
+ #include <libnautilus-private/nautilus-global-preferences.h>
++#include <libnautilus-private/nautilus-lockdown.h>
+ #include <libnautilus-private/nautilus-lib-self-check-functions.h>
+ #include <libnautilus-private/nautilus-icon-names.h>
+ #include <libxml/parser.h>
--- a/patches/nautilus-09-trusted-extensions.diff Thu Jul 23 16:16:05 2009 +0000
+++ b/patches/nautilus-09-trusted-extensions.diff Thu Jul 23 16:48:14 2009 +0000
@@ -439,15 +439,6 @@
diff -urN -x '*.orig' -x '*.rej' naut.orig/src/file-manager/fm-properties-window.c naut.new/src/file-manager/fm-properties-window.c
--- naut.orig/src/file-manager/fm-properties-window.c 2009-03-25 15:48:56.554763663 +0000
+++ naut.new/src/file-manager/fm-properties-window.c 2009-03-25 15:50:31.171186528 +0000
-@@ -62,6 +62,8 @@
- #include <sys/stat.h>
- #include <cairo.h>
-
-+#include <libnautilus-private/nautilus-tsol-extensions.h>
-+
- #if HAVE_SYS_STATVFS_H
- #include <sys/statvfs.h>
- #endif
@@ -4784,7 +4786,9 @@
{
GtkWidget *vbox, *button, *hbox;
@@ -581,3 +572,14 @@
columns = g_list_append (columns,
g_object_new (NAUTILUS_TYPE_COLUMN,
"name", "where",
+diff -ruN nautilus-2.27.4.orig/src/file-manager/fm-properties-window.c nautilus-2.27.4/src/file-manager/fm-properties-window.c
+--- nautilus-2.27.4.orig/src/file-manager/fm-properties-window.c 2009-07-23 15:50:33.904002666 +0100
++++ nautilus-2.27.4/src/file-manager/fm-properties-window.c 2009-07-23 15:51:09.501841762 +0100
+@@ -61,6 +61,7 @@
+ #include <string.h>
+ #include <sys/stat.h>
+ #include <cairo.h>
++#include <libnautilus-private/nautilus-tsol-extensions.h>
+
+ #if HAVE_SYS_VFS_H
+ #include <sys/vfs.h>
--- a/patches/nautilus-13-zfs-snapshot.diff Thu Jul 23 16:16:05 2009 +0000
+++ b/patches/nautilus-13-zfs-snapshot.diff Thu Jul 23 16:48:14 2009 +0000
@@ -58,29 +58,6 @@
$(NULL)
BEAGLE_SOURCES = \
-diff -Nrup -x '*.orig' -x '*.rej' -x '*.*~' ../nautilus-2.26.2/libnautilus-private/apps_nautilus_preferences.schemas.in nautilus-2.26.2/libnautilus-private/apps_nautilus_preferences.schemas.in
---- ../nautilus-2.26.2/libnautilus-private/apps_nautilus_preferences.schemas.in 2009-04-15 16:04:23.811067538 +0200
-+++ nautilus-2.26.2/libnautilus-private/apps_nautilus_preferences.schemas.in 2009-04-15 16:04:45.673605198 +0200
-@@ -5,6 +5,19 @@
- in nautilus-global-preferences.c -->
-
- <!-- General preferences -->
-+ <schema>
-+ <key>/schemas/apps/nautilus/preferences/enable_time_slider</key>
-+ <applyto>/apps/nautilus/preferences/enable_time_slider</applyto>
-+ <owner>nautilus</owner>
-+ <type>bool</type>
-+ <default>true</default>
-+ <locale name="C">
-+ <short>Enables the visualization of the ZFS snaphots timeline</short>
-+ <long>
-+ If set to true, the visualization of the ZFS snapshots timeline is enabled
-+ </long>
-+ </locale>
-+ </schema>
-
- <schema>
- <key>/schemas/desktop/gnome/file_views/show_hidden_files</key>
diff -Nrup -x '*.orig' -x '*.rej' -x '*.*~' ../nautilus-2.26.2/libnautilus-private/nautilus-column-utilities.c nautilus-2.26.2/libnautilus-private/nautilus-column-utilities.c
--- ../nautilus-2.26.2/libnautilus-private/nautilus-column-utilities.c 2009-04-15 16:04:23.816494495 +0200
+++ nautilus-2.26.2/libnautilus-private/nautilus-column-utilities.c 2009-04-15 16:05:52.535297177 +0200
@@ -141,27 +118,6 @@
static void
cancel_loading_attributes (NautilusDirectory *directory,
-@@ -4826,6 +4843,10 @@ cancel_loading_attributes (NautilusDirec
- if (REQUEST_WANTS_TYPE (request, REQUEST_MOUNT)) {
- mount_cancel (directory);
- }
-+
-+ if (REQUEST_WANTS_TYPE (request, REQUEST_RESTORE_INFO)) {
-+ nautilus_directory_cancel_restore_info (directory);
-+ }
-
- /* FIXME bugzilla.gnome.org 45064: implement cancelling metadata when we
- implement invalidating metadata */
-@@ -4871,6 +4892,9 @@ nautilus_directory_cancel_loading_file_a
- if (REQUEST_WANTS_TYPE (request, REQUEST_MOUNT)) {
- cancel_mount_for_file (directory, file);
- }
-+ if (REQUEST_WANTS_TYPE (request, REQUEST_RESTORE_INFO)) {
-+ nautilus_directory_cancel_restore_info (directory);
-+ }
-
- /* FIXME bugzilla.gnome.org 45064: implement cancelling metadata when we
- implement invalidating metadata */
diff -Nrup -x '*.orig' -x '*.rej' -x '*.*~' ../nautilus-2.26.2/libnautilus-private/nautilus-directory-private.h nautilus-2.26.2/libnautilus-private/nautilus-directory-private.h
--- ../nautilus-2.26.2/libnautilus-private/nautilus-directory-private.h 2009-04-15 16:04:23.799692328 +0200
+++ nautilus-2.26.2/libnautilus-private/nautilus-directory-private.h 2009-04-15 16:06:59.714531306 +0200
@@ -186,23 +142,6 @@
diff -Nrup -x '*.orig' -x '*.rej' -x '*.*~' ../nautilus-2.26.2/libnautilus-private/nautilus-directory.c nautilus-2.26.2/libnautilus-private/nautilus-directory.c
--- ../nautilus-2.26.2/libnautilus-private/nautilus-directory.c 2009-04-15 16:04:23.809804390 +0200
+++ nautilus-2.26.2/libnautilus-private/nautilus-directory.c 2009-04-15 16:07:42.868117733 +0200
-@@ -38,6 +38,7 @@
- #include "nautilus-metafile.h"
- #include "nautilus-desktop-directory.h"
- #include "nautilus-vfs-directory.h"
-+#include "nautilus-zfs.h"
- #include <eel/eel-glib-extensions.h>
- #include <eel/eel-gtk-macros.h>
- #include <eel/eel-string.h>
-@@ -141,6 +142,8 @@ nautilus_directory_init (gpointer object
- directory->details->extension_queue = nautilus_file_queue_new ();
- directory->details->idle_queue = nautilus_idle_queue_new ();
- directory->details->free_space = (guint64)-1;
-+ directory->details->zfs_snapshots = NULL;
-+ directory->details->restore_cancel = NULL;
- }
-
- NautilusDirectory *
@@ -216,7 +219,13 @@ nautilus_directory_finalize (GObject *ob
if (directory->details->hidden_file_hash) {
g_hash_table_destroy (directory->details->hidden_file_hash);
@@ -520,17 +459,6 @@
#endif /* NAUTILUS_DIRECTORY_H */
-diff -Nrup -x '*.orig' -x '*.rej' -x '*.*~' ../nautilus-2.26.2/libnautilus-private/nautilus-file-attributes.h nautilus-2.26.2/libnautilus-private/nautilus-file-attributes.h
---- ../nautilus-2.26.2/libnautilus-private/nautilus-file-attributes.h 2009-04-15 16:04:23.812234151 +0200
-+++ nautilus-2.26.2/libnautilus-private/nautilus-file-attributes.h 2009-04-15 16:04:45.683015260 +0200
-@@ -42,6 +42,7 @@ typedef enum {
- NAUTILUS_FILE_ATTRIBUTE_THUMBNAIL = 1 << 9,
- NAUTILUS_FILE_ATTRIBUTE_MOUNT = 1 << 10,
- NAUTILUS_FILE_ATTRIBUTE_FILESYSTEM_INFO = 1 << 11,
-+ NAUTILUS_FILE_ATTRIBUTE_RESTORE_INFO = 1 << 12,
- } NautilusFileAttributes;
-
- #endif /* NAUTILUS_FILE_ATTRIBUTES_H */
diff -Nrup -x '*.orig' -x '*.rej' -x '*.*~' ../nautilus-2.26.2/libnautilus-private/nautilus-file-private.h nautilus-2.26.2/libnautilus-private/nautilus-file-private.h
--- ../nautilus-2.26.2/libnautilus-private/nautilus-file-private.h 2009-04-15 16:04:23.815190214 +0200
+++ nautilus-2.26.2/libnautilus-private/nautilus-file-private.h 2009-04-15 16:04:45.684019915 +0200
@@ -593,21 +521,6 @@
static void file_mount_unmounted (GMount *mount, gpointer data);
G_DEFINE_TYPE_WITH_CODE (NautilusFile, nautilus_file, G_TYPE_OBJECT,
-@@ -337,6 +340,14 @@ nautilus_file_clear_info (NautilusFile *
-
- eel_ref_str_unref (file->details->filesystem_id);
- file->details->filesystem_id = NULL;
-+ g_free (file->details->restore_info);
-+ file->details->restore_info = NULL;
-+ invalidate_restore_info (file);
-+ g_free (file->details->snapshot_directory);
-+ file->details->snapshot_directory = NULL;
-+ file->details->has_snap_versions_in_progress = FALSE;
-+ file->details->has_snap_versions_is_up_to_date = FALSE;
-+ file->details->has_snap_versions = FALSE;
- }
-
- static NautilusFile *
@@ -654,6 +665,10 @@ finalize (GObject *object)
g_free (file->details->activation_uri);
g_free (file->details->compare_by_emblem_cache);
@@ -1326,31 +1239,6 @@
/* Permissions. */
gboolean nautilus_file_can_get_permissions (NautilusFile *file);
gboolean nautilus_file_can_set_permissions (NautilusFile *file);
-diff -Nrup -x '*.orig' -x '*.rej' -x '*.*~' ../nautilus-2.26.2/libnautilus-private/nautilus-global-preferences.c nautilus-2.26.2/libnautilus-private/nautilus-global-preferences.c
---- ../nautilus-2.26.2/libnautilus-private/nautilus-global-preferences.c 2009-04-15 16:04:23.807198056 +0200
-+++ nautilus-2.26.2/libnautilus-private/nautilus-global-preferences.c 2009-04-15 16:04:45.685853410 +0200
-@@ -235,6 +235,10 @@ typedef struct
- * YOU SHOULD EDIT THE SCHEMAS FILE TO CHANGE DEFAULTS.
- */
- static const PreferenceDefault preference_defaults[] = {
-+ { NAUTILUS_PREFERENCES_ENABLE_TIME_SLIDER,
-+ PREFERENCE_BOOLEAN,
-+ GINT_TO_POINTER (TRUE)
-+ },
- { NAUTILUS_PREFERENCES_SHOW_HIDDEN_FILES,
- PREFERENCE_BOOLEAN,
- GINT_TO_POINTER (FALSE)
-diff -Nrup -x '*.orig' -x '*.rej' -x '*.*~' ../nautilus-2.26.2/libnautilus-private/nautilus-global-preferences.h nautilus-2.26.2/libnautilus-private/nautilus-global-preferences.h
---- ../nautilus-2.26.2/libnautilus-private/nautilus-global-preferences.h 2009-04-15 16:04:23.816890362 +0200
-+++ nautilus-2.26.2/libnautilus-private/nautilus-global-preferences.h 2009-04-15 16:04:45.686381273 +0200
-@@ -70,6 +70,7 @@ G_BEGIN_DECLS
- #define NAUTILUS_PREFERENCES_SHOW_BACKUP_FILES "/desktop/gnome/file_views/show_backup_files"
- #define NAUTILUS_PREFERENCES_SHOW_ADVANCED_PERMISSIONS "preferences/show_advanced_permissions"
- #define NAUTILUS_PREFERENCES_DATE_FORMAT "preferences/date_format"
-+#define NAUTILUS_PREFERENCES_ENABLE_TIME_SLIDER "preferences/enable_time_slider"
-
- typedef enum
- {
diff -Nrup -x '*.orig' -x '*.rej' -x '*.*~' ../nautilus-2.26.2/libnautilus-private/nautilus-zfs.c nautilus-2.26.2/libnautilus-private/nautilus-zfs.c
--- ../nautilus-2.26.2/libnautilus-private/nautilus-zfs.c 1970-01-01 01:00:00.000000000 +0100
+++ nautilus-2.26.2/libnautilus-private/nautilus-zfs.c 2009-04-15 16:04:45.687388998 +0200
@@ -7924,3 +7812,126 @@
+G_END_DECLS
+
+#endif /* __GTK_TIMESCALE_H__ */
+diff -ruN nautilus-2.27.4.orig/libnautilus-private/apps_nautilus_preferences.schemas.in nautilus-2.27.4/libnautilus-private/apps_nautilus_preferences.schemas.in
+--- nautilus-2.27.4.orig/libnautilus-private/apps_nautilus_preferences.schemas.in 2009-07-23 16:07:27.182108803 +0100
++++ nautilus-2.27.4/libnautilus-private/apps_nautilus_preferences.schemas.in 2009-07-23 16:14:58.347661530 +0100
+@@ -5,6 +5,19 @@
+ in nautilus-global-preferences.c -->
+
+ <!-- General preferences -->
++ <schema>
++ <key>/schemas/apps/nautilus/preferences/enable_time_slider</key>
++ <applyto>/apps/nautilus/preferences/enable_time_slider</applyto>
++ <owner>nautilus</owner>
++ <type>bool</type>
++ <default>true</default>
++ <locale name="C">
++ <short>Enables the visualization of the ZFS snaphots timeline</short>
++ <long>
++ If set to true, the visualization of the ZFS snapshots timeline is enabled
++ </long>
++ </locale>
++ </schema>
+
+ <schema>
+ <key>/schemas/apps/nautilus/preferences/exit_with_last_window</key>
+diff -ruN nautilus-2.27.4.orig/libnautilus-private/nautilus-directory-async.c nautilus-2.27.4/libnautilus-private/nautilus-directory-async.c
+--- nautilus-2.27.4.orig/libnautilus-private/nautilus-directory-async.c 2009-07-23 16:07:27.190151967 +0100
++++ nautilus-2.27.4/libnautilus-private/nautilus-directory-async.c 2009-07-23 16:17:05.991717153 +0100
+@@ -4767,7 +4767,9 @@
+ if (REQUEST_WANTS_TYPE (request, REQUEST_MOUNT)) {
+ mount_cancel (directory);
+ }
+-
++ if (REQUEST_WANTS_TYPE (request, REQUEST_RESTORE_INFO)) {
++ nautilus_directory_cancel_restore_info (directory);
++ }
+ nautilus_directory_async_state_changed (directory);
+ }
+
+@@ -4809,7 +4811,9 @@
+ if (REQUEST_WANTS_TYPE (request, REQUEST_MOUNT)) {
+ cancel_mount_for_file (directory, file);
+ }
+-
++ if (REQUEST_WANTS_TYPE (request, REQUEST_RESTORE_INFO)) {
++ nautilus_directory_cancel_restore_info (directory);
++ }
+ nautilus_directory_async_state_changed (directory);
+ }
+
+diff -ruN nautilus-2.27.4.orig/libnautilus-private/nautilus-directory.c nautilus-2.27.4/libnautilus-private/nautilus-directory.c
+--- nautilus-2.27.4.orig/libnautilus-private/nautilus-directory.c 2009-07-23 16:07:27.193707900 +0100
++++ nautilus-2.27.4/libnautilus-private/nautilus-directory.c 2009-07-23 16:18:46.520556831 +0100
+@@ -36,6 +36,7 @@
+ #include "nautilus-metadata.h"
+ #include "nautilus-desktop-directory.h"
+ #include "nautilus-vfs-directory.h"
++#include "nautilus-zfs.h"
+ #include <eel/eel-glib-extensions.h>
+ #include <eel/eel-gtk-macros.h>
+ #include <eel/eel-string.h>
+@@ -130,6 +131,8 @@
+ directory->details->low_priority_queue = nautilus_file_queue_new ();
+ directory->details->extension_queue = nautilus_file_queue_new ();
+ directory->details->free_space = (guint64)-1;
++ directory->details->zfs_snapshots = NULL;
++ directory->details->restore_cancel = NULL;
+ }
+
+ NautilusDirectory *
+diff -ruN nautilus-2.27.4.orig/libnautilus-private/nautilus-file-attributes.h nautilus-2.27.4/libnautilus-private/nautilus-file-attributes.h
+--- nautilus-2.27.4.orig/libnautilus-private/nautilus-file-attributes.h 2009-07-23 16:07:27.181954313 +0100
++++ nautilus-2.27.4/libnautilus-private/nautilus-file-attributes.h 2009-07-23 16:19:46.033209325 +0100
+@@ -41,6 +41,7 @@
+ NAUTILUS_FILE_ATTRIBUTE_THUMBNAIL = 1 << 8,
+ NAUTILUS_FILE_ATTRIBUTE_MOUNT = 1 << 9,
+ NAUTILUS_FILE_ATTRIBUTE_FILESYSTEM_INFO = 1 << 10,
++ NAUTILUS_FILE_ATTRIBUTE_RESTORE_INFO = 1 << 12,
+ } NautilusFileAttributes;
+
+ #endif /* NAUTILUS_FILE_ATTRIBUTES_H */
+diff -ruN nautilus-2.27.4.orig/libnautilus-private/nautilus-file.c nautilus-2.27.4/libnautilus-private/nautilus-file.c
+--- nautilus-2.27.4.orig/libnautilus-private/nautilus-file.c 2009-07-23 16:07:27.199945449 +0100
++++ nautilus-2.27.4/libnautilus-private/nautilus-file.c 2009-07-23 16:20:55.445509293 +0100
+@@ -486,7 +486,14 @@
+
+ eel_ref_str_unref (file->details->filesystem_id);
+ file->details->filesystem_id = NULL;
+-
++ g_free (file->details->restore_info);
++ file->details->restore_info = NULL;
++ invalidate_restore_info (file);
++ g_free (file->details->snapshot_directory);
++ file->details->snapshot_directory = NULL;
++ file->details->has_snap_versions_in_progress = FALSE;
++ file->details->has_snap_versions_is_up_to_date = FALSE;
++ file->details->has_snap_versions = FALSE;
+ clear_metadata (file);
+ }
+
+diff -ruN nautilus-2.27.4.orig/libnautilus-private/nautilus-global-preferences.c nautilus-2.27.4/libnautilus-private/nautilus-global-preferences.c
+--- nautilus-2.27.4.orig/libnautilus-private/nautilus-global-preferences.c 2009-07-23 16:07:27.199476551 +0100
++++ nautilus-2.27.4/libnautilus-private/nautilus-global-preferences.c 2009-07-23 16:22:26.252826527 +0100
+@@ -236,6 +236,10 @@
+ * YOU SHOULD EDIT THE SCHEMAS FILE TO CHANGE DEFAULTS.
+ */
+ static const PreferenceDefault preference_defaults[] = {
++ { NAUTILUS_PREFERENCES_ENABLE_TIME_SLIDER,
++ PREFERENCE_BOOLEAN,
++ GINT_TO_POINTER (TRUE)
++ },
+ { NAUTILUS_PREFERENCES_EXIT_WITH_LAST_WINDOW,
+ PREFERENCE_BOOLEAN,
+ GINT_TO_POINTER (TRUE)
+diff -ruN nautilus-2.27.4.orig/libnautilus-private/nautilus-global-preferences.h nautilus-2.27.4/libnautilus-private/nautilus-global-preferences.h
+--- nautilus-2.27.4.orig/libnautilus-private/nautilus-global-preferences.h 2009-07-23 16:07:27.185555511 +0100
++++ nautilus-2.27.4/libnautilus-private/nautilus-global-preferences.h 2009-07-23 16:23:34.094229246 +0100
+@@ -73,6 +73,7 @@
+ #define NAUTILUS_PREFERENCES_SHOW_BACKUP_FILES "/desktop/gnome/file_views/show_backup_files"
+ #define NAUTILUS_PREFERENCES_SHOW_ADVANCED_PERMISSIONS "preferences/show_advanced_permissions"
+ #define NAUTILUS_PREFERENCES_DATE_FORMAT "preferences/date_format"
++#define NAUTILUS_PREFERENCES_ENABLE_TIME_SLIDER "preferences/enable_time_slider"
+
+ /* Mouse */
+ #define NAUTILUS_PREFERENCES_MOUSE_USE_EXTRA_BUTTONS "preferences/mouse_use_extra_buttons"
--- a/patches/nautilus-14-interface-changes.diff Thu Jul 23 16:16:05 2009 +0000
+++ b/patches/nautilus-14-interface-changes.diff Thu Jul 23 16:48:14 2009 +0000
@@ -433,16 +433,16 @@
TryExec=nautilus
Exec=nautilus --no-desktop network:
Terminal=false
-diff -Nrup -x '*.orig' -x '*.rej' -x '*.*~' ../nautilus-2.26.2/nautilus-computer.desktop.in.in nautilus-2.26.2/nautilus-computer.desktop.in.in
---- ../nautilus-2.26.2/nautilus-computer.desktop.in.in 2009-04-15 16:16:49.854903468 +0200
-+++ nautilus-2.26.2/nautilus-computer.desktop.in.in 2009-04-15 16:19:04.098469456 +0200
+diff -ruN nautilus-2.27.4.orig/data/nautilus-computer.desktop.in.in nautilus-2.27.4/data/nautilus-computer.desktop.in.in
+--- nautilus-2.27.4.orig/data/nautilus-computer.desktop.in.in 2009-07-23 16:25:58.991173280 +0100
++++ nautilus-2.27.4/data/nautilus-computer.desktop.in.in 2009-07-23 16:26:42.218102626 +0100
@@ -1,7 +1,8 @@
[Desktop Entry]
Encoding=UTF-8
_Name=Computer
-_Comment=Browse all local and remote disks and folders accessible from this computer
+# SUN_BRANDING
-+_Comment=Browse all disks and files accessible from this computer
++_Comment=Browse computers and files on your local network
TryExec=nautilus
Exec=nautilus --no-desktop computer:
Icon=computer
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/nautilus-15-configure.diff Thu Jul 23 16:48:14 2009 +0000
@@ -0,0 +1,12 @@
+diff -ruN nautilus-2.27.4.orig/configure.in nautilus-2.27.4/configure.in
+--- nautilus-2.27.4.orig/configure.in 2009-07-23 16:56:25.323507121 +0100
++++ nautilus-2.27.4/configure.in 2009-07-23 16:56:37.680814598 +0100
+@@ -434,8 +434,6 @@
+ enable_update_mimedb=yes)
+ AM_CONDITIONAL(ENABLE_UPDATE_MIMEDB, test x$enable_update_mimedb = xyes)
+
+-SHAVE_INIT([m4], [enable])
+-
+ AC_CONFIG_FILES([
+ Makefile
+ cut-n-paste-code/Makefile