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

Drop one more unneeded patch and comment on the others

Browse Source
This commit is contained in:
Kalev Lember 2012-05-07 18:21:30 +03:00
parent b87405a3e6
commit ffd89e33be
2 changed files with 3 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
nautilus-2.22.1-hide-white-screen.patch
View File

@ -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);

5
nautilus.spec
View File

@ -54,11 +54,12 @@ Provides: gnome-volume-manager = 2.24.0-2
Obsoletes: eel2 < 2.26.0-3 Obsoletes: eel2 < 2.26.0-3
Provides: 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 #Patch4: nautilus-2.91.8-selinux.patch
# Fixed in upstream commit db0b28fd
Patch7: rtl-fix.patch Patch7: rtl-fix.patch
#Patch8: nautilus-2.22.1-hide-white-screen.patch
%description %description
Nautilus is the file manager and graphical shell for the GNOME desktop Nautilus is the file manager and graphical shell for the GNOME desktop