fix bug 4239, 'Preferences: Text Options Header Display modal is not modal' (sic)

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

diff --git a/src/gtk/prefswindow.c b/src/gtk/prefswindow.c
index dd910fdb36838bdbf251f5efd1517509511d83d9..e98d30acb7831c645c30f06d652c749aa697c679 100644 (file)
--- a/src/gtk/prefswindow.c
+++ b/src/gtk/prefswindow.c
@@ -126,6 +126,9 @@ static void apply_button_clicked(GtkButton *button, gpointer user_data)
 #ifdef GENERIC_UMPC
        prefs_show_sections(prefswindow);
 #endif
+
+       if (prefswindow->apply_cb)
+               prefswindow->apply_cb(prefswindow);
 }
 
 static void close_prefs_window(PrefsWindow *prefswindow)
@@ -317,7 +320,7 @@ static void prefswindow_build_tree(GtkWidget *tree_view, GSList *prefs_pages,
                        gtk_tree_model_foreach(GTK_TREE_MODEL(store), 
                                               (GtkTreeModelForeachFunc) find_node_by_name,
                                               &find_name);
-                       if (find_name.found && page->path[i] != page->path[i-1]) {
+                       if (find_name.found && (i == 0 || page->path[i] != page->path[i-1])) {
                                node = find_name.node;
                                gtk_tree_model_get(GTK_TREE_MODEL(store), &node,
                                                   PREFS_PAGE_DATA, &prefs_node,
@@ -398,6 +401,7 @@ void prefswindow_open_full(const gchar *title, GSList *prefs_pages,
                                                         gint *save_width, gint *save_height,
                                                         gboolean preload_pages,
                                                         PrefsOpenCallbackFunc open_cb,
+                                                        PrefsApplyCallbackFunc apply_cb,
                                                         PrefsCloseCallbackFunc close_cb)
 {
        PrefsWindow *prefswindow;
@@ -414,6 +418,7 @@ void prefswindow_open_full(const gchar *title, GSList *prefs_pages,
        prefswindow->save_width = save_width;
        prefswindow->save_height = save_height;
        prefswindow->open_cb = open_cb;
+       prefswindow->apply_cb = apply_cb;
        prefswindow->close_cb = close_cb;
        prefswindow->dialog_response = PREFSWINDOW_RESPONSE_CANCEL;
 
@@ -423,6 +428,7 @@ void prefswindow_open_full(const gchar *title, GSList *prefs_pages,
        gtk_window_set_position (GTK_WINDOW(prefswindow->window), GTK_WIN_POS_CENTER);
        gtk_window_set_modal (GTK_WINDOW (prefswindow->window), TRUE);
        gtk_window_set_resizable (GTK_WINDOW(prefswindow->window), TRUE);
+       gtk_window_set_type_hint(GTK_WINDOW(prefswindow->window), GDK_WINDOW_TYPE_HINT_DIALOG);
        gtk_window_set_transient_for (GTK_WINDOW(prefswindow->window),
                        GTK_WINDOW(mainwindow_get_mainwindow()->window));
        gtk_container_set_border_width(GTK_CONTAINER(prefswindow->window), 4);
@@ -567,10 +573,11 @@ void prefswindow_open_full(const gchar *title, GSList *prefs_pages,
 void prefswindow_open(const gchar *title, GSList *prefs_pages, gpointer data,
                                         gint *save_width, gint *save_height,
                                         PrefsOpenCallbackFunc open_cb,
+                                        PrefsApplyCallbackFunc apply_cb,
                                         PrefsCloseCallbackFunc close_cb)
 {
        prefswindow_open_full(title, prefs_pages, data, NULL, save_width, save_height,
-                                                 FALSE, open_cb, close_cb);
+                                                 FALSE, open_cb, apply_cb, close_cb);
 }
 
 /*!