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

[From: subversion at stage.maemo.org]

Author: jobi
Date: 2007-03-01 15:32:59 +0200 (Thu, 01 Mar 2007)
New Revision: 10291

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

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

	* src/hd-home-background-dialog.c: Add the default "None" background
	before checking for background directory



Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-03-01 13:11:57 UTC (rev 10290)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-03-01 13:32:59 UTC (rev 10291)
@@ -1,5 +1,10 @@
 2007-03-01  Johan Bilien  <johan.bilien at nokia.com>
 
+	* src/hd-home-background-dialog.c: Add the default "None" background
+	before checking for background directory
+
+2007-03-01  Johan Bilien  <johan.bilien at nokia.com>
+
 	* src/hd-home-window.c: osso_cp_plugin_path takes relative path
 	* background-manager/background-manager.c: Uncommented setting
 	the title bar

Modified: projects/haf/trunk/hildon-desktop/src/hd-home-background-dialog.c
===================================================================
--- projects/haf/trunk/hildon-desktop/src/hd-home-background-dialog.c	2007-03-01 13:11:57 UTC (rev 10290)
+++ projects/haf/trunk/hildon-desktop/src/hd-home-background-dialog.c	2007-03-01 13:32:59 UTC (rev 10291)
@@ -685,6 +685,18 @@
                                GTK_TREE_MODEL (priv->combobox_contents));
     }
 
+  /* No background file option */
+  gtk_list_store_append (priv->combobox_contents, &iterator);
+  gtk_list_store_set (priv->combobox_contents,
+                      &iterator,
+                      BG_IMAGE_NAME, HH_SET_BG_IMAGE_NONE,
+                      BG_IMAGE_FILENAME, NULL,
+                      BG_IMAGE_PRIORITY, 0, -1);
+
+  /* It's the default */
+  gtk_combo_box_set_active_iter (GTK_COMBO_BOX (priv->img_combo),
+                                 &iterator);
+
   if (!priv->background_dir)
     return;
 
@@ -701,19 +713,6 @@
     return;
   }
 
-
-  /* No background file option */
-  gtk_list_store_append (priv->combobox_contents, &iterator);
-  gtk_list_store_set (priv->combobox_contents,
-                      &iterator,
-                      BG_IMAGE_NAME, HH_SET_BG_IMAGE_NONE,
-                      BG_IMAGE_FILENAME, NULL,
-                      BG_IMAGE_PRIORITY, 0, -1);
-
-  /* It's the default */
-  gtk_combo_box_set_active_iter (GTK_COMBO_BOX (priv->img_combo),
-                                 &iterator);
-
   kfile = g_key_file_new ();
 
   while ((image_desc_file = g_dir_read_name (dir)))