gtk+ r20766 - trunk/gtk

[matthiasc svn gnome org]

Author: matthiasc
Date: Fri Jul  4 20:09:57 2008
New Revision: 20766
URL: http://svn.gnome.org/viewvc/gtk+?rev=20766&view=rev

Log:
More debork


Modified:
   trunk/gtk/gtkmenu.c

Modified: trunk/gtk/gtkmenu.c
==============================================================================
--- trunk/gtk/gtkmenu.c	(original)
+++ trunk/gtk/gtkmenu.c	Fri Jul  4 20:09:57 2008
@@ -794,7 +794,17 @@
       gtk_menu_set_accel_path (menu, g_value_get_string (value));
       break;
     case PROP_ATTACH_WIDGET:
-      gtk_menu_attach_to_widget (menu, g_value_get_object (value), NULL);
+      {
+        GtkWidget *widget;
+
+        widget = gtk_menu_get_attach_widget (menu);
+        if (widget)
+          gtk_menu_detach (menu);
+
+        widget = (GtkWidget*) g_value_get_object (value); 
+        if (widget)
+          gtk_menu_attach_to_widget (menu, widget, NULL);
+      }
       break;
     case PROP_TEAROFF_STATE:
       gtk_menu_set_tearoff_state (menu, g_value_get_boolean (value));