diff --git a/.cvsignore b/.cvsignore index 035a5e0..e7006e7 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -nautilus-2.28.1.tar.bz2 +nautilus-2.29.1.tar.bz2 diff --git a/nautilus-2.28.0-revert-bg-fade-break.patch b/nautilus-2.28.0-revert-bg-fade-break.patch deleted file mode 100644 index ec4b0ff..0000000 --- a/nautilus-2.28.0-revert-bg-fade-break.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 96d03f31952dda243888313294137058269dfbf6 Mon Sep 17 00:00:00 2001 -From: Ray Strode -Date: Wed, 23 Sep 2009 17:48:33 -0400 -Subject: [PATCH] Revert "Emit APPEARANCE_CHANGED when setting the bg color" - -This reverts commit 7b86b78e2ff6a0f1b45ac8f8a9c30cf3d0c6ae96. ---- - eel/eel-background.c | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) - -diff --git a/eel/eel-background.c b/eel/eel-background.c -index 9c40629..81a4e61 100644 ---- a/eel/eel-background.c -+++ b/eel/eel-background.c -@@ -563,8 +563,6 @@ eel_background_set_color (EelBackground *background, - background->details->color = g_strdup (color); - - set_image_properties (background); -- -- g_signal_emit (background, signals[APPEARANCE_CHANGED], 0); - } - } - --- -1.6.4.2 - diff --git a/nautilus-2.29.xx-nautilus-directory-leak.patch b/nautilus-2.29.xx-nautilus-directory-leak.patch deleted file mode 100644 index 7601572..0000000 --- a/nautilus-2.29.xx-nautilus-directory-leak.patch +++ /dev/null @@ -1,41 +0,0 @@ -From ac9f08eb1f74b32c432b0a4904fb57e982202a4c Mon Sep 17 00:00:00 2001 -From: Alexander Larsson -Date: Tue, 08 Dec 2009 15:28:13 +0000 -Subject: Don't leak NautilusDirectory - ---- -diff --git a/src/nautilus-navigation-window.c b/src/nautilus-navigation-window.c -index 5175118..cd48f7e 100644 ---- a/src/nautilus-navigation-window.c -+++ b/src/nautilus-navigation-window.c -@@ -1580,6 +1580,7 @@ real_sync_search_widgets (NautilusWindow *window) - navigation_window->details->temporary_search_bar = TRUE; - hide_temporary_bars (navigation_window); - } -+ nautilus_directory_unref (directory); - } - - --- -cgit v0.8.2 -From 2d61fcdf4987802441b7d9dab5364a28fb2dbd7c Mon Sep 17 00:00:00 2001 -From: Alexander Larsson -Date: Tue, 08 Dec 2009 15:28:30 +0000 -Subject: Don't leak NautilusDirectory - ---- -diff --git a/libnautilus-private/nautilus-file.c b/libnautilus-private/nautilus-file.c -index df16e1f..fdb1bdc 100644 ---- a/libnautilus-private/nautilus-file.c -+++ b/libnautilus-private/nautilus-file.c -@@ -6635,6 +6635,8 @@ nautilus_file_get_volume_free_space (NautilusFile *file) - get_fs_free_cb, - directory); /* Inherits ref */ - g_object_unref (location); -+ } else { -+ nautilus_directory_unref (directory); - } - - --- -cgit v0.8.2 diff --git a/nautilus-gvfs-desktop-key-2.patch b/nautilus-gvfs-desktop-key-2.patch index cc27859..13bf21b 100644 --- a/nautilus-gvfs-desktop-key-2.patch +++ b/nautilus-gvfs-desktop-key-2.patch @@ -1,7 +1,7 @@ -diff -up nautilus-2.25.91/data/nautilus-autorun-software.desktop.in.in.key nautilus-2.25.91/data/nautilus-autorun-software.desktop.in.in ---- nautilus-2.25.91/data/nautilus-autorun-software.desktop.in.in.key 2008-09-14 14:14:27.000000000 +0200 -+++ nautilus-2.25.91/data/nautilus-autorun-software.desktop.in.in 2009-02-16 17:24:49.000000000 +0100 -@@ -3,6 +3,7 @@ Encoding=UTF-8 +diff -up nautilus-2.29.1/data/nautilus-autorun-software.desktop.in.desktop-key nautilus-2.29.1/data/nautilus-autorun-software.desktop.in +--- nautilus-2.29.1/data/nautilus-autorun-software.desktop.in.desktop-key 2009-12-17 17:18:10.000000000 +0100 ++++ nautilus-2.29.1/data/nautilus-autorun-software.desktop.in 2009-12-18 11:08:58.000000000 +0100 +@@ -2,6 +2,7 @@ _Name=Autorun Prompt TryExec=nautilus-autorun-software Exec=nautilus-autorun-software %u @@ -9,10 +9,10 @@ diff -up nautilus-2.25.91/data/nautilus-autorun-software.desktop.in.in.key nauti Icon=application-x-executable NoDisplay=true Terminal=false -diff -up nautilus-2.25.91/data/nautilus-autorun-software.desktop.in.key nautilus-2.25.91/data/nautilus-autorun-software.desktop.in ---- nautilus-2.25.91/data/nautilus-autorun-software.desktop.in.key 2009-02-16 14:56:30.000000000 +0100 -+++ nautilus-2.25.91/data/nautilus-autorun-software.desktop.in 2009-02-16 17:24:49.000000000 +0100 -@@ -3,6 +3,7 @@ Encoding=UTF-8 +diff -up nautilus-2.29.1/data/nautilus-autorun-software.desktop.in.in.desktop-key nautilus-2.29.1/data/nautilus-autorun-software.desktop.in.in +--- nautilus-2.29.1/data/nautilus-autorun-software.desktop.in.in.desktop-key 2009-12-15 11:22:12.000000000 +0100 ++++ nautilus-2.29.1/data/nautilus-autorun-software.desktop.in.in 2009-12-18 11:08:58.000000000 +0100 +@@ -2,6 +2,7 @@ _Name=Autorun Prompt TryExec=nautilus-autorun-software Exec=nautilus-autorun-software %u @@ -20,10 +20,10 @@ diff -up nautilus-2.25.91/data/nautilus-autorun-software.desktop.in.key nautilus Icon=application-x-executable NoDisplay=true Terminal=false -diff -up nautilus-2.25.91/data/nautilus-browser.desktop.in.in.key nautilus-2.25.91/data/nautilus-browser.desktop.in.in ---- nautilus-2.25.91/data/nautilus-browser.desktop.in.in.key 2008-10-02 14:26:49.000000000 +0200 -+++ nautilus-2.25.91/data/nautilus-browser.desktop.in.in 2009-02-16 17:24:49.000000000 +0100 -@@ -4,6 +4,7 @@ _Name=File Browser +diff -up nautilus-2.29.1/data/nautilus-browser.desktop.in.desktop-key nautilus-2.29.1/data/nautilus-browser.desktop.in +--- nautilus-2.29.1/data/nautilus-browser.desktop.in.desktop-key 2009-12-17 17:18:10.000000000 +0100 ++++ nautilus-2.29.1/data/nautilus-browser.desktop.in 2009-12-18 11:08:58.000000000 +0100 +@@ -3,6 +3,7 @@ _Name=File Browser _Comment=Browse the file system with the file manager TryExec=nautilus Exec=nautilus --no-desktop --browser %U @@ -31,10 +31,10 @@ diff -up nautilus-2.25.91/data/nautilus-browser.desktop.in.in.key nautilus-2.25. Icon=system-file-manager Terminal=false StartupNotify=true -diff -up nautilus-2.25.91/data/nautilus-browser.desktop.in.key nautilus-2.25.91/data/nautilus-browser.desktop.in ---- nautilus-2.25.91/data/nautilus-browser.desktop.in.key 2009-02-16 14:56:30.000000000 +0100 -+++ nautilus-2.25.91/data/nautilus-browser.desktop.in 2009-02-16 17:24:49.000000000 +0100 -@@ -4,6 +4,7 @@ _Name=File Browser +diff -up nautilus-2.29.1/data/nautilus-browser.desktop.in.in.desktop-key nautilus-2.29.1/data/nautilus-browser.desktop.in.in +--- nautilus-2.29.1/data/nautilus-browser.desktop.in.in.desktop-key 2009-12-15 11:22:12.000000000 +0100 ++++ nautilus-2.29.1/data/nautilus-browser.desktop.in.in 2009-12-18 11:08:58.000000000 +0100 +@@ -3,6 +3,7 @@ _Name=File Browser _Comment=Browse the file system with the file manager TryExec=nautilus Exec=nautilus --no-desktop --browser %U @@ -42,10 +42,10 @@ diff -up nautilus-2.25.91/data/nautilus-browser.desktop.in.key nautilus-2.25.91/ Icon=system-file-manager Terminal=false StartupNotify=true -diff -up nautilus-2.25.91/data/nautilus-computer.desktop.in.in.key nautilus-2.25.91/data/nautilus-computer.desktop.in.in ---- nautilus-2.25.91/data/nautilus-computer.desktop.in.in.key 2008-09-14 14:14:27.000000000 +0200 -+++ nautilus-2.25.91/data/nautilus-computer.desktop.in.in 2009-02-16 17:24:49.000000000 +0100 -@@ -4,6 +4,7 @@ _Name=Computer +diff -up nautilus-2.29.1/data/nautilus-computer.desktop.in.desktop-key nautilus-2.29.1/data/nautilus-computer.desktop.in +--- nautilus-2.29.1/data/nautilus-computer.desktop.in.desktop-key 2009-12-17 17:18:09.000000000 +0100 ++++ nautilus-2.29.1/data/nautilus-computer.desktop.in 2009-12-18 11:08:58.000000000 +0100 +@@ -3,6 +3,7 @@ _Name=Computer _Comment=Browse all local and remote disks and folders accessible from this computer TryExec=nautilus Exec=nautilus --no-desktop computer: @@ -53,10 +53,10 @@ diff -up nautilus-2.25.91/data/nautilus-computer.desktop.in.in.key nautilus-2.25 Icon=computer Terminal=false StartupNotify=true -diff -up nautilus-2.25.91/data/nautilus-computer.desktop.in.key nautilus-2.25.91/data/nautilus-computer.desktop.in ---- nautilus-2.25.91/data/nautilus-computer.desktop.in.key 2009-02-16 14:56:30.000000000 +0100 -+++ nautilus-2.25.91/data/nautilus-computer.desktop.in 2009-02-16 17:24:49.000000000 +0100 -@@ -4,6 +4,7 @@ _Name=Computer +diff -up nautilus-2.29.1/data/nautilus-computer.desktop.in.in.desktop-key nautilus-2.29.1/data/nautilus-computer.desktop.in.in +--- nautilus-2.29.1/data/nautilus-computer.desktop.in.in.desktop-key 2009-12-15 11:22:12.000000000 +0100 ++++ nautilus-2.29.1/data/nautilus-computer.desktop.in.in 2009-12-18 11:08:58.000000000 +0100 +@@ -3,6 +3,7 @@ _Name=Computer _Comment=Browse all local and remote disks and folders accessible from this computer TryExec=nautilus Exec=nautilus --no-desktop computer: @@ -64,32 +64,10 @@ diff -up nautilus-2.25.91/data/nautilus-computer.desktop.in.key nautilus-2.25.91 Icon=computer Terminal=false StartupNotify=true -diff -up nautilus-2.25.91/data/nautilus.desktop.in.in.key nautilus-2.25.91/data/nautilus.desktop.in.in ---- nautilus-2.25.91/data/nautilus.desktop.in.in.key 2009-02-02 13:28:32.000000000 +0100 -+++ nautilus-2.25.91/data/nautilus.desktop.in.in 2009-02-16 17:24:49.000000000 +0100 -@@ -2,6 +2,7 @@ - Encoding=UTF-8 - _Name=File Manager - Exec=nautilus -+X-Gnome-Vfs-System=gio - Icon=system-file-manager - Terminal=false - Type=Application -diff -up nautilus-2.25.91/data/nautilus.desktop.in.key nautilus-2.25.91/data/nautilus.desktop.in ---- nautilus-2.25.91/data/nautilus.desktop.in.key 2009-02-16 14:56:30.000000000 +0100 -+++ nautilus-2.25.91/data/nautilus.desktop.in 2009-02-16 17:24:49.000000000 +0100 -@@ -2,6 +2,7 @@ - Encoding=UTF-8 - _Name=File Manager - Exec=nautilus -+X-Gnome-Vfs-System=gio - Icon=system-file-manager - Terminal=false - Type=Application -diff -up nautilus-2.25.91/data/nautilus.desktop.key nautilus-2.25.91/data/nautilus.desktop ---- nautilus-2.25.91/data/nautilus.desktop.key 2009-02-16 14:56:33.000000000 +0100 -+++ nautilus-2.25.91/data/nautilus.desktop 2009-02-16 17:24:49.000000000 +0100 -@@ -97,6 +97,7 @@ Name[zh_HK]=檔案管理程式 +diff -up nautilus-2.29.1/data/nautilus.desktop.desktop-key nautilus-2.29.1/data/nautilus.desktop +--- nautilus-2.29.1/data/nautilus.desktop.desktop-key 2009-12-17 17:18:12.000000000 +0100 ++++ nautilus-2.29.1/data/nautilus.desktop 2009-12-18 11:08:58.000000000 +0100 +@@ -100,6 +100,7 @@ Name[zh_HK]=檔案管理程式 Name[zh_TW]=檔案管理程式 Name[zu]=Mphathi Hele Exec=nautilus @@ -97,10 +75,32 @@ diff -up nautilus-2.25.91/data/nautilus.desktop.key nautilus-2.25.91/data/nautil Icon=system-file-manager Terminal=false Type=Application -diff -up nautilus-2.25.91/data/nautilus-file-management-properties.desktop.in.in.key nautilus-2.25.91/data/nautilus-file-management-properties.desktop.in.in ---- nautilus-2.25.91/data/nautilus-file-management-properties.desktop.in.in.key 2008-09-14 14:14:27.000000000 +0200 -+++ nautilus-2.25.91/data/nautilus-file-management-properties.desktop.in.in 2009-02-16 17:24:49.000000000 +0100 -@@ -3,6 +3,7 @@ Encoding=UTF-8 +diff -up nautilus-2.29.1/data/nautilus.desktop.in.desktop-key nautilus-2.29.1/data/nautilus.desktop.in +--- nautilus-2.29.1/data/nautilus.desktop.in.desktop-key 2009-12-17 17:18:09.000000000 +0100 ++++ nautilus-2.29.1/data/nautilus.desktop.in 2009-12-18 11:08:58.000000000 +0100 +@@ -1,6 +1,7 @@ + [Desktop Entry] + _Name=File Manager + Exec=nautilus ++X-Gnome-Vfs-System=gio + Icon=system-file-manager + Terminal=false + Type=Application +diff -up nautilus-2.29.1/data/nautilus.desktop.in.in.desktop-key nautilus-2.29.1/data/nautilus.desktop.in.in +--- nautilus-2.29.1/data/nautilus.desktop.in.in.desktop-key 2009-12-15 11:22:12.000000000 +0100 ++++ nautilus-2.29.1/data/nautilus.desktop.in.in 2009-12-18 11:08:58.000000000 +0100 +@@ -1,6 +1,7 @@ + [Desktop Entry] + _Name=File Manager + Exec=nautilus ++X-Gnome-Vfs-System=gio + Icon=system-file-manager + Terminal=false + Type=Application +diff -up nautilus-2.29.1/data/nautilus-file-management-properties.desktop.in.desktop-key nautilus-2.29.1/data/nautilus-file-management-properties.desktop.in +--- nautilus-2.29.1/data/nautilus-file-management-properties.desktop.in.desktop-key 2009-12-17 17:18:09.000000000 +0100 ++++ nautilus-2.29.1/data/nautilus-file-management-properties.desktop.in 2009-12-18 11:08:58.000000000 +0100 +@@ -2,6 +2,7 @@ _Name=File Management _Comment=Change the behaviour and appearance of file manager windows Exec=nautilus-file-management-properties @@ -108,10 +108,10 @@ diff -up nautilus-2.25.91/data/nautilus-file-management-properties.desktop.in.in Icon=system-file-manager Terminal=false Type=Application -diff -up nautilus-2.25.91/data/nautilus-file-management-properties.desktop.in.key nautilus-2.25.91/data/nautilus-file-management-properties.desktop.in ---- nautilus-2.25.91/data/nautilus-file-management-properties.desktop.in.key 2009-02-16 14:56:30.000000000 +0100 -+++ nautilus-2.25.91/data/nautilus-file-management-properties.desktop.in 2009-02-16 17:24:49.000000000 +0100 -@@ -3,6 +3,7 @@ Encoding=UTF-8 +diff -up nautilus-2.29.1/data/nautilus-file-management-properties.desktop.in.in.desktop-key nautilus-2.29.1/data/nautilus-file-management-properties.desktop.in.in +--- nautilus-2.29.1/data/nautilus-file-management-properties.desktop.in.in.desktop-key 2009-12-15 11:22:12.000000000 +0100 ++++ nautilus-2.29.1/data/nautilus-file-management-properties.desktop.in.in 2009-12-18 11:08:58.000000000 +0100 +@@ -2,6 +2,7 @@ _Name=File Management _Comment=Change the behaviour and appearance of file manager windows Exec=nautilus-file-management-properties @@ -119,10 +119,10 @@ diff -up nautilus-2.25.91/data/nautilus-file-management-properties.desktop.in.ke Icon=system-file-manager Terminal=false Type=Application -diff -up nautilus-2.25.91/data/nautilus-folder-handler.desktop.in.in.key nautilus-2.25.91/data/nautilus-folder-handler.desktop.in.in ---- nautilus-2.25.91/data/nautilus-folder-handler.desktop.in.in.key 2008-09-14 14:14:27.000000000 +0200 -+++ nautilus-2.25.91/data/nautilus-folder-handler.desktop.in.in 2009-02-16 17:24:49.000000000 +0100 -@@ -3,6 +3,7 @@ Encoding=UTF-8 +diff -up nautilus-2.29.1/data/nautilus-folder-handler.desktop.in.desktop-key nautilus-2.29.1/data/nautilus-folder-handler.desktop.in +--- nautilus-2.29.1/data/nautilus-folder-handler.desktop.in.desktop-key 2009-12-17 17:18:10.000000000 +0100 ++++ nautilus-2.29.1/data/nautilus-folder-handler.desktop.in 2009-12-18 11:08:58.000000000 +0100 +@@ -2,6 +2,7 @@ _Name=Open Folder TryExec=nautilus Exec=nautilus --no-desktop %U @@ -130,10 +130,10 @@ diff -up nautilus-2.25.91/data/nautilus-folder-handler.desktop.in.in.key nautilu NoDisplay=true Terminal=false Icon=folder-open -diff -up nautilus-2.25.91/data/nautilus-folder-handler.desktop.in.key nautilus-2.25.91/data/nautilus-folder-handler.desktop.in ---- nautilus-2.25.91/data/nautilus-folder-handler.desktop.in.key 2009-02-16 14:56:30.000000000 +0100 -+++ nautilus-2.25.91/data/nautilus-folder-handler.desktop.in 2009-02-16 17:24:49.000000000 +0100 -@@ -3,6 +3,7 @@ Encoding=UTF-8 +diff -up nautilus-2.29.1/data/nautilus-folder-handler.desktop.in.in.desktop-key nautilus-2.29.1/data/nautilus-folder-handler.desktop.in.in +--- nautilus-2.29.1/data/nautilus-folder-handler.desktop.in.in.desktop-key 2009-12-15 11:22:12.000000000 +0100 ++++ nautilus-2.29.1/data/nautilus-folder-handler.desktop.in.in 2009-12-18 11:08:58.000000000 +0100 +@@ -2,6 +2,7 @@ _Name=Open Folder TryExec=nautilus Exec=nautilus --no-desktop %U @@ -141,10 +141,10 @@ diff -up nautilus-2.25.91/data/nautilus-folder-handler.desktop.in.key nautilus-2 NoDisplay=true Terminal=false Icon=folder-open -diff -up nautilus-2.25.91/data/nautilus-home.desktop.in.in.key nautilus-2.25.91/data/nautilus-home.desktop.in.in ---- nautilus-2.25.91/data/nautilus-home.desktop.in.in.key 2008-09-14 14:14:27.000000000 +0200 -+++ nautilus-2.25.91/data/nautilus-home.desktop.in.in 2009-02-16 17:24:49.000000000 +0100 -@@ -4,6 +4,7 @@ _Name=Home Folder +diff -up nautilus-2.29.1/data/nautilus-home.desktop.in.desktop-key nautilus-2.29.1/data/nautilus-home.desktop.in +--- nautilus-2.29.1/data/nautilus-home.desktop.in.desktop-key 2009-12-17 17:18:09.000000000 +0100 ++++ nautilus-2.29.1/data/nautilus-home.desktop.in 2009-12-18 11:08:58.000000000 +0100 +@@ -3,6 +3,7 @@ _Name=Home Folder _Comment=Open your personal folder TryExec=nautilus Exec=nautilus --no-desktop @@ -152,10 +152,10 @@ diff -up nautilus-2.25.91/data/nautilus-home.desktop.in.in.key nautilus-2.25.91/ Icon=user-home Terminal=false StartupNotify=true -diff -up nautilus-2.25.91/data/nautilus-home.desktop.in.key nautilus-2.25.91/data/nautilus-home.desktop.in ---- nautilus-2.25.91/data/nautilus-home.desktop.in.key 2009-02-16 14:56:30.000000000 +0100 -+++ nautilus-2.25.91/data/nautilus-home.desktop.in 2009-02-16 17:24:49.000000000 +0100 -@@ -4,6 +4,7 @@ _Name=Home Folder +diff -up nautilus-2.29.1/data/nautilus-home.desktop.in.in.desktop-key nautilus-2.29.1/data/nautilus-home.desktop.in.in +--- nautilus-2.29.1/data/nautilus-home.desktop.in.in.desktop-key 2009-12-15 11:22:12.000000000 +0100 ++++ nautilus-2.29.1/data/nautilus-home.desktop.in.in 2009-12-18 11:08:58.000000000 +0100 +@@ -3,6 +3,7 @@ _Name=Home Folder _Comment=Open your personal folder TryExec=nautilus Exec=nautilus --no-desktop @@ -163,10 +163,10 @@ diff -up nautilus-2.25.91/data/nautilus-home.desktop.in.key nautilus-2.25.91/dat Icon=user-home Terminal=false StartupNotify=true -diff -up nautilus-2.25.91/src/network-scheme.desktop.in.key nautilus-2.25.91/src/network-scheme.desktop.in ---- nautilus-2.25.91/src/network-scheme.desktop.in.key 2008-09-14 14:14:22.000000000 +0200 -+++ nautilus-2.25.91/src/network-scheme.desktop.in 2009-02-16 17:24:49.000000000 +0100 -@@ -4,6 +4,7 @@ _Name=Network +diff -up nautilus-2.29.1/src/network-scheme.desktop.in.desktop-key nautilus-2.29.1/src/network-scheme.desktop.in +--- nautilus-2.29.1/src/network-scheme.desktop.in.desktop-key 2009-12-15 11:22:12.000000000 +0100 ++++ nautilus-2.29.1/src/network-scheme.desktop.in 2009-12-18 11:08:58.000000000 +0100 +@@ -3,6 +3,7 @@ _Name=Network _Comment=Browse bookmarked and local network locations TryExec=nautilus Exec=nautilus --no-desktop network: diff --git a/nautilus-monitor-change.patch b/nautilus-monitor-change.patch deleted file mode 100644 index 6c10754..0000000 --- a/nautilus-monitor-change.patch +++ /dev/null @@ -1,222 +0,0 @@ -From cd770f34590de85b7ea0f0feccf5657590550918 Mon Sep 17 00:00:00 2001 -From: William Jon McCann -Date: Thu, 3 Dec 2009 23:52:08 -0500 -Subject: [PATCH] Fixes to enable per-monitor backgrounds - -https://bugzilla.gnome.org/show_bug.cgi?id=147808 ---- - eel/eel-background.c | 81 +++++++++++++++++++++---------------------------- - 1 files changed, 35 insertions(+), 46 deletions(-) - -diff --git a/eel/eel-background.c b/eel/eel-background.c -index 9c40629..4d9e8e8 100644 ---- a/eel/eel-background.c -+++ b/eel/eel-background.c -@@ -50,8 +50,8 @@ static void eel_background_init (gpointer objec - static void eel_background_finalize (GObject *object); - static GdkPixmap *eel_background_get_pixmap_and_color (EelBackground *background, - GdkWindow *window, -- GdkColor *color, -- gboolean *changes_with_size); -+ GdkColor *color); -+ - static void set_image_properties (EelBackground *background); - - static void init_fade (EelBackground *background, GtkWidget *widget); -@@ -80,7 +80,6 @@ struct EelBackgroundDetails { - GtkWidget *widget; - - /* Realized data: */ -- gboolean background_changes_with_size; - GdkPixmap *background_pixmap; - gboolean background_pixmap_is_unset_root_pixmap; - GnomeBGCrossfade *fade; -@@ -94,6 +93,8 @@ struct EelBackgroundDetails { - gboolean is_desktop; - /* Desktop screen size watcher */ - gulong screen_size_handler; -+ /* Desktop monitors configuration watcher */ -+ gulong screen_monitors_handler; - /* Can we use common pixmap for root window and desktop window */ - gboolean use_common_pixmap; - guint change_idle_id; -@@ -365,14 +366,6 @@ eel_background_ensure_realized (EelBackground *background, GdkWindow *window) - gdk_rgb_find_color (style->colormap, &(background->details->default_color)); - } - -- /* If the pixmap doesn't change with the window size, never update -- * it again. -- */ -- if (background->details->background_pixmap != NULL && -- !background->details->background_changes_with_size) { -- return FALSE; -- } -- - /* If the window size is the same as last time, don't update */ - if (entire_width == background->details->background_entire_width && - entire_height == background->details->background_entire_height) { -@@ -385,7 +378,6 @@ eel_background_ensure_realized (EelBackground *background, GdkWindow *window) - - set_image_properties (background); - -- background->details->background_changes_with_size = gnome_bg_changes_with_size (background->details->bg); - background->details->background_pixmap = gnome_bg_create_pixmap (background->details->bg, - window, - entire_width, entire_height, -@@ -408,8 +400,7 @@ eel_background_ensure_realized (EelBackground *background, GdkWindow *window) - static GdkPixmap * - eel_background_get_pixmap_and_color (EelBackground *background, - GdkWindow *window, -- GdkColor *color, -- gboolean *changes_with_size) -+ GdkColor *color) - { - int entire_width; - int entire_height; -@@ -419,7 +410,6 @@ eel_background_get_pixmap_and_color (EelBackground *background, - eel_background_ensure_realized (background, window); - - *color = background->details->default_color; -- *changes_with_size = background->details->background_changes_with_size; - - if (background->details->background_pixmap != NULL) { - return g_object_ref (background->details->background_pixmap); -@@ -434,7 +424,6 @@ eel_background_expose (GtkWidget *widget, - GdkColor color; - int window_width; - int window_height; -- gboolean changes_with_size; - GdkPixmap *pixmap; - GdkGC *gc; - GdkGCValues gc_values; -@@ -452,19 +441,8 @@ eel_background_expose (GtkWidget *widget, - - pixmap = eel_background_get_pixmap_and_color (background, - widget->window, -- &color, -- &changes_with_size); -- -- if (!changes_with_size) { -- /* The background was already drawn by X, since we set -- * the GdkWindow background/back_pixmap. -- * No need to draw it again. */ -- if (pixmap) { -- g_object_unref (pixmap); -- } -- return; -- } -- -+ &color); -+ - if (pixmap) { - gc_values.tile = pixmap; - gc_values.ts_x_origin = 0; -@@ -670,12 +648,10 @@ set_root_pixmap (EelBackground *background, - GdkPixmap *pixmap, *root_pixmap; - GdkScreen *screen; - GdkColor color; -- gboolean changes_with_size; - - pixmap = eel_background_get_pixmap_and_color (background, - window, -- &color, -- &changes_with_size); -+ &color); - screen = gdk_drawable_get_screen (window); - - if (background->details->use_common_pixmap) { -@@ -730,7 +706,6 @@ eel_background_set_up_widget (EelBackground *background, GtkWidget *widget) - int window_height; - - GdkWindow *window; -- gboolean changes_with_size; - gboolean in_fade; - - if (!GTK_WIDGET_REALIZED (widget)) { -@@ -741,8 +716,7 @@ eel_background_set_up_widget (EelBackground *background, GtkWidget *widget) - - pixmap = eel_background_get_pixmap_and_color (background, - widget->window, -- &color, -- &changes_with_size); -+ &color); - - style = gtk_widget_get_style (widget); - -@@ -761,17 +735,14 @@ eel_background_set_up_widget (EelBackground *background, GtkWidget *widget) - } - - if (!in_fade) { -- if (!changes_with_size || background->details->is_desktop) { -- gdk_window_set_back_pixmap (window, pixmap, FALSE); -- } else { -- gdk_window_set_back_pixmap (window, NULL, FALSE); -- gdk_window_set_background (window, &color); -- } -+ if (background->details->is_desktop) { -+ gdk_window_set_back_pixmap (window, pixmap, FALSE); -+ } else { -+ gdk_window_set_back_pixmap (window, NULL, FALSE); -+ gdk_window_set_background (window, &color); -+ } - } - -- background->details->background_changes_with_size = -- gnome_bg_changes_with_size (background->details->bg); -- - if (background->details->is_desktop && !in_fade) { - set_root_pixmap (background, window); - } -@@ -869,7 +840,6 @@ screen_size_changed (GdkScreen *screen, EelBackground *background) - g_signal_emit (background, signals[APPEARANCE_CHANGED], 0); - } - -- - static void - widget_realized_setup (GtkWidget *widget, gpointer data) - { -@@ -891,6 +861,13 @@ widget_realized_setup (GtkWidget *widget, gpointer data) - background->details->screen_size_handler = - g_signal_connect (screen, "size_changed", - G_CALLBACK (screen_size_changed), background); -+ if (background->details->screen_monitors_handler > 0) { -+ g_signal_handler_disconnect (screen, -+ background->details->screen_monitors_handler); -+ } -+ background->details->screen_monitors_handler = -+ g_signal_connect (screen, "monitors-changed", -+ G_CALLBACK (screen_size_changed), background); - - root_window = gdk_screen_get_root_window(screen); - -@@ -928,6 +905,11 @@ widget_unrealize_cb (GtkWidget *widget, gpointer data) - background->details->screen_size_handler); - background->details->screen_size_handler = 0; - } -+ if (background->details->screen_monitors_handler > 0) { -+ g_signal_handler_disconnect (gtk_widget_get_screen (GTK_WIDGET (widget)), -+ background->details->screen_monitors_handler); -+ background->details->screen_monitors_handler = 0; -+ } - background->details->use_common_pixmap = FALSE; - } - -@@ -1022,7 +1004,14 @@ eel_get_widget_background (GtkWidget *widget) - gboolean - eel_background_is_dark (EelBackground *background) - { -- return gnome_bg_is_dark (background->details->bg); -+ GdkScreen *screen; -+ GdkRectangle rect; -+ -+ /* only check for the background on the 0th monitor */ -+ screen = gdk_screen_get_default (); -+ gdk_screen_get_monitor_geometry (screen, 0, &rect); -+ -+ return gnome_bg_is_dark (background->details->bg, rect.width, rect.height); - } - - /* handle dropped colors */ --- -1.6.5.2 - diff --git a/nautilus.spec b/nautilus.spec index 1cf7f24..84085bc 100644 --- a/nautilus.spec +++ b/nautilus.spec @@ -4,7 +4,7 @@ %define gnome_icon_theme_version 1.1.5 %define libxml2_version 2.4.20 %define desktop_file_utils_version 0.7 -%define gnome_desktop_version 2.29.3-2 +%define gnome_desktop_version 2.29.4 %define redhat_menus_version 0.25 %define startup_notification_version 0.5 %define libexif_version 0.5.12 @@ -14,11 +14,11 @@ Name: nautilus Summary: File manager for GNOME -Version: 2.28.2 -Release: 3%{?dist} +Version: 2.29.1 +Release: 1%{?dist} License: GPLv2+ Group: User Interface/Desktops -Source: http://download.gnome.org/sources/%{name}/2.28/%{name}-%{version}.tar.bz2 +Source: http://download.gnome.org/sources/%{name}/2.29/%{name}-%{version}.tar.bz2 URL: http://projects.gnome.org/nautilus/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -31,7 +31,6 @@ Requires: libexif >= %{libexif_version} %ifnarch s390 s390x Requires: eject %endif -PreReq: scrollkeeper >= 0.1.4 BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: pango-devel >= %{pango_version} @@ -60,6 +59,9 @@ Requires(pre): GConf2 >= %{gconf_version} Requires(preun): GConf2 >= %{gconf_version} Requires(post): GConf2 >= %{gconf_version} Requires: gnome-desktop >= %{gnome_desktop_version} +Requires(pre): scrollkeeper +Requires(post): scrollkeeper +Requires(postun): scrollkeeper Obsoletes: nautilus-extras Obsoletes: nautilus-suggested @@ -82,19 +84,11 @@ Patch6: nautilus-2.28.1-dynamic-search.patch Patch7: rtl-fix.patch #Patch8: nautilus-2.22.1-hide-white-screen.patch -# from upstream -Patch9: nautilus-2.29.xx-nautilus-directory-leak.patch - Patch10: nautilus-gvfs-desktop-key-2.patch # http://bugzilla.gnome.org/show_bug.cgi?id=519743 Patch17: nautilus-filetype-symlink-fix.patch -# Need to file upstream and investigate a real fix -Patch18: nautilus-2.28.0-revert-bg-fade-break.patch - -# https://bugzilla.gnome.org/show_bug.cgi?id=147808 -Patch20: nautilus-monitor-change.patch %description Nautilus is the file manager and graphical shell for the GNOME desktop @@ -130,11 +124,8 @@ for developing nautilus extensions. %patch6 -p1 -b .dynamic-search %patch7 -p1 -b .rtl-fix # %patch8 -p1 -b .hide-white-screen -%patch9 -p1 -b .memleaks %patch10 -p1 -b .gvfs-desktop-key %patch17 -p0 -b .symlink -%patch18 -p1 -b .revert-bg-fade-break -%patch20 -p1 -b .nautilus-monitor-change %build @@ -270,6 +261,9 @@ fi %changelog +* Fri Dec 18 2009 Tomas Bzatek - 2.29.1-1 +- Update to 2.29.1 + * Thu Dec 10 2009 Jon McCann - 2.28.2-3 - Update the monitor changes patch (gnome #147808) diff --git a/sources b/sources index c5da0c2..ab73cb1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -872ac5a2b875a85473266aa540926596 nautilus-2.28.2.tar.bz2 +d3bb9044b7900bb19a9cbbe0631246bd nautilus-2.29.1.tar.bz2