[maemo-commits] [maemo-commits] r12242 - in projects/haf/trunk/hildon-desktop: . src

[From: subversion at stage.maemo.org]

Author: jobi
Date: 2007-06-11 20:33:36 +0300 (Mon, 11 Jun 2007)
New Revision: 12242

Modified:
   projects/haf/trunk/hildon-desktop/ChangeLog
   projects/haf/trunk/hildon-desktop/src/hd-home-background-dialog.c
   projects/haf/trunk/hildon-desktop/src/hd-home-window.c
Log:

2007-06-11  Johan Bilien  <johan.bilien at nokia.com>

	* src/hd-home-window.c:
	- copy the background before applying, so further changes
	in the dialog won't affect it.
	Fixes: NB#57657



Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-06-11 17:30:34 UTC (rev 12241)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-06-11 17:33:36 UTC (rev 12242)
@@ -1,5 +1,12 @@
 2007-06-11  Johan Bilien  <johan.bilien at nokia.com>
 
+	* src/hd-home-window.c:
+	- copy the background before applying, so further changes
+	in the dialog won't affect it.
+	Fixes: NB#57657
+
+2007-06-11  Johan Bilien  <johan.bilien at nokia.com>
+
 	* src/hd-home-background.c:
 	- default value for background modes is Centered.
 	Fixes: NB#57648

Modified: projects/haf/trunk/hildon-desktop/src/hd-home-background-dialog.c
===================================================================
--- projects/haf/trunk/hildon-desktop/src/hd-home-background-dialog.c	2007-06-11 17:30:34 UTC (rev 12241)
+++ projects/haf/trunk/hildon-desktop/src/hd-home-background-dialog.c	2007-06-11 17:33:36 UTC (rev 12242)
@@ -683,6 +683,8 @@
 
   mode = gtk_combo_box_get_active (GTK_COMBO_BOX (priv->mode_combo));
 
+  g_debug ("Setting mode on dialog background to %i", mode);
+
   g_object_set (G_OBJECT (priv->background),
                 "mode", mode,
                 NULL);

Modified: projects/haf/trunk/hildon-desktop/src/hd-home-window.c
===================================================================
--- projects/haf/trunk/hildon-desktop/src/hd-home-window.c	2007-06-11 17:30:34 UTC (rev 12241)
+++ projects/haf/trunk/hildon-desktop/src/hd-home-window.c	2007-06-11 17:33:36 UTC (rev 12242)
@@ -1854,7 +1854,6 @@
     {
       case GTK_RESPONSE_OK:
           gtk_widget_hide (GTK_WIDGET(dialog));
-          g_debug ("BACKGROUND_OK");
           if (!hd_home_background_equal (priv->background,
                                          background))
             {
@@ -1864,7 +1863,7 @@
                                    hd_home_window_set_background_timeout,
                                  window);
               hd_home_background_apply_async
-                  (background,
+                  (hd_home_background_copy (background),
                    GTK_WIDGET (window)->window,
                    workarea,
                    (HDHomeBackgroundApplyCallback)background_apply_and_save_callback,
@@ -1880,7 +1879,7 @@
                                    hd_home_window_set_background_timeout,
                                  window);
               hd_home_background_apply_async
-                  (background,
+                  (hd_home_background_copy (background),
                    GTK_WIDGET (window)->window,
                    workarea,
                    (HDHomeBackgroundApplyCallback)background_apply_callback,
@@ -1912,6 +1911,8 @@
       default:
           break;
     }
+
+  g_object_unref (background);
 }
 
 static void