rpms/gnome-settings-daemon
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- Over the releases we've accumulated default.png, default-wide.png

Browse Source 
default-5_4.png and default.jpg. We haven't been able to drop them
    because it would leave some users with white backgrounds on upgrade.
    This patch just falls back to the default image if the user's
    background doesn't exist.
This commit is contained in:
Ray Strode 2008-03-31 15:07:22 +00:00
parent c4f3522483
commit d06746449f
2 changed files with 39 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
gnome-settings-daemon-2.22.1-hide-white-screen.patch Normal file
View File

@ -0,0 +1,30 @@
diff -up gnome-settings-daemon-2.22.1/plugins/background/libbackground/preferences.c.hide-white-screen gnome-settings-daemon-2.22.1/plugins/background/libbackground/preferences.c
--- gnome-settings-daemon-2.22.1/plugins/background/libbackground/preferences.c.hide-white-screen 2008-03-31 10:37:43.000000000 -0400
+++ gnome-settings-daemon-2.22.1/plugins/background/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);

10
gnome-settings-daemon.spec
View File

@ -1,6 +1,6 @@
Name: gnome-settings-daemon
Version: 2.22.1
Release: 0.2008.03.26.3%{?dist}
Release: 0.2008.03.26.4%{?dist}
Summary: The daemon sharing settings from GNOME to GTK+/KDE applications
Group: System Environment/Daemons
@ -33,6 +33,7 @@ Patch2: gnome-settings-daemon-2.21.91-ignore-model-if-evdev.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=438942
# http://bugzilla.gnome.org/show_bug.cgi?id=524499
Patch3: gsd-mouse-too-much-grab.patch
Patch4: gnome-settings-daemon-2.22.1-hide-white-screen.patch
%description
A daemon to share settings from GNOME to other applications. It also
@ -57,6 +58,7 @@ developing applications that use %{name}.
pushd plugins/mouse/
%patch3 -p0 -b .no-eat-keys
popd
%patch4 -p1 -b .hide-white-screen
%build
%configure --enable-static=no --enable-profiling
@ -138,6 +140,12 @@ fi
%{_libdir}/pkgconfig/gnome-settings-daemon.pc
%changelog
* Mon Mar 31 2008 - Ray Strode <rstrode@redhat.com> - 2.22.1-0.2008.03.26.4
- Over the releases we've accumulated default.png, default-wide.png default-5_4.png
and default.jpg. We haven't been able to drop them because it would leave some
users with white backgrounds on upgrade. This patch just falls back to the
default image if the user's background doesn't exist.
* Wed Mar 26 2008 - Bastien Nocera <bnocera@redhat.com> - 2.22.1-0.2008.03.26.3
- Add patch for the mouse plugin not to eat multimedia key events (#438942)