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

[From: subversion at stage.maemo.org]

Author: jobi
Date: 2007-09-18 14:33:49 +0300 (Tue, 18 Sep 2007)
New Revision: 13887

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

2007-09-18 Johan Bilien  <johan.bilien at nokia.com>

	* src/hd-home-window.c: make sure to save the background always
	when pressing Ok. Fixes: NB#69800



Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-09-18 11:26:51 UTC (rev 13886)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-09-18 11:33:49 UTC (rev 13887)
@@ -1,5 +1,10 @@
 2007-09-18 Johan Bilien  <johan.bilien at nokia.com>
 
+	* src/hd-home-window.c: make sure to save the background always
+	when pressing Ok. Fixes: NB#69800
+
+2007-09-18  Lucas Rocha  <lucas.rocha at nokia.com>
+
 	* src/hd-switcher-menu.c (hd_switcher_menu_show_menu_cb): do not show
 	pressed state in toggle button if there are no applications running
 	and Home key is pressed. Fixes: NB#69681.

Modified: projects/haf/trunk/hildon-desktop/src/hd-home-window.c
===================================================================
--- projects/haf/trunk/hildon-desktop/src/hd-home-window.c	2007-09-18 11:26:51 UTC (rev 13886)
+++ projects/haf/trunk/hildon-desktop/src/hd-home-window.c	2007-09-18 11:33:49 UTC (rev 13887)
@@ -562,6 +562,37 @@
 }
 
 static void
+hd_home_window_save_background (HDHomeWindow *window)
+{
+  HDHomeWindowPrivate  *priv;
+  gchar                *conffile;
+  GError               *save_error = NULL;
+
+  priv = HD_HOME_WINDOW_GET_PRIVATE (window);
+  conffile = g_build_path (G_DIR_SEPARATOR_S,
+                           g_get_home_dir (),
+                           HD_DESKTOP_USER_PATH,
+                           HD_HOME_BACKGROUND_CONF_FILE,
+                           NULL);
+
+  hildon_desktop_background_save (priv->background,
+                                  conffile,
+                                  &save_error);
+
+  if (save_error)
+    {
+      g_warning ("Error when saving background settings to %s: %s",
+                 conffile,
+                 save_error->message);
+      /* Assume flash full */
+      hd_home_window_show_information_note (window, HH_FLASH_FULL_TEXT);
+      g_error_free (save_error);
+    }
+
+  g_free (conffile);
+}
+
+static void
 background_apply_callback (HildonDesktopBackground     *background,
                            Picture                      picture,
                            GError                      *error,
@@ -665,8 +696,6 @@
                                     HDHomeWindow               *window)
 {
   HDHomeWindowPrivate  *priv;
-  gchar                *conffile;
-  GError               *save_error = NULL;
 
   priv = HD_HOME_WINDOW_GET_PRIVATE (window);
 
@@ -676,28 +705,8 @@
   if (error)
     return;
 
-  conffile = g_build_path (G_DIR_SEPARATOR_S,
-                           g_get_home_dir (),
-                           HD_DESKTOP_USER_PATH,
-                           HD_HOME_BACKGROUND_CONF_FILE,
-                           NULL);
+  hd_home_window_save_background (window);
 
-  hildon_desktop_background_save (priv->background,
-                                  conffile,
-                                  &save_error);
-
-  if (save_error)
-    {
-      g_warning ("Error when saving background settings to %s: %s",
-                 conffile,
-                 save_error->message);
-      /* Assume flash full */
-      hd_home_window_show_information_note (window, HH_FLASH_FULL_TEXT);
-      g_error_free (save_error);
-    }
-
-  g_free (conffile);
-
 }
 
 static GdkFilterReturn
@@ -1520,6 +1529,9 @@
                    (HildonDesktopBackgroundApplyCallback)background_apply_and_save_callback,
                    window);
             }
+          else
+            hd_home_window_save_background (window);
+
           g_object_unref (priv->previous_background);
           break;
       case HILDON_HOME_SET_BG_RESPONSE_PREVIEW: