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

[From: subversion at stage.maemo.org]

Author: jobi
Date: 2007-09-27 09:51:22 +0300 (Thu, 27 Sep 2007)
New Revision: 14132

Modified:
   projects/haf/trunk/hildon-desktop/ChangeLog
   projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-panel.c
Log:

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

	* libhildondesktop/hildon-desktop-panel.c (hildon_desktop_panel_cadd):
	added protection against NULL widget. Fixes: NB#70668



Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-09-27 06:35:16 UTC (rev 14131)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-09-27 06:51:22 UTC (rev 14132)
@@ -1,5 +1,10 @@
 2007-09-27 Johan Bilien  <johan.bilien at nokia.com>
 
+	* libhildondesktop/hildon-desktop-panel.c (hildon_desktop_panel_cadd):
+	added protection against NULL widget. Fixes: NB#70668
+
+2007-09-27 Johan Bilien  <johan.bilien at nokia.com>
+
 	* libhildondesktop/hildon-desktop-popup-menu.c: systematically
 	unselect the item when removed from the box. This fixes invalid
 	reads

Modified: projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-panel.c
===================================================================
--- projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-panel.c	2007-09-27 06:35:16 UTC (rev 14131)
+++ projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-panel.c	2007-09-27 06:51:22 UTC (rev 14132)
@@ -176,9 +176,11 @@
 static void 
 hildon_desktop_panel_cadd (GtkContainer *container, GtkWidget *widget)
 {
-  g_return_if_fail (HILDON_DESKTOP_IS_PANEL (container));
+  g_return_if_fail (HILDON_DESKTOP_IS_PANEL (container) &&
+                    GTK_IS_WIDGET(widget));
 
-  hildon_desktop_panel_real_add_button (HILDON_DESKTOP_PANEL (container), widget);
+  hildon_desktop_panel_real_add_button (HILDON_DESKTOP_PANEL (container),
+                                        widget);
 }
 
 static void