[maemo-commits] [maemo-commits] r18611 - in projects/haf/branches/gtk+/no-delete-temporaries: . gtk

[From: subversion at stage.maemo.org]

Author: csaavedra
Date: 2009-06-04 17:25:15 +0300 (Thu, 04 Jun 2009)
New Revision: 18611

Modified:
   projects/haf/branches/gtk+/no-delete-temporaries/ChangeLog
   projects/haf/branches/gtk+/no-delete-temporaries/gtk/gtkmenu.c
   projects/haf/branches/gtk+/no-delete-temporaries/gtk/gtkwindow.c
Log:
2009-06-04  Claudio Saavedra  <csaavedra at igalia.com>

	Addresses: NB#116326 (gtk_window_new() is slow due to 
	gtk_window_close_other_temporaries() call)

	Patch by Kimmo H?\195?\164m?\195?\164l?\195?\164inen <kimmo.hamalainen at nokia.com>

	* gtk/gtkmenu.c (gtk_menu_window_event): Do not handle the 
	GTK_DELETE_EVENT in the window and pass it to the menu.
	* gtk/gtkwindow.c (gtk_window_map): Do not call 
	gtk_window_close_other_temporaries() to improve performance.



Modified: projects/haf/branches/gtk+/no-delete-temporaries/ChangeLog
===================================================================
--- projects/haf/branches/gtk+/no-delete-temporaries/ChangeLog	2009-06-04 14:06:11 UTC (rev 18610)
+++ projects/haf/branches/gtk+/no-delete-temporaries/ChangeLog	2009-06-04 14:25:15 UTC (rev 18611)
@@ -1,3 +1,15 @@
+2009-06-04  Claudio Saavedra  <csaavedra at igalia.com>
+
+	Addresses: NB#116326 (gtk_window_new() is slow due to 
+	gtk_window_close_other_temporaries() call)
+
+	Patch by Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>
+
+	* gtk/gtkmenu.c (gtk_menu_window_event): Do not handle the 
+	GTK_DELETE_EVENT in the window and pass it to the menu.
+	* gtk/gtkwindow.c (gtk_window_map): Do not call 
+	gtk_window_close_other_temporaries() to improve performance.
+
 2009-06-03  Claudio Saavedra  <csaavedra at igalia.com>
 
 	Releasing 2:2.14.3-1maemo3

Modified: projects/haf/branches/gtk+/no-delete-temporaries/gtk/gtkmenu.c
===================================================================
--- projects/haf/branches/gtk+/no-delete-temporaries/gtk/gtkmenu.c	2009-06-04 14:06:11 UTC (rev 18610)
+++ projects/haf/branches/gtk+/no-delete-temporaries/gtk/gtkmenu.c	2009-06-04 14:25:15 UTC (rev 18611)
@@ -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/branches/gtk+/no-delete-temporaries/gtk/gtkwindow.c
===================================================================
--- projects/haf/branches/gtk+/no-delete-temporaries/gtk/gtkwindow.c	2009-06-04 14:06:11 UTC (rev 18610)
+++ projects/haf/branches/gtk+/no-delete-temporaries/gtk/gtkwindow.c	2009-06-04 14:25:15 UTC (rev 18611)
@@ -4401,6 +4401,7 @@
   GtkWindowPrivate *priv = GTK_WINDOW_GET_PRIVATE (window);
   GdkWindow *toplevel;
 
+#if 0
 #if defined(MAEMO_CHANGES)
   /* This call should be before we set the MAPPED flag on the
    * window, because gtk_window_close_other_temporaries() uses
@@ -4410,6 +4411,7 @@
   if (! gtk_window_get_is_temporary (window))
     gtk_window_close_other_temporaries (window);
 #endif
+#endif
 
   GTK_WIDGET_SET_FLAGS (widget, GTK_MAPPED);