0.8.11claws145

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

diff --git a/src/gtk/prefswindow.c b/src/gtk/prefswindow.c
index 1bba86954e3ef2ecc5df4ec98063cfabdabd953d..35cba419759e5492e6e635233117ce93568a8cd1 100644 (file)
--- a/src/gtk/prefswindow.c
+++ b/src/gtk/prefswindow.c
@@ -25,6 +25,7 @@
 #include <gtk/gtk.h>
 
 #include "intl.h"
 #include <gtk/gtk.h>
 
 #include "intl.h"

+#include "utils.h"

 #include "prefswindow.h"
 #include "gtkutils.h"
 
 #include "prefswindow.h"
 #include "gtkutils.h"
 


@@ -138,9 +139,9 @@ static void ok_button_released(GtkButton *button, gpointer user_data)
        g_free(prefswindow);
 }
 
        g_free(prefswindow);
 }
 

-static void cancel_button_released(GtkButton *button, gpointer user_data)
+static void close_prefs_window(PrefsWindow *prefswindow)

 {
 {

-       PrefsWindow *prefswindow = (PrefsWindow *) user_data;
+       debug_print("prefs window closed\n");

 
        gtk_widget_destroy(prefswindow->window);
        close_all_pages(prefswindow->prefs_pages);
 
        gtk_widget_destroy(prefswindow->window);
        close_all_pages(prefswindow->prefs_pages);


@@ -148,6 +149,21 @@ static void cancel_button_released(GtkButton *button, gpointer user_data)
        g_free(prefswindow);
 }
 
        g_free(prefswindow);
 }
 

+static void cancel_button_released(GtkButton *button, gpointer user_data)
+{
+       PrefsWindow *prefswindow = (PrefsWindow *) user_data;
+
+       close_prefs_window(prefswindow);
+}
+
+static gboolean window_closed(GtkWidget *widget, GdkEvent *event, gpointer user_data)
+{
+       PrefsWindow *prefswindow = (PrefsWindow *) user_data;
+
+       close_prefs_window(prefswindow);
+       return FALSE;
+}
+

 struct name_search
 {
        gchar *text;
 struct name_search
 {
        gchar *text;


@@ -266,6 +282,7 @@ void prefswindow_open(GSList *prefs_pages, gpointer data)
        gtk_signal_connect(GTK_OBJECT(prefswindow->ok_btn), "released", GTK_SIGNAL_FUNC(ok_button_released), prefswindow);
        gtk_signal_connect(GTK_OBJECT(prefswindow->cancel_btn), "released", GTK_SIGNAL_FUNC(cancel_button_released), prefswindow);
        gtk_signal_connect(GTK_OBJECT(prefswindow->apply_btn), "released", GTK_SIGNAL_FUNC(apply_button_released), prefswindow);
        gtk_signal_connect(GTK_OBJECT(prefswindow->ok_btn), "released", GTK_SIGNAL_FUNC(ok_button_released), prefswindow);
        gtk_signal_connect(GTK_OBJECT(prefswindow->cancel_btn), "released", GTK_SIGNAL_FUNC(cancel_button_released), prefswindow);
        gtk_signal_connect(GTK_OBJECT(prefswindow->apply_btn), "released", GTK_SIGNAL_FUNC(apply_button_released), prefswindow);

+       gtk_signal_connect(GTK_OBJECT(prefswindow->window), "delete_event", GTK_SIGNAL_FUNC(window_closed), prefswindow);

 
        gtk_widget_show_all(prefswindow->window);
 }
 
        gtk_widget_show_all(prefswindow->window);
 }