2011-07-26 Padraig O'Briain <
[email protected]>
* patches/nautilus-17-background-fade.diff,
* patches/nautilus-18-peek-display-name.diff,
* patches/nautilus-19-mime-cleanup.diff,
* base-specs/nautilus.spec: Remove patches as no longer needed.
--- a/ChangeLog Tue Jul 26 07:05:26 2011 +0000
+++ b/ChangeLog Tue Jul 26 08:39:23 2011 +0000
@@ -1,3 +1,10 @@
+2011-07-26 Padraig O'Briain <[email protected]>
+
+ * patches/nautilus-17-background-fade.diff,
+ * patches/nautilus-18-peek-display-name.diff,
+ * patches/nautilus-19-mime-cleanup.diff,
+ * base-specs/nautilus.spec: Remove patches as no longer needed.
+
2011-07-26 Padraig O'Briain <[email protected]>
* patches/nautilus-15-search-crash.diff: Remove as no longer needed.
--- a/base-specs/nautilus.spec Tue Jul 26 07:05:26 2011 +0000
+++ b/base-specs/nautilus.spec Tue Jul 26 08:39:23 2011 +0000
@@ -59,12 +59,6 @@
Patch14: nautilus-14-zfs-snapshot.diff
#owner:padraig date:2011-02-08 type:bug feature:7017527 bugzilla:641740
Patch16: nautilus-16-rename-places.diff
-#owner:migi date:2011-02-14 type:bug doo:14557
-Patch17: nautilus-17-background-fade.diff
-#owner:yippi date:2011-02-28 type:bug bugzilla:602500 bugster:7023624
-Patch18: nautilus-18-peek-display-name.diff
-#owner: gheet date:2011-03-23 type:bug bugzilla:612694 bugster:7022478
-Patch19: nautilus-19-mime-cleanup.diff
#owner: yippi date:2011-07-07 type:branding
Patch20: nautilus-20-libxml.diff
@@ -153,9 +147,6 @@
%patch13 -p1
%patch14 -p1
%patch16 -p1
-#%patch17 -p1
-#%patch18 -p1
-#%patch19 -p1
%patch20 -p1
cp %SOURCE4 icons
@@ -260,6 +251,9 @@
%changelog
* Tue Jul 26 2011 - [email protected]
- Remove patch nautilus-15-search-crash.diff as no longer required.
+- Remove patch nautilus-17-background-fade.diff as no longer required.
+- Remove patch nautilus-18-peek-display-name.diff as no longer required.
+- Remove patch nautilus-19-mime-cleanup.diff as no longer required.
* Thu Jul 07 2011 - [email protected]
- Bump to 3.1.3.
* Mon Feb 28 2011 - [email protected]
--- a/patches/nautilus-17-background-fade.diff Tue Jul 26 07:05:26 2011 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,113 +0,0 @@
---- nautilus-2.30.1/libnautilus-private/apps_nautilus_preferences.schemas.in-orig 2010-06-29 14:52:32.523767583 -0500
-+++ nautilus-2.30.1/libnautilus-private/apps_nautilus_preferences.schemas.in 2010-06-29 14:55:16.878722835 -0500
-@@ -599,6 +599,17 @@ most cases, this should be left alone. S
- </locale>
- </schema>
-
-+ <schema>
-+ <key>/schemas/apps/nautilus/preferences/background_fade</key>
-+ <applyto>/apps/nautilus/preferences/background_fade</applyto>
-+ <owner>nautilus</owner>
-+ <type>bool</type>
-+ <default>true</default>
-+ <locale name="C">
-+ <short>Fade Background Transition</short>
-+ <long>If true, a background fade transition is used.</long>
-+ </locale>
-+ </schema>
-
- <schema>
- <key>/schemas/apps/nautilus/preferences/side_pane_background_set</key>
---- nautilus-2.30.1/eel/eel-background.c-orig 2010-07-06 19:01:46.392468696 -0500
-+++ nautilus-2.30.1/eel/eel-background.c 2010-07-06 19:15:38.145714033 -0500
-@@ -83,6 +83,7 @@ struct EelBackgroundDetails {
- GdkPixmap *background_pixmap;
- gboolean background_pixmap_is_unset_root_pixmap;
- GnomeBGCrossfade *fade;
-+ gboolean do_fade;
- int background_entire_width;
- int background_entire_height;
- GdkColor default_color;
-@@ -175,6 +176,7 @@ eel_background_init (gpointer object, gp
- background->details->default_color.blue = 0xffff;
- background->details->bg = gnome_bg_new ();
- background->details->is_active = TRUE;
-+ background->details->do_fade = TRUE;
-
- g_signal_connect (background->details->bg, "changed",
- G_CALLBACK (on_bg_changed), background);
-@@ -588,6 +590,13 @@ eel_background_set_color (EelBackground
- }
- }
-
-+void
-+eel_background_set_fade (EelBackground *background,
-+ gboolean use_fade)
-+{
-+ background->details->do_fade = use_fade;
-+}
-+
- static gboolean
- eel_background_set_image_uri_helper (EelBackground *background,
- const char *image_uri,
-@@ -821,6 +830,10 @@ init_fade (EelBackground *background, Gt
- return;
- }
-
-+ if (background->details->do_fade == FALSE) {
-+ return;
-+ }
-+
- if (background->details->fade == NULL) {
- int old_width, old_height, width, height;
-
---- nautilus-2.30.1/eel/eel-background.h-orig 2010-07-06 19:01:53.567007405 -0500
-+++ nautilus-2.30.1/eel/eel-background.h 2010-07-06 19:03:33.254989697 -0500
-@@ -81,6 +81,8 @@ void eel_backgrou
- void eel_background_set_image_uri (EelBackground *background,
- const char *image_uri);
-
-+void eel_background_set_fade (EelBackground *background,
-+ gboolean use_fade);
- void eel_background_reset (EelBackground *background);
- void eel_background_set_image_placement (EelBackground *background,
- EelBackgroundImagePlacement placement);
---- nautilus-2.30.1/libnautilus-private/nautilus-directory-background.c-orig 2010-07-06 18:51:08.541060728 -0500
-+++ nautilus-2.30.1/libnautilus-private/nautilus-directory-background.c 2010-07-06 19:18:56.681383081 -0500
-@@ -441,6 +441,7 @@ initialize_background_from_settings (Nau
- {
- char *color;
- char *image;
-+ gboolean fade;
- EelBackgroundImagePlacement placement;
-
- g_assert (NAUTILUS_IS_FILE (file));
-@@ -448,6 +449,9 @@ initialize_background_from_settings (Nau
- g_assert (g_object_get_data (G_OBJECT (background), "eel_background_file")
- == file);
-
-+ fade = eel_preferences_get_boolean
-+ (NAUTILUS_PREFERENCES_BACKGROUND_FADE);
-+
- if (eel_background_is_desktop (background)) {
- nautilus_file_background_read_desktop_settings (&color, &image, &placement);
- } else {
-@@ -477,6 +481,7 @@ initialize_background_from_settings (Nau
- eel_background_set_color (background, color);
- eel_background_set_image_uri (background, image);
- eel_background_set_image_placement (background, placement);
-+ eel_background_set_fade (background, fade);
-
- /* Unblock the handler. */
- g_signal_handlers_unblock_by_func
---- nautilus-2.30.1/libnautilus-private/nautilus-global-preferences.h-orig 2010-07-06 18:57:54.262721921 -0500
-+++ nautilus-2.30.1/libnautilus-private/nautilus-global-preferences.h 2010-07-06 18:58:47.315740074 -0500
-@@ -40,6 +40,7 @@ G_BEGIN_DECLS
- #define NAUTILUS_PREFERENCES_BACKGROUND_SET "preferences/background_set"
- #define NAUTILUS_PREFERENCES_BACKGROUND_COLOR "preferences/background_color"
- #define NAUTILUS_PREFERENCES_BACKGROUND_FILENAME "preferences/background_filename"
-+#define NAUTILUS_PREFERENCES_BACKGROUND_FADE "preferences/background_fade"
-
- /* Side Pane Background options */
- #define NAUTILUS_PREFERENCES_SIDE_PANE_BACKGROUND_SET "preferences/side_pane_background_set"
-
--- a/patches/nautilus-18-peek-display-name.diff Tue Jul 26 07:05:26 2011 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-From b10ccbc58d8d7f2ebb9ded079ec2a36e2f4603ad Mon Sep 17 00:00:00 2001
-From: Tomas Bzatek <[email protected]>
-Date: Thu, 27 Jan 2011 10:22:10 +0000
-Subject: Prevent a crash in nautilus_file_peek_display_name() on invalid NautilusFile
-
-This is more a workaround only, expect assert failures at other
-places when something bad happens. There's a race condition somewhere,
-this patch only prevents immediate crash.
-
-Patch by Marcus Husar <[email protected]>
-
-https://bugzilla.gnome.org/show_bug.cgi?id=602500
----
-diff --git a/libnautilus-private/nautilus-file.c b/libnautilus-private/nautilus-file.c
-index 2c5b868..c854163 100644
---- a/libnautilus-private/nautilus-file.c
-+++ b/libnautilus-private/nautilus-file.c
-@@ -3780,6 +3780,9 @@ nautilus_file_peek_display_name (NautilusFile *file)
- const char *name;
- char *escaped_name;
-
-+ if (file == NULL || nautilus_file_is_gone (file))
-+ return "";
-+
- /* Default to display name based on filename if its not set yet */
-
- if (file->details->display_name == NULL) {
---
-cgit v0.8.3.4
--- a/patches/nautilus-19-mime-cleanup.diff Tue Jul 26 07:05:26 2011 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-diff -urN nautilus-2.30.1/data/nautilus-folder-handler.desktop.in.in ../SUNWgnome-file-mgr-2.30.1.hacked/nautilus-2.30.1/data/nautilus-folder-handler.desktop.in.in
---- nautilus-2.30.1/data/nautilus-folder-handler.desktop.in.in 2009-12-15 10:22:12.000000000 +0000
-+++ ../SUNWgnome-file-mgr-2.30.1.hacked/nautilus-2.30.1/data/nautilus-folder-handler.desktop.in.in 2011-03-23 14:08:31.164403827 +0000
-@@ -7,7 +7,7 @@
- Icon=folder-open
- StartupNotify=true
- Type=Application
--MimeType=x-directory/gnome-default-handler;x-directory/normal;inode/directory;application/x-gnome-saved-search;
-+MimeType=inode/directory;application/x-gnome-saved-search;
- OnlyShowIn=GNOME;
- X-GNOME-Bugzilla-Bugzilla=GNOME
- X-GNOME-Bugzilla-Product=nautilus