Fix closing of description window using WM controls.

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

diff --git a/src/gtk/description_window.c b/src/gtk/description_window.c
index 725bbc5f2c17e702871a55296496f79807b0083e..f7b8ebc0bd355bc2643ad6116f0f25e63272fa08 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-2009 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,14 +52,16 @@ void description_window_create(DescriptionWindow *dwindow)
                description_create(dwindow);
        
                gtk_window_set_transient_for(GTK_WINDOW(dwindow->window), GTK_WINDOW(dwindow->parent));
+               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);
 
-               /* in case the description window is closed using the WM's [X] button */
-               g_signal_connect(G_OBJECT(dwindow->window), "destroy",
-                               G_CALLBACK(gtk_widget_destroyed), &dwindow->window);
-
-       } else g_print("windows exist\n");
+       } else g_print("window exists\n");
 }
 
 static void description_create(DescriptionWindow * dwindow)
@@ -73,7 +77,7 @@ static void description_create(DescriptionWindow * dwindow)
        int sz;
        int line;
        int j;
-       int max_width = 0;
+       int *max_width = g_new0(int, dwindow->columns), width=0;
        GtkRequisition req;
        
        dwindow->window = gtkut_window_new(GTK_WINDOW_TOPLEVEL, "description_window");
@@ -124,8 +128,8 @@ static void description_create(DescriptionWindow * dwindow)
                                                 (GtkAttachOptions) (0), 0, 2);
 
                                gtk_widget_size_request(label, &req);
-                               if(req.width > max_width)
-                                       max_width = req.width;
+                               if(req.width > max_width[j])
+                                       max_width[j] = req.width;
                        }
                } else {
                        GtkWidget *separator;
@@ -139,8 +143,12 @@ static void description_create(DescriptionWindow * dwindow)
                line++;
        }
 
-       max_width += 150;
+       for(j=0; j<dwindow->columns; j++)
+               width += max_width[j];
 
+       g_free(max_width);
+       width += 100;
+       
        gtkut_stock_button_set_create(&hbbox, &close_btn, GTK_STOCK_CLOSE,
                                      NULL, NULL, NULL, NULL);
 
@@ -151,7 +159,7 @@ static void description_create(DescriptionWindow * dwindow)
        gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
 
        label = gtk_label_new(gettext(dwindow->description));
-       gtk_widget_set_size_request(GTK_WIDGET(label), max_width-2, -1);
+       gtk_widget_set_size_request(GTK_WIDGET(label), width-2, -1);
        gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT);
        gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
        gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
@@ -171,7 +179,7 @@ static void description_create(DescriptionWindow * dwindow)
                         G_CALLBACK(description_window_focus_in_event), NULL);
        g_signal_connect(G_OBJECT(dwindow->window), "focus_out_event",
                         G_CALLBACK(description_window_focus_out_event), NULL);
-       g_signal_connect(G_OBJECT(dwindow->window), "delete_event",
+       g_signal_connect(G_OBJECT(dwindow->window), "destroy",
                         G_CALLBACK(description_window_destroy), dwindow);
        
        if(dwindow->parent)
@@ -180,14 +188,14 @@ static void description_create(DescriptionWindow * dwindow)
 
        gtk_widget_show_all(vbox);
        gtk_widget_set_size_request(dwindow->window,
-                               (max_width < 400) ? 400 : max_width, 450);      
+                               (width < 400) ? 400 : width, 450);      
 }
 
 static gboolean description_window_key_pressed(GtkWidget *widget,
                                               GdkEventKey *event,
                                               gpointer data)
 {
-       if (event && event->keyval == GDK_Escape)
+       if (event && event->keyval == GDK_KEY_Escape)
                description_window_destroy(widget, data);
        return FALSE;
 }
@@ -214,14 +222,17 @@ static gboolean description_window_focus_out_event (GtkWidget *widget,
 static void description_window_destroy (GtkWidget *widget, gpointer data)
 {
        DescriptionWindow *dwindow = (DescriptionWindow *) data;
-       
+
        if(dwindow->window) {
                gtk_widget_hide(dwindow->window);
                gtk_widget_destroy(dwindow->window);
                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);
+       }
 }