|
|
965bb28 |
--- nautilus-2.15.90/libnautilus-private/nautilus-directory-background.c.background 2006-08-04 14:58:29.000000000 -0400
|
|
|
965bb28 |
+++ nautilus-2.15.90/libnautilus-private/nautilus-directory-background.c 2006-08-04 14:59:03.000000000 -0400
|
|
|
0806784 |
@@ -442,14 +442,13 @@
|
|
|
0806784 |
g_free (image);
|
|
|
0806784 |
}
|
|
|
0806784 |
|
|
|
0806784 |
-static gboolean
|
|
|
0806784 |
+static void
|
|
|
0806784 |
initialize_background_from_settings (NautilusFile *file,
|
|
|
0806784 |
EelBackground *background)
|
|
|
0806784 |
{
|
|
|
0806784 |
char *color, *old_color;
|
|
|
0806784 |
char *image, *old_image;
|
|
|
0806784 |
EelBackgroundImagePlacement placement, old_placement;
|
|
|
0806784 |
- gboolean changed;
|
|
|
0806784 |
|
|
|
0806784 |
g_assert (NAUTILUS_IS_FILE (file));
|
|
|
0806784 |
g_assert (EEL_IS_BACKGROUND (background));
|
|
|
0806784 |
@@ -482,33 +481,14 @@
|
|
|
0806784 |
G_CALLBACK (background_changed_callback),
|
|
|
0806784 |
file);
|
|
|
0806784 |
|
|
|
0806784 |
-
|
|
|
0806784 |
- changed = FALSE;
|
|
|
0806784 |
-
|
|
|
0806784 |
- old_color = eel_background_get_color (background);
|
|
|
0806784 |
- if (eel_strcmp (color, old_color) != 0) {
|
|
|
0806784 |
- eel_background_set_color (background, color);
|
|
|
0806784 |
- changed = TRUE;
|
|
|
965bb28 |
+ eel_background_set_color (background, color);
|
|
|
965bb28 |
+ if (eel_background_is_desktop(background)) {
|
|
|
965bb28 |
+ eel_background_set_image_uri_sync (background, image);
|
|
|
965bb28 |
}
|
|
|
0806784 |
- g_free (old_color);
|
|
|
0806784 |
-
|
|
|
0806784 |
- old_image = eel_background_get_image_uri (background);
|
|
|
0806784 |
- if (eel_strcmp (image, old_image) != 0) {
|
|
|
0806784 |
- if (eel_background_is_desktop(background)) {
|
|
|
0806784 |
- eel_background_set_image_uri_sync (background, image);
|
|
|
0806784 |
- }
|
|
|
0806784 |
- else {
|
|
|
0806784 |
- eel_background_set_image_uri (background, image);
|
|
|
0806784 |
- }
|
|
|
0806784 |
- changed = TRUE;
|
|
|
965bb28 |
- }
|
|
|
0806784 |
- g_free (old_image);
|
|
|
0806784 |
-
|
|
|
0806784 |
- old_placement = eel_background_get_image_placement (background);
|
|
|
0806784 |
- if (old_placement != placement) {
|
|
|
0806784 |
- eel_background_set_image_placement (background, placement);
|
|
|
0806784 |
- changed = TRUE;
|
|
|
0806784 |
+ else {
|
|
|
0806784 |
+ eel_background_set_image_uri (background, image);
|
|
|
0806784 |
}
|
|
|
0806784 |
+ eel_background_set_image_placement (background, placement);
|
|
|
0806784 |
|
|
|
0806784 |
/* Unblock the handler. */
|
|
|
0806784 |
g_signal_handlers_unblock_by_func
|
|
|
965bb28 |
@@ -518,8 +498,6 @@
|
|
|
965bb28 |
|
|
|
965bb28 |
g_free (color);
|
|
|
965bb28 |
g_free (image);
|
|
|
965bb28 |
-
|
|
|
965bb28 |
- return changed;
|
|
|
965bb28 |
}
|
|
|
965bb28 |
|
|
|
965bb28 |
/* handle the file changed signal */
|
|
|
965bb28 |
@@ -527,8 +505,7 @@
|
|
|
0806784 |
saved_settings_changed_callback (NautilusFile *file,
|
|
|
0806784 |
EelBackground *background)
|
|
|
0806784 |
{
|
|
|
0806784 |
- gboolean changed;
|
|
|
0806784 |
- changed = initialize_background_from_settings (file, background);
|
|
|
0806784 |
+ initialize_background_from_settings (file, background);
|
|
|
0806784 |
}
|
|
|
0806784 |
|
|
|
0806784 |
/* handle the theme changing */
|