fix patch
This commit is contained in:
parent
0806784922
commit
965bb2845b
@ -1,5 +1,5 @@
|
||||
--- nautilus-2.15.90/libnautilus-private/nautilus-directory-background.c.wallpaper 2006-08-04 11:38:13.000000000 -0400
|
||||
+++ nautilus-2.15.90/libnautilus-private/nautilus-directory-background.c 2006-08-04 12:19:02.000000000 -0400
|
||||
--- nautilus-2.15.90/libnautilus-private/nautilus-directory-background.c.background 2006-08-04 14:58:29.000000000 -0400
|
||||
+++ nautilus-2.15.90/libnautilus-private/nautilus-directory-background.c 2006-08-04 14:59:03.000000000 -0400
|
||||
@@ -442,14 +442,13 @@
|
||||
g_free (image);
|
||||
}
|
||||
@ -27,7 +27,10 @@
|
||||
- if (eel_strcmp (color, old_color) != 0) {
|
||||
- eel_background_set_color (background, color);
|
||||
- changed = TRUE;
|
||||
- }
|
||||
+ eel_background_set_color (background, color);
|
||||
+ if (eel_background_is_desktop(background)) {
|
||||
+ eel_background_set_image_uri_sync (background, image);
|
||||
}
|
||||
- g_free (old_color);
|
||||
-
|
||||
- old_image = eel_background_get_image_uri (background);
|
||||
@ -39,10 +42,7 @@
|
||||
- eel_background_set_image_uri (background, image);
|
||||
- }
|
||||
- changed = TRUE;
|
||||
+ eel_background_set_color (background, color);
|
||||
+ if (eel_background_is_desktop(background)) {
|
||||
+ eel_background_set_image_uri_sync (background, image);
|
||||
}
|
||||
- }
|
||||
- g_free (old_image);
|
||||
-
|
||||
- old_placement = eel_background_get_image_placement (background);
|
||||
@ -56,7 +56,16 @@
|
||||
|
||||
/* Unblock the handler. */
|
||||
g_signal_handlers_unblock_by_func
|
||||
@@ -527,8 +507,7 @@
|
||||
@@ -518,8 +498,6 @@
|
||||
|
||||
g_free (color);
|
||||
g_free (image);
|
||||
-
|
||||
- return changed;
|
||||
}
|
||||
|
||||
/* handle the file changed signal */
|
||||
@@ -527,8 +505,7 @@
|
||||
saved_settings_changed_callback (NautilusFile *file,
|
||||
EelBackground *background)
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user