[maemo-commits] [maemo-commits] r12490 - in projects/haf/trunk/hildon-desktop: . src

[From: subversion at stage.maemo.org]

Author: jobi
Date: 2007-06-26 17:31:49 +0300 (Tue, 26 Jun 2007)
New Revision: 12490

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

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

	* src/hd-home-window.c:
	- do not show the cancel note when cancelling the dialog.
	Fixes: NB#61793



Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-06-26 14:24:53 UTC (rev 12489)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-06-26 14:31:49 UTC (rev 12490)
@@ -1,5 +1,11 @@
 2007-06-26  Johan Bilien  <johan.bilien at nokia.com>
 
+	* src/hd-home-window.c:
+	- do not show the cancel note when cancelling the dialog.
+	Fixes: NB#61793
+
+2007-06-26  Johan Bilien  <johan.bilien at nokia.com>
+
 	* background-manager/background-manager.[ch]:
 	- reimplemted with XRender instead of gdk_pixbuf_
 	- send the picture XID back to the client

Modified: projects/haf/trunk/hildon-desktop/src/hd-home-window.c
===================================================================
--- projects/haf/trunk/hildon-desktop/src/hd-home-window.c	2007-06-26 14:24:53 UTC (rev 12489)
+++ projects/haf/trunk/hildon-desktop/src/hd-home-window.c	2007-06-26 14:31:49 UTC (rev 12490)
@@ -1866,11 +1866,6 @@
           if (!hd_home_background_equal (priv->background,
                                          priv->previous_background))
             {
-              priv->background_loading_timeout =
-                  g_timeout_add (1000,
-                                 (GSourceFunc)
-                                   hd_home_window_set_background_timeout,
-                                 window);
               hd_home_background_apply_async
                   (priv->previous_background,
                    GTK_WIDGET (window)->window,