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

[From: subversion at stage.maemo.org]

Author: jobi
Date: 2007-06-27 19:37:48 +0300 (Wed, 27 Jun 2007)
New Revision: 12520

Modified:
   projects/haf/trunk/hildon-desktop/ChangeLog
   projects/haf/trunk/hildon-desktop/background-manager/Makefile.am
Log:

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

	* background-manager/Makefile.am:
	- added hack to use a longer timeout for async calls. Background
	loading can be longer than the default timeout.



Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-06-27 16:11:01 UTC (rev 12519)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-06-27 16:37:48 UTC (rev 12520)
@@ -1,5 +1,11 @@
 2007-06-27  Johan Bilien  <johan.bilien at nokia.com>
 
+	* background-manager/Makefile.am:
+	- added hack to use a longer timeout for async calls. Background
+	loading can be longer than the default timeout.
+
+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

Modified: projects/haf/trunk/hildon-desktop/background-manager/Makefile.am
===================================================================
--- projects/haf/trunk/hildon-desktop/background-manager/Makefile.am	2007-06-27 16:11:01 UTC (rev 12519)
+++ projects/haf/trunk/hildon-desktop/background-manager/Makefile.am	2007-06-27 16:37:48 UTC (rev 12520)
@@ -20,7 +20,10 @@
 	$(LIBTOOL) --mode=execute $(DBUS_BINDING_TOOL) --prefix=background_manager \
        --mode=glib-client --output=hildon-background-manager-tmp.h \
 			   background-manager.xml
-	cat background-manager.h background-manager-dbus.h hildon-background-manager-tmp.h > hildon-background-manager.h
+	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, /' \	
+	> hildon-background-manager.h
 
 pkgincludedir = $(includedir)/libhildondesktop/libhildondesktop
 pkginclude_HEADERS = hildon-background-manager.h