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

[From: subversion at stage.maemo.org]

Author: moimart
Date: 2007-07-24 16:49:44 +0300 (Tue, 24 Jul 2007)
New Revision: 12813

Modified:
   projects/haf/trunk/hildon-desktop/ChangeLog
   projects/haf/trunk/hildon-desktop/src/hd-home-background-dialog.c
Log:
2007-07-24  Moises Martinez  <moises.martinez at nokia.com>

        * src/hd-home-background-dialog.c:
        (hd_home_background_dialog_filename_changed):
        - Check for priv->background before doing anything.
        Fixes: NB#63855
	* ChangeLog updated.



Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-07-24 13:30:21 UTC (rev 12812)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-07-24 13:49:44 UTC (rev 12813)
@@ -1,5 +1,12 @@
 2007-07-24  Moises Martinez  <moises.martinez at nokia.com>
 
+	* src/hd-home-background-dialog.c:
+	(hd_home_background_dialog_filename_changed):
+	- Check for priv->background before doing anything.
+	Fixes: NB#63855
+
+2007-07-24  Moises Martinez  <moises.martinez at nokia.com>
+
 	* src/hn-app-switcher.c: (refresh_app_button), (refresh_buttons):
 	- Set always icon geometry for windows.
 	- When not in slot, take also into account the panel position.

Modified: projects/haf/trunk/hildon-desktop/src/hd-home-background-dialog.c
===================================================================
--- projects/haf/trunk/hildon-desktop/src/hd-home-background-dialog.c	2007-07-24 13:30:21 UTC (rev 12812)
+++ projects/haf/trunk/hildon-desktop/src/hd-home-background-dialog.c	2007-07-24 13:49:44 UTC (rev 12813)
@@ -617,7 +617,7 @@
 {
   HDHomeBackgroundDialogPrivate    *priv;
   GtkTreeIter                       iter;
-  gchar                            *filename;
+  gchar                            *filename = NULL;
   
   priv = HD_HOME_BACKGROUND_DIALOG_GET_PRIVATE (dialog);
 
@@ -629,6 +629,9 @@
                       BG_IMAGE_FILENAME, &filename,
                       -1);
 
+  if (!priv->background)
+    goto out;	  
+  
   if (filename)
     g_object_set (G_OBJECT (priv->background),
                   "filename", filename,
@@ -637,7 +640,7 @@
     g_object_set (G_OBJECT (priv->background),
                   "filename", HD_HOME_BACKGROUND_NO_IMAGE,
                   NULL);
-
+out:
   g_free (filename);
 }