2009-02-16 Alberto Garcia <agarcia@igalia.com>

* src/hildon-stackable-window.c (hildon_stackable_window_class_init)
	(+hildon_stackable_window_delete_event): Ignore delete events if
	the window is not the topmost one.

	Fixes: NB#101698 (Back button long press and delete-event handling)

diff --git a/ChangeLog b/ChangeLog
index b438775..d27fcb1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-02-16  Alberto Garcia  <agarcia@igalia.com>
+
+       * src/hildon-stackable-window.c (hildon_stackable_window_class_init)
+       (+hildon_stackable_window_delete_event): Ignore delete events if
+       the window is not the topmost one.
+
+       Fixes: NB#101698 (Back button long press and delete-event handling)
+
 2009-02-16  Alejandro G. Castro  <alex@igalia.com>
 
        * src/hildon-pannable-area.c,

diff --git a/src/hildon-stackable-window.c b/src/hildon-stackable-window.c
index 2a694f8..7191533 100644 (file)
--- a/src/hildon-stackable-window.c
+++ b/src/hildon-stackable-window.c
@@ -271,6 +271,23 @@ hildon_stackable_window_hide                    (GtkWidget *widget)
     GTK_WIDGET_CLASS (hildon_stackable_window_parent_class)->hide (widget);
 }
 
+static gboolean
+hildon_stackable_window_delete_event            (GtkWidget   *widget,
+                                                 GdkEventAny *event)
+{
+    HildonStackableWindowPrivate *priv = HILDON_STACKABLE_WINDOW_GET_PRIVATE (widget);
+    gboolean retvalue = FALSE;
+
+    if (priv->stack && hildon_window_stack_peek (priv->stack) != widget) {
+        /* Ignore the delete event if this window is not the topmost one */
+        retvalue = TRUE;
+    } else if (GTK_WIDGET_CLASS (hildon_stackable_window_parent_class)->delete_event) {
+        retvalue = GTK_WIDGET_CLASS (hildon_stackable_window_parent_class)->delete_event (widget, event);
+    }
+
+    return retvalue;
+}
+
 static void
 hildon_stackable_window_finalize                (GObject *object)
 {
@@ -297,6 +314,7 @@ hildon_stackable_window_class_init              (HildonStackableWindowClass *kla
     widget_class->map               = hildon_stackable_window_map;
     widget_class->show              = hildon_stackable_window_show;
     widget_class->hide              = hildon_stackable_window_hide;
+    widget_class->delete_event      = hildon_stackable_window_delete_event;
 
     window_class->toggle_menu       = hildon_stackable_window_toggle_menu;