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

[From: subversion at stage.maemo.org]

Author: jobi
Date: 2007-05-07 13:49:45 +0300 (Mon, 07 May 2007)
New Revision: 11483

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

2007-05-07  Johan Bilien  <johan.bilien at nokia.com>

	* src/hd-home-window.c:
	- when no default background, revert to a black one rather
	than NULL



Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-05-07 10:35:27 UTC (rev 11482)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-05-07 10:49:45 UTC (rev 11483)
@@ -1,3 +1,9 @@
+2007-05-07  Johan Bilien  <johan.bilien at nokia.com>
+
+	* src/hd-home-window.c:
+	- when no default background, revert to a black one rather
+	than NULL
+
 2007-05-04  Moises Martinez  <moises.martinez at nokia.com>
 
 	* libhildonwm/hd-keys.[ch]:

Modified: projects/haf/trunk/hildon-desktop/src/hd-home-window.c
===================================================================
--- projects/haf/trunk/hildon-desktop/src/hd-home-window.c	2007-05-07 10:35:27 UTC (rev 11482)
+++ projects/haf/trunk/hildon-desktop/src/hd-home-window.c	2007-05-07 10:49:45 UTC (rev 11483)
@@ -378,7 +378,10 @@
           g_warning ("Could not load default background: %s",
                      error->message);
           g_clear_error (&error);
-          background = NULL;
+          background = g_object_new (HD_TYPE_HOME_BACKGROUND,
+                                     "filename", HD_HOME_BACKGROUND_NO_IMAGE,
+                                     "color", &default_color,
+                                     NULL);
         }
 
       g_free (filename);
@@ -1262,15 +1265,12 @@
           g_debug ("BACKGROUND_OK");
           if (!hd_home_background_equal (priv->background,
                                          background))
-            {
-          g_debug ("BACKGROUND_NOT_EQUAL");
             hd_home_background_apply_async 
                 (background,
                  GTK_WIDGET (window)->window,
                  workarea,
                  (HDHomeBackgroundApplyCallback)background_apply_and_save_callback,
                window);
-            }
           g_object_unref (priv->previous_background);
           break;
       case HILDON_HOME_SET_BG_RESPONSE_PREVIEW:
@@ -1313,8 +1313,8 @@
 #ifdef HAVE_LIBOSSO
                          "osso-context", priv->osso_context,
 #endif
+                         "background", priv->background,
                          "background-dir", HD_DESKTOP_BACKGROUNDS_PATH,
-                         "background", priv->background,
                          NULL);
 
   g_signal_connect_swapped (dialog, "response",