[maemo-commits] [maemo-commits] r12873 - in projects/haf/trunk/hildon-desktop: . background-manager src

[From: subversion at stage.maemo.org]

Author: jobi
Date: 2007-07-27 14:14:35 +0300 (Fri, 27 Jul 2007)
New Revision: 12873

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

2007-07-27  Johan Bilien  <johan.bilien at nokia.com>

	* background-manager/hbm-background.c: treat storage full
	in a special case
	* src/hd-home-window.c: show a "flash full" banner,
	if the cache could not be written or if the background settings
	could not be saved.
	Fixes: NB#62511



Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-07-27 11:09:19 UTC (rev 12872)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-07-27 11:14:35 UTC (rev 12873)
@@ -1,3 +1,12 @@
+2007-07-27  Johan Bilien  <johan.bilien at nokia.com>
+
+	* background-manager/hbm-background.c: treat storage full
+	in a special case
+	* src/hd-home-window.c: show a "flash full" banner,
+	if the cache could not be written or if the background settings
+	could not be saved.
+	Fixes: NB#62511
+
 2007-07-27  Lucas Rocha  <lucas.rocha at nokia.com>
 
 	* src/hd-desktop.c (hd_desktop_init): do not abord if it's not

Modified: projects/haf/trunk/hildon-desktop/background-manager/hbm-background.c
===================================================================
--- projects/haf/trunk/hildon-desktop/background-manager/hbm-background.c	2007-07-27 11:09:19 UTC (rev 12872)
+++ projects/haf/trunk/hildon-desktop/background-manager/hbm-background.c	2007-07-27 11:14:35 UTC (rev 12873)
@@ -550,6 +550,14 @@
   hbm_background_is_oom (background, error);
   if (*error) return;
 
+  if (result == GNOME_VFS_ERROR_NO_SPACE)
+  {
+    g_set_error (error,
+                 BACKGROUND_MANAGER_ERROR,
+                 BACKGROUND_MANAGER_ERROR_FLASH_FULL,
+                 "Unable to write to cache: device is full");
+  }
+
   if (result != GNOME_VFS_OK)
   {
     g_set_error (error,

Modified: projects/haf/trunk/hildon-desktop/src/hd-home-window.c
===================================================================
--- projects/haf/trunk/hildon-desktop/src/hd-home-window.c	2007-07-27 11:09:19 UTC (rev 12872)
+++ projects/haf/trunk/hildon-desktop/src/hd-home-window.c	2007-07-27 11:14:35 UTC (rev 12873)
@@ -673,6 +673,9 @@
                                        "org.freedesktop.DBus.GLib.UnmappedError.BackgroundManagerErrorQuark.Code4")))
         text = HH_MMC_OPEN_TEXT;
       else if ((dbus_g_error_has_name (error,
+                                       "org.freedesktop.DBus.GLib.UnmappedError.BackgroundManagerErrorQuark.Code6")))
+        text = HH_FLASH_FULL_TEXT;
+      else if ((dbus_g_error_has_name (error,
                                        "org.freedesktop.DBus.GLib.UnmappedError.BackgroundManagerErrorQuark.Code7")))
         text = HH_NO_CONNECTION_TEXT;
 
@@ -736,6 +739,8 @@
       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);
     }