[maemo-commits] [maemo-commits] r8196 - in projects/haf/trunk/gtk+: . gtk

[From: tko at stage.maemo.org]

Author: tko
Date: 2006-11-21 11:07:23 +0200 (Tue, 21 Nov 2006)
New Revision: 8196

Modified:
   projects/haf/trunk/gtk+/ChangeLog
   projects/haf/trunk/gtk+/gtk/gtkmenu.c
Log:
Allow GtkMenu detach function to be NULL.

2006-11-21  Tommi Komulainen  <tommi.komulainen at nokia.com>
	
	* gtk/gtkmenu.c (gtk_menu_attach_to_widget, gtk_menu_detach): Allow
	detach function to be NULL.


Modified: projects/haf/trunk/gtk+/ChangeLog
===================================================================
--- projects/haf/trunk/gtk+/ChangeLog	2006-11-21 07:15:09 UTC (rev 8195)
+++ projects/haf/trunk/gtk+/ChangeLog	2006-11-21 09:07:23 UTC (rev 8196)
@@ -1,3 +1,8 @@
+2006-11-21  Tommi Komulainen  <tommi.komulainen at nokia.com>
+	
+	* gtk/gtkmenu.c (gtk_menu_attach_to_widget, gtk_menu_detach): Allow
+	detach function to be NULL.
+
 2006-11-15  Tommi Komulainen  <tommi.komulainen at nokia.com>
 
 	Merge from GNOME CVS. NB#47124

Modified: projects/haf/trunk/gtk+/gtk/gtkmenu.c
===================================================================
--- projects/haf/trunk/gtk+/gtk/gtkmenu.c	2006-11-21 07:15:09 UTC (rev 8195)
+++ projects/haf/trunk/gtk+/gtk/gtkmenu.c	2006-11-21 09:07:23 UTC (rev 8196)
@@ -1115,7 +1115,6 @@
   
   g_return_if_fail (GTK_IS_MENU (menu));
   g_return_if_fail (GTK_IS_WIDGET (attach_widget));
-  g_return_if_fail (detacher != NULL);
   
   /* keep this function in sync with gtk_widget_set_parent()
    */
@@ -1193,7 +1192,8 @@
 					(gpointer) attach_widget_screen_changed,
 					menu);
 
-  data->detacher (data->attach_widget, menu);
+  if (data->detacher)
+    data->detacher (data->attach_widget, menu);
   list = g_object_steal_data (G_OBJECT (data->attach_widget), ATTACHED_MENUS);
   list = g_list_remove (list, menu);
   if (list)