Added dialog_response member to PrefsWindow.

diff --git a/src/gtk/prefswindow.c b/src/gtk/prefswindow.c
index 16ef9e3954741be57c5c62eebd1388128bd40a5d..dd910fdb36838bdbf251f5efd1517509511d83d9 100644 (file)
--- a/src/gtk/prefswindow.c
+++ b/src/gtk/prefswindow.c
@@ -120,6 +120,8 @@ static void apply_button_clicked(GtkButton *button, gpointer user_data)
 {
        PrefsWindow *prefswindow = (PrefsWindow *) user_data;
 
+       prefswindow->dialog_response = PREFSWINDOW_RESPONSE_APPLY;
+
        save_all_pages(prefswindow->prefs_pages);
 #ifdef GENERIC_UMPC
        prefs_show_sections(prefswindow);
@@ -146,6 +148,8 @@ static void ok_button_clicked(GtkButton *button, gpointer user_data)
 {
        PrefsWindow *prefswindow = (PrefsWindow *) user_data;
 
+       prefswindow->dialog_response = PREFSWINDOW_RESPONSE_OK;
+
        if (query_can_close_all_pages(prefswindow->prefs_pages)) {
                save_all_pages(prefswindow->prefs_pages);
                close_prefs_window(prefswindow);
@@ -411,6 +415,7 @@ void prefswindow_open_full(const gchar *title, GSList *prefs_pages,
        prefswindow->save_height = save_height;
        prefswindow->open_cb = open_cb;
        prefswindow->close_cb = close_cb;
+       prefswindow->dialog_response = PREFSWINDOW_RESPONSE_CANCEL;
 
        prefswindow->window = gtkut_window_new(GTK_WINDOW_TOPLEVEL, "prefswindow");
        gtk_window_set_title(GTK_WINDOW(prefswindow->window), title);

diff --git a/src/gtk/prefswindow.h b/src/gtk/prefswindow.h
index 20db56d1d791c443eff01befc7914fa7603c2ad4..c7e92a67f0e6e20e889d6f65b7b06a20b780c582 100644 (file)
--- a/src/gtk/prefswindow.h
+++ b/src/gtk/prefswindow.h
@@ -77,6 +77,7 @@ struct _PrefsWindow
        gint *save_height;
        PrefsCloseCallbackFunc open_cb;
        PrefsCloseCallbackFunc close_cb;
+       gint dialog_response; /* Useful for close_cb callbacks */
 
        GtkWidget *empty_page;
 
@@ -85,6 +86,13 @@ struct _PrefsWindow
        GDestroyNotify func;
 };
 
+enum
+{
+       PREFSWINDOW_RESPONSE_CANCEL,
+       PREFSWINDOW_RESPONSE_OK,
+       PREFSWINDOW_RESPONSE_APPLY
+};
+
 struct _PrefsTreeNode
 {
        PrefsPage *page;