[maemo-commits] [maemo-commits] r13765 - in projects/haf/trunk/hildon-home-webshortcut: . plugin

[From: subversion at stage.maemo.org]

Author: jobi
Date: 2007-09-12 11:03:58 +0300 (Wed, 12 Sep 2007)
New Revision: 13765

Modified:
   projects/haf/trunk/hildon-home-webshortcut/ChangeLog
   projects/haf/trunk/hildon-home-webshortcut/plugin/hildon-home-webshortcut.c
Log:

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

	* plugin/hildon-home-webshortcut.c: if during the first load
	the file is not found, silently revert to the default image.
	Fixes: NB#68762



Modified: projects/haf/trunk/hildon-home-webshortcut/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-home-webshortcut/ChangeLog	2007-09-12 07:40:05 UTC (rev 13764)
+++ projects/haf/trunk/hildon-home-webshortcut/ChangeLog	2007-09-12 08:03:58 UTC (rev 13765)
@@ -1,3 +1,9 @@
+2007-09-12  Johan Bilien  <johan.bilien at nokia.com>
+
+	* plugin/hildon-home-webshortcut.c: if during the first load
+	the file is not found, silently revert to the default image.
+	Fixes: NB#68762
+
 2007-09-10  Johan Bilien  <johan.bilien at nokia.com>
 
 	* configure.ac: 1.9.7

Modified: projects/haf/trunk/hildon-home-webshortcut/plugin/hildon-home-webshortcut.c
===================================================================
--- projects/haf/trunk/hildon-home-webshortcut/plugin/hildon-home-webshortcut.c	2007-09-12 07:40:05 UTC (rev 13764)
+++ projects/haf/trunk/hildon-home-webshortcut/plugin/hildon-home-webshortcut.c	2007-09-12 08:03:58 UTC (rev 13765)
@@ -93,6 +93,10 @@
 HD_DEFINE_PLUGIN_WITH_CODE (Hhws, hhws, HILDON_DESKTOP_TYPE_HOME_ITEM, hhws_background_register_type (module);)
 
 static void
+hhws_apply_and_save_background (Hhws *hhws,
+                                HildonDesktopBackground *background);
+
+static void
 hhws_show_information_note (Hhws *hhws,
                             const gchar *text)
 {
@@ -256,17 +260,38 @@
                                 GError                         *error,
                                 Hhws                           *hhws)
 {
+  static gboolean initial_load = TRUE;
   HhwsPrivate  *priv = hhws->priv;
 
-  g_debug ("webshortcut background applied");
-
   if (error)
   {
-    g_debug ("Error occurred: %s", error->message);
-    hhws_process_error (hhws, error);
+    if (!initial_load)
+      hhws_process_error (hhws, error);
+    else
+    {
+      /* Revert to original image */
+      const gchar *filename =
+          hildon_desktop_background_get_filename (background);
+
+      if (priv->default_image && !g_str_equal (filename, priv->default_image))
+      {
+        HildonDesktopBackground        *default_background;
+
+        default_background = g_object_new (HHWS_TYPE_BACKGROUND,
+                                           "filename", priv->default_image,
+                                           NULL);
+
+        hhws_apply_and_save_background (hhws, default_background);
+        g_object_unref (default_background);
+      }
+    }
+
+    initial_load = FALSE;
     return;
   }
 
+  initial_load = FALSE;
+
   if (priv->picture)
     XRenderFreePicture (GDK_DISPLAY (), priv->picture);