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

[From: subversion at stage.maemo.org]

Author: jobi
Date: 2007-08-01 13:57:25 +0300 (Wed, 01 Aug 2007)
New Revision: 12979

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

2007-08-01  Johan Bilien  <johan.bilien at nokia.com>

	* background-manager/Makefile.am:
	- increase timeout to 2 minutes
	* src/hd-home-window.c:
	- handle the out-of-memory situation more gracefully



Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-08-01 10:19:54 UTC (rev 12978)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-08-01 10:57:25 UTC (rev 12979)
@@ -1,3 +1,10 @@
+2007-08-01  Johan Bilien  <johan.bilien at nokia.com>
+
+	* background-manager/Makefile.am:
+	- increase timeout to 2 minutes
+	* src/hd-home-window.c:
+	- handle the out-of-memory situation more gracefully
+
 2007-07-31  Lucas Rocha  <lucas.rocha at nokia.com>
 
 	* src/hd-applications-menu.c

Modified: projects/haf/trunk/hildon-desktop/background-manager/Makefile.am
===================================================================
--- projects/haf/trunk/hildon-desktop/background-manager/Makefile.am	2007-08-01 10:19:54 UTC (rev 12978)
+++ projects/haf/trunk/hildon-desktop/background-manager/Makefile.am	2007-08-01 10:57:25 UTC (rev 12979)
@@ -22,7 +22,7 @@
 			   background-manager.xml
 	cat background-manager.h background-manager-dbus.h hildon-background-manager-tmp.h |\
 	sed 's/dbus_g_proxy_begin_call/dbus_g_proxy_begin_call_with_timeout/' |\
-        sed 's/g_free, /g_free, 60000, /' \
+        sed 's/g_free, /g_free, 120000, /' \
 	> hildon-background-manager.h
 
 pkgincludedir = $(includedir)/libhildondesktop/libhildondesktop

Modified: projects/haf/trunk/hildon-desktop/src/hd-home-window.c
===================================================================
--- projects/haf/trunk/hildon-desktop/src/hd-home-window.c	2007-08-01 10:19:54 UTC (rev 12978)
+++ projects/haf/trunk/hildon-desktop/src/hd-home-window.c	2007-08-01 10:57:25 UTC (rev 12979)
@@ -667,6 +667,9 @@
                                  "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.Code0")))
+        text = HH_LOW_MEMORY_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,
@@ -678,6 +681,9 @@
       else if ((dbus_g_error_has_name (error,
                                        "org.freedesktop.DBus.GLib.UnmappedError.BackgroundManagerErrorQuark.Code7")))
         text = HH_NO_CONNECTION_TEXT;
+      else if ((dbus_g_error_has_name (error,
+                                       "org.freedesktop.DBus.GLib.UnmappedError.GdkPixbufErrorQuark.Code1")))
+        text = HH_LOW_MEMORY_TEXT;
 
       if (text)
         hd_home_window_show_information_note (window, text);