From: José Dapena Paz <jdapena@igalia.com>
Date: Wed, 10 Feb 2010 17:04:30 +0000 (+0100)
Subject: On receiving dbus ui calls, if we have a modal dialog on top,
X-Git-Tag: 3.2.12-6~4
X-Git-Url: http://git.maemo.org/git/?p=modest;a=commitdiff_plain;h=b61bd2a1a3703f6e53e62493c98a3f487cc5eb71

On receiving dbus ui calls, if we have a modal dialog on top,
raise modest properly.

Fixes NB#156458.
---

diff --git a/src/dbus_api/modest-dbus-callbacks.c b/src/dbus_api/modest-dbus-callbacks.c
index e5727f5..6f41480 100644
--- a/src/dbus_api/modest-dbus-callbacks.c
+++ b/src/dbus_api/modest-dbus-callbacks.c
@@ -1531,8 +1531,17 @@ on_idle_show_memory_low (gpointer user_data)
 static gboolean
 on_idle_present_modal (gpointer user_data)
 {
+	GtkWindow *current, *transient;
 	gdk_threads_enter ();
-	gtk_window_present (user_data);
+	current = (GtkWindow *) user_data;
+	while (GTK_IS_DIALOG (current)) {
+		transient = gtk_window_get_transient_for (GTK_WINDOW (current));
+		if (transient == NULL)
+			break;
+		else
+			current = transient;
+	}
+	gtk_window_present (current);
 	gdk_threads_leave ();
 
 	return FALSE;