while (modal && GTK_IS_DIALOG (modal)) {
GtkWidget *parent;
+ /* If it's a hildon note then don't try to close it as
+ this is the default behaviour of WM, delete event
+ is not issued for this kind of notes as we want the
+ user to always click on a button */
+ if (HILDON_IS_NOTE (modal)) {
+ gtk_window_present (GTK_WINDOW (modal));
+ return FALSE;
+ }
+
/* Get the parent */
parent = (GtkWidget *) gtk_window_get_transient_for (GTK_WINDOW (modal));
}
/* Do not go backwards */
- if ((MODEST_IS_MSG_VIEW_WINDOW (current_top) || MODEST_IS_MSG_EDIT_WINDOW (current_top)) &&
- (MODEST_IS_FOLDER_WINDOW (window) || MODEST_IS_ACCOUNTS_WINDOW (window) ||
+ if ((MODEST_IS_MSG_VIEW_WINDOW (current_top) ||
+ MODEST_IS_MSG_EDIT_WINDOW (current_top) ||
+ MODEST_IS_HEADER_WINDOW (current_top)) &&
+ (MODEST_IS_FOLDER_WINDOW (window) ||
+ MODEST_IS_ACCOUNTS_WINDOW (window) ||
MODEST_IS_MAILBOXES_WINDOW (window))) {
- gtk_window_present (GTK_WINDOW (window));
+ gtk_window_present (GTK_WINDOW (current_top));
return FALSE;
}
if (MODEST_IS_FOLDER_WINDOW (current_top) && MODEST_IS_FOLDER_WINDOW (window)) {
- gtk_window_present (GTK_WINDOW (window));
- return FALSE;
+ gboolean retval;
+
+ g_signal_emit_by_name (G_OBJECT (current_top), "delete-event", NULL, &retval);
+
+ if (retval) {
+ gtk_window_present (GTK_WINDOW (current_top));
+ return FALSE;
+ }
+ current_top = (ModestWindow *) hildon_window_stack_peek (stack);
}
if (MODEST_IS_MAILBOXES_WINDOW (current_top) && MODEST_IS_MAILBOXES_WINDOW (window)) {
- gtk_window_present (GTK_WINDOW (window));
+ gtk_window_present (GTK_WINDOW (current_top));
return FALSE;
}
/* Close the current view */
g_signal_emit_by_name (G_OBJECT (current_top), "delete-event", NULL, &retval);
- if (retval == TRUE) {
+ if (retval) {
/* Cancelled closing top window, then we fail to register */
goto fail;
}
child = (GtkWindow *) b;
win = (GtkWindow *) a;
- if (gtk_window_get_transient_for (win) == child)
+ if ((gtk_window_get_transient_for (win) == child) &&
+ GTK_WIDGET_VISIBLE (win))
return 0;
else
return 1;