[maemo-commits] [maemo-commits] r12868 - in projects/haf/trunk/hildon-desktop: . data libhildondesktop

[From: subversion at stage.maemo.org]

Author: jobi
Date: 2007-07-27 11:14:43 +0300 (Fri, 27 Jul 2007)
New Revision: 12868

Modified:
   projects/haf/trunk/hildon-desktop/ChangeLog
   projects/haf/trunk/hildon-desktop/data/desktop.conf.in
   projects/haf/trunk/hildon-desktop/data/home-layout.conf
   projects/haf/trunk/hildon-desktop/data/home.conf.in
   projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-home-area.c
Log:

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

	* libhildondesktop/hildon-home-area.c:
	- when loading layout, width, height and stack order are not
	mandatory
	* data/home-layout.conf, data/home.conf.in, data/desktop.conf.in:
	- fixed initial home layout.
	Fixes: NB#64422



Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-07-27 07:42:43 UTC (rev 12867)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-07-27 08:14:43 UTC (rev 12868)
@@ -1,3 +1,12 @@
+2007-07-27  Johan Bilien  <johan.bilien at nokia.com>
+
+	* libhildondesktop/hildon-home-area.c:
+	- when loading layout, width, height and stack order are not
+	mandatory
+	* data/home-layout.conf, data/home.conf.in, data/desktop.conf.in:
+	- fixed initial home layout.
+	Fixes: NB#64422
+
 2007-07-27  Lucas Rocha  <lucas.rocha at nokia.com>
 
 	* src/hd-switcher-menu.c (hd_switcher_menu_create_notifications_menu):
@@ -16,7 +25,7 @@
 2007-07-27  Lucas Rocha  <lucas.rocha at nokia.com>
 
 	* src/hd-plugin-manager.c (hd_plugin_manager_sync): fixed object
-	references leaks on plugins when syncing. Fixes NB#62321  
+	references leaks on plugins when syncing. Fixes NB#62321
 
 2007-07-26  Johan Bilien  <johan.bilien at nokia.com>
 

Modified: projects/haf/trunk/hildon-desktop/data/desktop.conf.in
===================================================================
--- projects/haf/trunk/hildon-desktop/data/desktop.conf.in	2007-07-27 07:42:43 UTC (rev 12867)
+++ projects/haf/trunk/hildon-desktop/data/desktop.conf.in	2007-07-27 08:14:43 UTC (rev 12868)
@@ -14,7 +14,7 @@
 X-Type=home
 X-Padding-Left=10
 X-Padding-Right=10
-X-Padding-Top=12
+X-Padding-Top=10
 X-Padding-Bottom=10
 X-Is-Ordered=0
 X-Load-New-Plugins=1

Modified: projects/haf/trunk/hildon-desktop/data/home-layout.conf
===================================================================
--- projects/haf/trunk/hildon-desktop/data/home-layout.conf	2007-07-27 07:42:43 UTC (rev 12867)
+++ projects/haf/trunk/hildon-desktop/data/home-layout.conf	2007-07-27 08:14:43 UTC (rev 12868)
@@ -1,11 +1,11 @@
 [/usr/share/applications/hildon-home/isearch-applet.desktop]
-X=10
-Y=10
-X-home-applet-width=390
-X-home-applet-height=50
+X=0
+Y=0
 
 [/usr/share/applications/hildon-home/promo-plugin.desktop]
 X=400
-Y=300
-X-home-applet-width=300
-X-home-applet-height=100
+Y=150
+
+[/usr/share/applications/hildon-home/tutorial-home.desktop]
+X=400
+Y=280

Modified: projects/haf/trunk/hildon-desktop/data/home.conf.in
===================================================================
--- projects/haf/trunk/hildon-desktop/data/home.conf.in	2007-07-27 07:42:43 UTC (rev 12867)
+++ projects/haf/trunk/hildon-desktop/data/home.conf.in	2007-07-27 08:14:43 UTC (rev 12868)
@@ -1,2 +1,3 @@
 [@hildonhomedesktopentrydir@/isearch-applet.desktop]
 [@hildonhomedesktopentrydir@/promo-plugin.desktop]
+[@hildonhomedesktopentrydir@/tutorial-home.desktop]

Modified: projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-home-area.c
===================================================================
--- projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-home-area.c	2007-07-27 07:42:43 UTC (rev 12867)
+++ projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-home-area.c	2007-07-27 08:14:43 UTC (rev 12868)
@@ -2104,7 +2104,7 @@
   while (n_groups > 0)
     {
       GtkWidget     *applet = NULL;
-      gint           x,y,width,height, stack_index;
+      gint           x,y,width = -1,height = -1, stack_index = G_MAXINT;
       GList         *list_element;
 
       x = g_key_file_get_integer (keyfile,
@@ -2119,17 +2119,17 @@
       width = g_key_file_get_integer (keyfile,
                                       groups[n_groups-1],
                                       HH_APPLET_KEY_WIDTH,
-                                      &local_error);
+                                      NULL);
 
       height = g_key_file_get_integer (keyfile,
                                        groups[n_groups-1],
                                        HH_APPLET_KEY_HEIGHT,
-                                       &local_error);
+                                       NULL);
 
       stack_index = g_key_file_get_integer (keyfile,
                                             groups[n_groups-1],
                                             HH_APPLET_KEY_STACK_INDEX,
-                                            &local_error);
+                                            NULL);
 
       if (local_error) goto cleanup;