Use new global settings dialog for gtk.

[modest] / src / gtk / modest-gtk-window-mgr.c

diff --git a/src/gtk/modest-gtk-window-mgr.c b/src/gtk/modest-gtk-window-mgr.c
index 4e04955..2ff3a19 100644 (file)
--- a/src/gtk/modest-gtk-window-mgr.c
+++ b/src/gtk/modest-gtk-window-mgr.c
@@ -827,11 +827,20 @@ modest_gtk_window_mgr_set_modal (ModestWindowMgr *self,
                                     GtkWindow *window,
                                     GtkWindow *parent)
 {
+       ModestGtkWindowMgrPrivate *priv;
+
        g_return_if_fail (MODEST_IS_GTK_WINDOW_MGR (self));
        g_return_if_fail (GTK_IS_WINDOW (window));
 
+       priv = MODEST_GTK_WINDOW_MGR_GET_PRIVATE (self);
+
        gtk_window_set_modal (window, TRUE);
-       gtk_window_set_transient_for (window, parent);
+
+       if (GTK_IS_WINDOW (parent)) {
+               gtk_window_set_transient_for (window, parent);
+       } else {
+               gtk_window_set_transient_for (window, GTK_WINDOW (priv->shell));
+       }
        gtk_window_set_destroy_with_parent (window, TRUE);
 }
 
@@ -1016,3 +1025,13 @@ modest_gtk_window_mgr_close_all_but_initial (ModestWindowMgr *self)
 
        return TRUE;
 }
+
+GtkWidget *
+modest_gtk_window_mgr_get_shell (ModestGtkWindowMgr *self)
+{
+       ModestGtkWindowMgrPrivate *priv;
+
+       priv = MODEST_GTK_WINDOW_MGR_GET_PRIVATE(self);
+
+       return priv->shell;
+}