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

[From: subversion at stage.maemo.org]

Author: lucasr
Date: 2007-08-14 18:13:13 +0300 (Tue, 14 Aug 2007)
New Revision: 13188

Modified:
   projects/haf/trunk/hildon-desktop/ChangeLog
   projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-panel-expandable.c
   projects/haf/trunk/hildon-desktop/src/hd-panel-window-dialog.c
Log:
2007-08-14  Lucas Rocha  <lucas.rocha at nokia.com>

	* src/hd-panel-window-dialog.c: fixed critical warning when getting
	extension from expandable panel.


Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-08-14 14:18:54 UTC (rev 13187)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-08-14 15:13:13 UTC (rev 13188)
@@ -1,5 +1,10 @@
 2007-08-14  Lucas Rocha  <lucas.rocha at nokia.com>
 
+	* src/hd-panel-window-dialog.c: fixed critical warning when getting
+	extension from expandable panel.
+
+2007-08-14  Lucas Rocha  <lucas.rocha at nokia.com>
+
 	* src/hd-panel-window-dialog.c: set widget name of panel expandable to
 	"HildonStatusBarExtension".
 

Modified: projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-panel-expandable.c
===================================================================
--- projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-panel-expandable.c	2007-08-14 14:18:54 UTC (rev 13187)
+++ projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-panel-expandable.c	2007-08-14 15:13:13 UTC (rev 13188)
@@ -1083,7 +1083,7 @@
 GtkWidget *
 hildon_desktop_panel_expandable_get_extension (HildonDesktopPanelExpandable *panel)
 {
-  g_assert (HILDON_DESKTOP_IS_PANEL_EXPANDABLE (panel));
+  g_return_val_if_fail (HILDON_DESKTOP_IS_PANEL_EXPANDABLE (panel), NULL);
 
   return GTK_WIDGET (panel->priv->extension_table);
 }

Modified: projects/haf/trunk/hildon-desktop/src/hd-panel-window-dialog.c
===================================================================
--- projects/haf/trunk/hildon-desktop/src/hd-panel-window-dialog.c	2007-08-14 14:18:54 UTC (rev 13187)
+++ projects/haf/trunk/hildon-desktop/src/hd-panel-window-dialog.c	2007-08-14 15:13:13 UTC (rev 13188)
@@ -162,6 +162,8 @@
                              GObjectConstructParam  *params)
 {
   GObject *object;
+  GtkContainer *panel;
+  GtkWidget *extension;
 #ifdef HD_PANEL_WINDOW_DIALOG_NEW_THEME
   HildonDesktopPanelWindowOrientation orientation;
 #endif
@@ -199,6 +201,13 @@
   
   hd_panel_window_dialog_set_style (HD_PANEL_WINDOW_DIALOG (object), orientation);
 #endif
+
+  panel = HILDON_DESKTOP_WINDOW (object)->container;
+
+  extension = 
+    hildon_desktop_panel_expandable_get_extension (HILDON_DESKTOP_PANEL_EXPANDABLE (panel));
+
+  gtk_widget_set_name (extension, "HildonStatusBarExtension");
   
   return object;
 }
@@ -237,8 +246,6 @@
   DBusGProxy *bus_proxy;
   GError *error = NULL;
   guint result;
-  GtkContainer *panel;
-  GtkWidget *extension;
   
   window->priv = HD_PANEL_WINDOW_DIALOG_GET_PRIVATE (window);
 
@@ -246,13 +253,6 @@
   gtk_widget_set_name (GTK_WIDGET (window), "HildonStatusBar");
 #endif
 
-  panel = HILDON_DESKTOP_WINDOW (window)->container;
-
-  extension = 
-    hildon_desktop_panel_expandable_get_extension (HILDON_DESKTOP_PANEL_EXPANDABLE (panel));
-
-  gtk_widget_set_name (extension, "HildonStatusBarExtension");
-
   window->priv->connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
 
   if (error != NULL)