X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-hildon2-window-mgr.c;h=b6618de000d697baba46fbbb2199cfe946ed3469;hb=431e6afaedd1f67abdca9e5bb7b14e5027401d00;hp=5d8d156ca075cdfe658c258f76f3298ffeb532c4;hpb=6d51b035c0de4047913c39cef0db7b1792df2cd2;p=modest

diff --git a/src/hildon2/modest-hildon2-window-mgr.c b/src/hildon2/modest-hildon2-window-mgr.c
index 5d8d156..b6618de 100644
--- a/src/hildon2/modest-hildon2-window-mgr.c
+++ b/src/hildon2/modest-hildon2-window-mgr.c
@@ -602,7 +602,9 @@ cancel_window_operations (ModestWindow *window)
 		GSList* tmp_list = NULL;
 
 		type = modest_mail_operation_get_type_operation (MODEST_MAIL_OPERATION (pending_ops->data));
-		if (type == MODEST_MAIL_OPERATION_TYPE_RECEIVE || type == MODEST_MAIL_OPERATION_TYPE_OPEN) {
+		if (type == MODEST_MAIL_OPERATION_TYPE_RECEIVE ||
+		    type == MODEST_MAIL_OPERATION_TYPE_OPEN ||
+		    type == MODEST_MAIL_OPERATION_TYPE_SEND_AND_RECEIVE) {
 			modest_mail_operation_cancel (pending_ops->data);
 		}
 		g_object_unref (G_OBJECT (pending_ops->data));
@@ -833,33 +835,56 @@ modest_hildon2_window_mgr_get_main_window (ModestWindowMgr *self, gboolean show)
 		gtk_widget_show_all (GTK_WIDGET (result));
 		gtk_window_present (GTK_WINDOW (result));
 	}
-	
+
 	return result;
 }
 
+static gint
+look_for_transient (gconstpointer a,
+		    gconstpointer b)
+{
+	GtkWindow *win, *child;
+
+	if (a == b)
+		return 1;
+
+	child = (GtkWindow *) b;
+	win = (GtkWindow *) a;
+
+	if (gtk_window_get_transient_for (win) == child)
+		return 0;
+	else
+		return 1;
+}
 
 static GtkWindow *
 modest_hildon2_window_mgr_get_modal (ModestWindowMgr *self)
 {
 	ModestHildon2WindowMgrPrivate *priv;
 	GList *toplevel_list;
-	GtkWindow *toplevel;
+	GtkWidget *current_top, *toplevel;
+	HildonWindowStack *stack;
 
 	g_return_val_if_fail (MODEST_IS_HILDON2_WINDOW_MGR (self), NULL);
 	priv = MODEST_HILDON2_WINDOW_MGR_GET_PRIVATE (self);
 
-	toplevel = NULL;
+	/* Get current top */
+	stack = hildon_window_stack_get_default ();
+	current_top = hildon_window_stack_peek (stack);
+	toplevel = current_top;
 	toplevel_list = gtk_window_list_toplevels ();
-	while (toplevel_list) {
-		if (gtk_window_is_active (toplevel_list->data) &&
-		    gtk_window_get_modal (toplevel_list->data)) {
-			toplevel = (GtkWindow *) toplevel_list->data;
+
+	while (toplevel) {
+		GList *parent_link;
+
+		parent_link = g_list_find_custom (toplevel_list, toplevel, look_for_transient);
+		if (parent_link)
+			toplevel = (GtkWidget *) parent_link->data;
+		else
 			break;
-		}
-		toplevel_list = g_list_next (toplevel_list);
 	}
 
-	return toplevel;
+	return (GtkWindow *) toplevel;
 }
 
 
@@ -877,6 +902,23 @@ modest_hildon2_window_mgr_set_modal (ModestWindowMgr *self,
 }
 
 static void
+close_all_but_first (HildonWindowStack *stack)
+{
+	gint num_windows, i;
+	gboolean retval;
+
+	num_windows = hildon_window_stack_size (stack);
+
+	for (i = 0; i < (num_windows - 1); i++) {
+		GtkWidget *current_top;
+
+		/* Close window */
+		current_top = hildon_window_stack_peek (stack);
+		g_signal_emit_by_name (G_OBJECT (current_top), "delete-event", NULL, &retval);
+	}
+}
+
+static void
 on_account_removed (TnyAccountStore *acc_store, 
 		    TnyAccount *account,
 		    gpointer user_data)
@@ -904,8 +946,6 @@ on_account_removed (TnyAccountStore *acc_store,
 		header_view = modest_header_window_get_header_view (MODEST_HEADER_WINDOW (current_top));
 		folder = modest_header_view_get_folder (header_view);
 		if (folder) {
-			gboolean retval;
-
 			/* Close if it's my account */
 			if (!TNY_IS_MERGE_FOLDER (folder)) {
 				TnyAccount *my_account;
@@ -913,9 +953,7 @@ on_account_removed (TnyAccountStore *acc_store,
 				my_account = tny_folder_get_account (folder);
 				if (my_account) {
 					if (my_account == account) {
-						g_signal_emit_by_name (G_OBJECT (current_top),
-								       "delete-event",
-								       NULL, &retval);
+						close_all_but_first (stack);
 						deleted = TRUE;
 					}
 					g_object_unref (my_account);
@@ -925,17 +963,14 @@ on_account_removed (TnyAccountStore *acc_store,
 			/* Close if viewing outbox and no account left */
 			if (tny_folder_get_folder_type (folder) == TNY_FOLDER_TYPE_OUTBOX) {
 				if (!has_accounts) {
-					g_signal_emit_by_name (G_OBJECT (current_top),
-							       "delete-event",
-							       NULL, &retval);
+					close_all_but_first (stack);
 					deleted = TRUE;
 				}
 			}
 			g_object_unref (folder);
 
-			if (deleted) {
+			if (deleted)
 				current_top = (ModestWindow *) hildon_window_stack_peek (stack);
-			}
 		}
 	}
 }