2012-11-18 [colin] 3.9.0cvs6-stable

[claws.git] / src / gtk / description_window.c

diff --git a/src/gtk/description_window.c b/src/gtk/description_window.c
index a1a2ce3dbca0585c2bdd8f89fc8b5764a3c6b524..9e7d66cf5a1802f49d8a553ec13a984d16118202 100644 (file)
--- a/src/gtk/description_window.c
+++ b/src/gtk/description_window.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2011 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,6 +19,7 @@
 
 #ifdef HAVE_CONFIG_H
 #  include "config.h"
+#include "claws-features.h"
 #endif
 
 #include <glib.h>
@@ -26,6 +27,7 @@
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 
+#include "defs.h"
 #include "manage_window.h"
 #include "description_window.h"
 #include "gtkutils.h"
@@ -50,7 +52,12 @@ void description_window_create(DescriptionWindow *dwindow)
                description_create(dwindow);
        
                gtk_window_set_transient_for(GTK_WINDOW(dwindow->window), GTK_WINDOW(dwindow->parent));
-               gtk_window_set_modal(GTK_WINDOW(dwindow->parent), FALSE);
+               dwindow->parent_modal = gtk_window_get_modal(GTK_WINDOW(dwindow->parent));
+#ifndef G_OS_WIN32
+               gtk_window_set_modal(GTK_WINDOW(dwindow->parent), TRUE);
+#else
+               gtk_window_set_modal(GTK_WINDOW(dwindow->window), TRUE);
+#endif
                gtk_window_set_destroy_with_parent(GTK_WINDOW(dwindow->window), TRUE);
                gtk_widget_show(dwindow->window);
 
@@ -226,7 +233,10 @@ static void description_window_destroy (GtkWidget *widget, gpointer data)
                dwindow->window = NULL;
        }
        
-       if(dwindow->parent)
+       if(dwindow->parent) {
+               if (GTK_IS_WINDOW(dwindow->parent))
+                       gtk_window_set_modal(GTK_WINDOW(dwindow->parent), dwindow->parent_modal);
                g_signal_handlers_disconnect_by_func(G_OBJECT(dwindow->parent), 
                                        description_window_destroy, dwindow->parent);
+       }
 }