From ffd89e33be72c0cc7f73797f52ac924f29cb32da Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Mon, 7 May 2012 18:21:30 +0300 Subject: [PATCH] Drop one more unneeded patch and comment on the others --- nautilus-2.22.1-hide-white-screen.patch | 29 ------------------------- nautilus.spec | 5 +++-- 2 files changed, 3 insertions(+), 31 deletions(-) delete mode 100644 nautilus-2.22.1-hide-white-screen.patch diff --git a/nautilus-2.22.1-hide-white-screen.patch b/nautilus-2.22.1-hide-white-screen.patch deleted file mode 100644 index c086189..0000000 --- a/nautilus-2.22.1-hide-white-screen.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- nautilus-2.22.1/libbackground/preferences.c.hide-white-screen 2008-03-31 10:37:43.000000000 -0400 -+++ nautilus-2.22.1/libbackground/preferences.c 2008-03-31 10:39:27.000000000 -0400 -@@ -252,6 +252,26 @@ bg_preferences_load (BGPreferences *pref - else - prefs->wallpaper_filename = g_filename_from_utf8 (tmp, -1, NULL, - NULL, NULL); -+ -+ if (!g_file_test (prefs->wallpaper_filename, G_FILE_TEST_EXISTS)) { -+ GConfValue *default_value; -+ default_value = gconf_client_get_default_from_schema (client, -+ BG_PREFERENCES_DRAW_BACKGROUND, NULL); -+ if (default_value != NULL) { -+ prefs->enabled = gconf_value_get_bool (default_value); -+ gconf_value_free (default_value); -+ -+ g_free (prefs->wallpaper_filename); -+ prefs->wallpaper_filename = NULL; -+ -+ default_value = gconf_client_get_default_from_schema (client, -+ BG_PREFERENCES_PICTURE_FILENAME, NULL); -+ if (default_value != NULL) { -+ prefs->wallpaper_filename = g_strdup (gconf_value_get_string (default_value)); -+ gconf_value_free (default_value); -+ } -+ } -+ } - } - g_free (tmp); - diff --git a/nautilus.spec b/nautilus.spec index 5f9320f..84becb7 100644 --- a/nautilus.spec +++ b/nautilus.spec @@ -54,11 +54,12 @@ Provides: gnome-volume-manager = 2.24.0-2 Obsoletes: eel2 < 2.26.0-3 Provides: eel2 = 2.26.0-3 -# Why is this still not upstream ?! +# The selinux patch is here to not lose it, should go upstream and needs +# cleaning up to work with current nautilus git. #Patch4: nautilus-2.91.8-selinux.patch +# Fixed in upstream commit db0b28fd Patch7: rtl-fix.patch -#Patch8: nautilus-2.22.1-hide-white-screen.patch %description Nautilus is the file manager and graphical shell for the GNOME desktop