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

[From: subversion at stage.maemo.org]

Author: jobi
Date: 2007-06-27 17:51:28 +0300 (Wed, 27 Jun 2007)
New Revision: 12517

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

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

	* src/hd-home-window.c:
	- added error handling for background loading
	Fixes: NB#59340, NB#59339, NB#61836, NB#61841
 fixed loading of mask-only picture


Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-06-27 14:45:22 UTC (rev 12516)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-06-27 14:51:28 UTC (rev 12517)
@@ -1,5 +1,11 @@
 2007-06-27  Johan Bilien  <johan.bilien at nokia.com>
 
+	* src/hd-home-window.c:
+	- added error handling for background loading
+	Fixes: NB#59340, NB#59339, NB#61836, NB#61841
+
+2007-06-27  Johan Bilien  <johan.bilien at nokia.com>
+
 	* libhildondesktop/hildon-desktop-picture.c:
 	- fixed loading of mask-only picture
 

Modified: projects/haf/trunk/hildon-desktop/background-manager/background-manager.c
===================================================================
--- projects/haf/trunk/hildon-desktop/background-manager/background-manager.c	2007-06-27 14:45:22 UTC (rev 12516)
+++ projects/haf/trunk/hildon-desktop/background-manager/background-manager.c	2007-06-27 14:51:28 UTC (rev 12517)
@@ -731,6 +731,7 @@
                                    &local_error);
       if (local_error)
         {
+          g_debug ("Got error %i %i %s", local_error->domain, local_error->code, local_error->message);
           g_propagate_error (error, local_error);
           return FALSE;
         }

Modified: projects/haf/trunk/hildon-desktop/src/hd-home-window.c
===================================================================
--- projects/haf/trunk/hildon-desktop/src/hd-home-window.c	2007-06-27 14:45:22 UTC (rev 12516)
+++ projects/haf/trunk/hildon-desktop/src/hd-home-window.c	2007-06-27 14:51:28 UTC (rev 12517)
@@ -44,6 +44,8 @@
 #include <gtk/gtkcheckmenuitem.h>
 #include <gtk/gtkspinbutton.h>
 
+#include <dbus/dbus-glib.h>
+
 #include <X11/Xatom.h>
 #include <X11/extensions/Xrender.h>
 
@@ -677,8 +679,29 @@
 
   if (error)
     {
-      g_warning ("Got error when apply background: %s",
-                 error->message);
+      const gchar *text = NULL;
+      g_warning ("Got error when apply background: %i %i %s  %s",
+                 error->domain,
+                 error->code,
+                 error->message,
+      dbus_g_error_get_name (error));
+      
+      if (dbus_g_error_has_name (error,
+                                 "org.freedesktop.DBus.GLib.UnmappedError.BackgroundManagerErrorQuark.Code2"))
+        text = HH_FILE_CORRUPTED_TEXT;
+      else if ((dbus_g_error_has_name (error,
+                                       "org.freedesktop.DBus.GLib.UnmappedError.BackgroundManagerErrorQuark.Code1")))
+        text = HH_NO_CONNECTION_TEXT;
+      else if ((dbus_g_error_has_name (error,
+                                       "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.Code7")))
+        text = HH_NO_CONNECTION_TEXT;
+
+      if (text)
+        hd_home_window_show_information_note (window, text);
+
       return;
     }
 
@@ -842,14 +865,10 @@
           GdkDrawable              *drawable;
           gint                      x_offset, y_offset;
 
-          g_debug ("About to draw background");
-
           gdk_window_get_internal_paint_info (widget->window,
                                               &drawable,
                                               &x_offset, &y_offset);
 
-          g_debug ("Got offset: %i, %i", x_offset, y_offset);
-
           picture = hildon_desktop_picture_from_drawable (drawable);
 
           XRenderComposite (GDK_DISPLAY (),