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

[From: subversion at stage.maemo.org]

Author: jobi
Date: 2007-08-31 15:37:59 +0300 (Fri, 31 Aug 2007)
New Revision: 13520

Modified:
   projects/haf/trunk/hildon-desktop/ChangeLog
   projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-panel-expandable.c
   projects/haf/trunk/hildon-desktop/libhildonwm/hd-wm.c
   projects/haf/trunk/hildon-desktop/src/hd-panel-window-dialog.c
   projects/haf/trunk/hildon-desktop/src/hn-app-switcher.c
Log:

2007-08-31 Johan Bilien  <johan.bilien at nokia.com>

	* src/hd-panel-window-dialog.c,
	libhildondesktop/hildon-desktop-panel-expandable.c:
	- fixed a couple of warnings



Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-08-31 12:06:44 UTC (rev 13519)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-08-31 12:37:59 UTC (rev 13520)
@@ -1,5 +1,11 @@
 2007-08-31 Johan Bilien  <johan.bilien at nokia.com>
 
+	* src/hd-panel-window-dialog.c,
+	libhildondesktop/hildon-desktop-panel-expandable.c:
+	- fixed a couple of warnings
+
+2007-08-31 Johan Bilien  <johan.bilien at nokia.com>
+
 	* libhildonwm/hd-wm.[ch]: Bring back the startup notification
 	DBus method. Fixes: NB#55837
 

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-31 12:06:44 UTC (rev 13519)
+++ projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-panel-expandable.c	2007-08-31 12:37:59 UTC (rev 13520)
@@ -557,8 +557,10 @@
   gint item_width,item_height;
   GtkRequisition req;
 
+  g_return_if_fail (GTK_IS_WIDGET (button));
+
   if (ex_panel->priv->extension_opened)
-    hildon_desktop_panel_expandable_hide_extension (ex_panel);	  
+    hildon_desktop_panel_expandable_hide_extension (ex_panel);
 
   g_signal_emit_by_name (ex_panel, "queued-button", button);
 
@@ -573,7 +575,8 @@
     item_width = req.width;
   
   /* gtk_widget_set_size_request (button, item_width, item_height);*/
-  gtk_widget_set_size_request (GTK_BIN (button)->child, item_width, item_height);
+  if (GTK_IS_BIN (button) && GTK_IS_WIDGET (GTK_BIN (button)->child))
+    gtk_widget_set_size_request (GTK_BIN (button)->child, item_width, item_height);
   
   g_object_set (G_OBJECT (item), "position", ex_panel->priv->current_position++, NULL);
   

Modified: projects/haf/trunk/hildon-desktop/libhildonwm/hd-wm.c
===================================================================
--- projects/haf/trunk/hildon-desktop/libhildonwm/hd-wm.c	2007-08-31 12:06:44 UTC (rev 13519)
+++ projects/haf/trunk/hildon-desktop/libhildonwm/hd-wm.c	2007-08-31 12:37:59 UTC (rev 13520)
@@ -561,8 +561,6 @@
 {
   HDWM *hdwm = HD_WM (data);
 
-  g_debug ("message matched");
-
   if (dbus_message_is_method_call (msg,
                                    HDWM_STARTUP_NOTIFICATION_IFACE,
                                    HDWM_STARTUP_NOTIFICATION_STARTING))

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-31 12:06:44 UTC (rev 13519)
+++ projects/haf/trunk/hildon-desktop/src/hd-panel-window-dialog.c	2007-08-31 12:37:59 UTC (rev 13520)
@@ -142,7 +142,9 @@
 		      	       gpointer object)
 {
   gtk_widget_set_name (widget, HD_PANEL_WINDOW_DIALOG_BUTTON_NAME);
-  gtk_widget_set_name (GTK_BIN (widget)->child, HD_PANEL_WINDOW_DIALOG_BUTTON_NAME);
+  if (GTK_IS_BIN (widget) && GTK_IS_WIDGET (GTK_BIN (widget)->child))
+    gtk_widget_set_name (GTK_BIN (widget)->child,
+                         HD_PANEL_WINDOW_DIALOG_BUTTON_NAME);
 }
 
 static void 

Modified: projects/haf/trunk/hildon-desktop/src/hn-app-switcher.c
===================================================================
--- projects/haf/trunk/hildon-desktop/src/hn-app-switcher.c	2007-08-31 12:06:44 UTC (rev 13519)
+++ projects/haf/trunk/hildon-desktop/src/hn-app-switcher.c	2007-08-31 12:37:59 UTC (rev 13520)
@@ -921,7 +921,7 @@
     GtkWidget   *button = NULL;
     GList       *l;
     gint         pos;
-      
+
     hd_wm_debug ("HDEntryInfo present, with child entry");
 
     parent = hd_wm_entry_info_get_parent (entry_info);