[maemo-commits] [maemo-commits] r13278 - in projects/haf/trunk/gtk+: . debian docs/reference docs/reference/gtk gtk

[From: subversion at stage.maemo.org]

Author: xan
Date: 2007-08-17 16:33:50 +0300 (Fri, 17 Aug 2007)
New Revision: 13278

Modified:
   projects/haf/trunk/gtk+/ChangeLog
   projects/haf/trunk/gtk+/debian/changelog
   projects/haf/trunk/gtk+/docs/reference/ChangeLog
   projects/haf/trunk/gtk+/docs/reference/gtk/gtk-sections.txt
   projects/haf/trunk/gtk+/gtk/gtk.symbols
   projects/haf/trunk/gtk+/gtk/gtkmenu.c
   projects/haf/trunk/gtk+/gtk/gtkwindow.c
   projects/haf/trunk/gtk+/gtk/gtkwindow.h
Log:
gtk+2.0 (2:2.10.12-0osso12) unstable; urgency=low

  * Improve on "row-activate on single tap, but now until button-release".
    Fixes: MB#1481
  * Call gtk_window_close_other_temporaries on gtk_window_map for NON temporary
    windows. Mark the toplevel window associated to GtkMenus as temporary, and
    make it ignore delete-events when it is unmapped. Fixes: NB#56624

    gtk_window_close_other_temporaries is now public, ** This is a new unstable API. **

 -- Xan Lopez <xan.lopez at nokia.com>  Fri, 17 Aug 2007 14:59:55 +0300


Modified: projects/haf/trunk/gtk+/ChangeLog
===================================================================
--- projects/haf/trunk/gtk+/ChangeLog	2007-08-17 12:06:11 UTC (rev 13277)
+++ projects/haf/trunk/gtk+/ChangeLog	2007-08-17 13:33:50 UTC (rev 13278)
@@ -1,3 +1,11 @@
+2007-08-17  Xan Lopez  <xan.lopez at nokia.com>
+
+	* gtk/gtkmenu.c (gtk_menu_window_event): clarify the comment a bit.
+
+	* gtk/gtkwindow.c (gtk_window_close_other_temporaries): make public, and add it
+	to gtk.symbols too. Turns out hildon-desktop needs this to handle their HW keys
+	functionality.
+
 2007-08-16  Xan Lopez  <xan.lopez at nokia.com>
 
 	* gtk/gtkradiobutton.c (gtk_radio_button_focus): add a chunk of code moved around

Modified: projects/haf/trunk/gtk+/debian/changelog
===================================================================
--- projects/haf/trunk/gtk+/debian/changelog	2007-08-17 12:06:11 UTC (rev 13277)
+++ projects/haf/trunk/gtk+/debian/changelog	2007-08-17 13:33:50 UTC (rev 13278)
@@ -1,3 +1,15 @@
+gtk+2.0 (2:2.10.12-0osso12) unstable; urgency=low
+
+  * Improve on "row-activate on single tap, but now until button-release".
+    Fixes: MB#1481
+  * Call gtk_window_close_other_temporaries on gtk_window_map for NON temporary
+    windows. Mark the toplevel window associated to GtkMenus as temporary, and
+    make it ignore delete-events when it is unmapped. Fixes: NB#56624
+	
+    gtk_window_close_other_temporaries is now public, ** This is a new unstable API. **
+
+ -- Xan Lopez <xan.lopez at nokia.com>  Fri, 17 Aug 2007 14:59:55 +0300
+
 gtk+2.0 (2:2.10.12-0osso11) unstable; urgency=low
 
   * Send the insensitive-press signal if there is no grab widget or the

Modified: projects/haf/trunk/gtk+/docs/reference/ChangeLog
===================================================================
--- projects/haf/trunk/gtk+/docs/reference/ChangeLog	2007-08-17 12:06:11 UTC (rev 13277)
+++ projects/haf/trunk/gtk+/docs/reference/ChangeLog	2007-08-17 13:33:50 UTC (rev 13278)
@@ -1,3 +1,7 @@
+2007-08-17  Xan Lopez  <xan.lopez at nokia.com>
+
+	* gtk/gtk-sections.txt: add gtk_window_close_other_temporaries
+
 2007-06-29  Xan Lopez  <xan.lopez at nokia.com>
 
 	* gtk/gtk-sections.txt:

Modified: projects/haf/trunk/gtk+/docs/reference/gtk/gtk-sections.txt
===================================================================
--- projects/haf/trunk/gtk+/docs/reference/gtk/gtk-sections.txt	2007-08-17 12:06:11 UTC (rev 13277)
+++ projects/haf/trunk/gtk+/docs/reference/gtk/gtk-sections.txt	2007-08-17 13:33:50 UTC (rev 13278)
@@ -5241,6 +5241,7 @@
 gtk_window_set_auto_startup_notification
 gtk_window_set_is_temporary
 gtk_window_get_is_temporary
+gtk_window_close_other_temporaries
 <SUBSECTION Standard>
 GTK_WINDOW
 GTK_IS_WINDOW

Modified: projects/haf/trunk/gtk+/gtk/gtk.symbols
===================================================================
--- projects/haf/trunk/gtk+/gtk/gtk.symbols	2007-08-17 12:06:11 UTC (rev 13277)
+++ projects/haf/trunk/gtk+/gtk/gtk.symbols	2007-08-17 13:33:50 UTC (rev 13278)
@@ -4604,6 +4604,7 @@
 gtk_window_add_mnemonic
 gtk_window_begin_move_drag
 gtk_window_begin_resize_drag
+gtk_window_close_other_temporaries
 gtk_window_deiconify
 gtk_window_fullscreen
 gtk_window_get_accept_focus

Modified: projects/haf/trunk/gtk+/gtk/gtkmenu.c
===================================================================
--- projects/haf/trunk/gtk+/gtk/gtkmenu.c	2007-08-17 12:06:11 UTC (rev 13277)
+++ projects/haf/trunk/gtk+/gtk/gtkmenu.c	2007-08-17 13:33:50 UTC (rev 13278)
@@ -860,7 +860,8 @@
 	}
       break;
     case GDK_DELETE:
-      /* Do nothing for the delete event that will come from _GTK_DELETE_TEMPORARIES */
+      /* Do nothing for the delete event that will come from _GTK_DELETE_TEMPORARIES
+         if we are not mapped */
       handled = TRUE;
       break;
 #endif /* MAEMO_CHANGES */

Modified: projects/haf/trunk/gtk+/gtk/gtkwindow.c
===================================================================
--- projects/haf/trunk/gtk+/gtk/gtkwindow.c	2007-08-17 12:06:11 UTC (rev 13277)
+++ projects/haf/trunk/gtk+/gtk/gtkwindow.c	2007-08-17 13:33:50 UTC (rev 13278)
@@ -289,9 +289,6 @@
 static void        gtk_window_free_key_hash       (GtkWindow   *window);
 static void	   gtk_window_on_composited_changed (GdkScreen *screen,
 						     GtkWindow *window);
-#if defined(MAEMO_CHANGES) && defined(GDK_WINDOWING_X11)
-static void        gtk_window_close_other_temporaries (GtkWindow *window);
-#endif
 
 static GSList      *toplevel_list = NULL;
 static guint        window_signals[LAST_SIGNAL] = { 0 };

Modified: projects/haf/trunk/gtk+/gtk/gtkwindow.h
===================================================================
--- projects/haf/trunk/gtk+/gtk/gtkwindow.h	2007-08-17 12:06:11 UTC (rev 13277)
+++ projects/haf/trunk/gtk+/gtk/gtkwindow.h	2007-08-17 13:33:50 UTC (rev 13278)
@@ -273,6 +273,7 @@
 gboolean   gtk_window_get_is_temporary	        (GtkWindow *window);
 gboolean   _gtk_window_is_on_client_data        (GtkWindow *window,
                                                  GdkEventClient *event);
+void       gtk_window_close_other_temporaries   (GtkWindow *window);
 #endif
 
 void       gtk_window_set_icon_list                (GtkWindow  *window,