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

[From: subversion at stage.maemo.org]

Author: kalikiana
Date: 2009-06-15 17:24:57 +0300 (Mon, 15 Jun 2009)
New Revision: 18729

Modified:
   projects/haf/trunk/gtk+/ChangeLog
   projects/haf/trunk/gtk+/gtk/gtkmenu.c
   projects/haf/trunk/gtk+/gtk/gtkwindow.c
Log:
Disable closing temporaries and	allow the window manager to
delete menues.



Modified: projects/haf/trunk/gtk+/ChangeLog
===================================================================
--- projects/haf/trunk/gtk+/ChangeLog	2009-06-15 13:57:24 UTC (rev 18728)
+++ projects/haf/trunk/gtk+/ChangeLog	2009-06-15 14:24:57 UTC (rev 18729)
@@ -1,5 +1,14 @@
 2009-06-15  Christian Dywan  <christian at lanedo.com>
 
+	* gtk/gtkmenu.c (gtk_menu_window_event):
+	* gtk/gtkwindow.c (gtk_window_map): Disable closing temporaries and
+	allow the window manager to delete menues.
+	Patch by Hamalainen Kimmo.
+	Fixes: NB#116326 gtk_window_new() is slow due to
+	gtk_window_close_other_temporaries() call
+
+2009-06-15  Christian Dywan  <christian at lanedo.com>
+
 	* gtk/gtkdialog.c (gtk_dialog_set_property): Add a missing "break"
 	that was forgotten in the previous patch.
 

Modified: projects/haf/trunk/gtk+/gtk/gtkmenu.c
===================================================================
--- projects/haf/trunk/gtk+/gtk/gtkmenu.c	2009-06-15 13:57:24 UTC (rev 18728)
+++ projects/haf/trunk/gtk+/gtk/gtkmenu.c	2009-06-15 14:24:57 UTC (rev 18729)
@@ -992,9 +992,7 @@
 	}
       break;
     case GDK_DELETE:
-      /* Do nothing for the delete event that will come from _GTK_DELETE_TEMPORARIES
-         if we are not mapped */
-      handled = TRUE;
+      handled = gtk_widget_event (menu, event);
       break;
 #endif /* MAEMO_CHANGES */
     default:

Modified: projects/haf/trunk/gtk+/gtk/gtkwindow.c
===================================================================
--- projects/haf/trunk/gtk+/gtk/gtkwindow.c	2009-06-15 13:57:24 UTC (rev 18728)
+++ projects/haf/trunk/gtk+/gtk/gtkwindow.c	2009-06-15 14:24:57 UTC (rev 18729)
@@ -4401,16 +4401,6 @@
   GtkWindowPrivate *priv = GTK_WINDOW_GET_PRIVATE (window);
   GdkWindow *toplevel;
 
-#if defined(MAEMO_CHANGES)
-  /* This call should be before we set the MAPPED flag on the
-   * window, because gtk_window_close_other_temporaries() uses
-   * this to ignore this window when sending delete-events
-   * internally.
-   */
-  if (! gtk_window_get_is_temporary (window))
-    gtk_window_close_other_temporaries (window);
-#endif
-
   GTK_WIDGET_SET_FLAGS (widget, GTK_MAPPED);
 
   if (window->bin.child &&