0.8.8claws56

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

diff --git a/src/gtk/prefswindow.c b/src/gtk/prefswindow.c
index b0a5717fc246df667c3ba9928dfac8005dc09858..dd83720b969bf254a01d42a66f232081779ee113 100644 (file)
--- a/src/gtk/prefswindow.c
+++ b/src/gtk/prefswindow.c
@@ -28,8 +28,6 @@
 #include "prefswindow.h"
 #include "../gtkutils.h"
 
-GSList *prefs_pages = NULL;
-
 typedef struct _PrefsWindow PrefsWindow;
 
 struct _PrefsWindow
@@ -47,17 +45,10 @@ struct _PrefsWindow
        GtkWidget *ok_btn;
        GtkWidget *cancel_btn;
        GtkWidget *apply_btn;
-};
-
-void prefswindow_register_page(PrefsPage *page)
-{
-       prefs_pages = g_slist_append(prefs_pages, page);
-}
 
-void prefswindow_unregister_page(PrefsPage *page)
-{
-       prefs_pages = g_slist_remove(prefs_pages, page);
-}
+       gpointer   data;
+       GSList    *prefs_pages;
+};
 
 static gboolean ctree_select_row(GtkCTree *ctree, GList *node, gint column, gpointer user_data)
 {
@@ -82,7 +73,7 @@ static gboolean ctree_select_row(GtkCTree *ctree, GList *node, gint column, gpoi
        }
 
        if (!page->page_open) {
-               page->create_widget(page);
+               page->create_widget(page, prefswindow->data);
                gtk_widget_ref(page->widget);
                gtk_widget_show_all(page->widget);
                page->page_open = TRUE;
@@ -101,7 +92,7 @@ static gboolean ctree_select_row(GtkCTree *ctree, GList *node, gint column, gpoi
        return FALSE;
 }
 
-static void save_all_pages()
+static void save_all_pages(GSList *prefs_pages)
 {
        GSList *cur;
 
@@ -114,7 +105,7 @@ static void save_all_pages()
        }
 }
 
-static void close_all_pages()
+static void close_all_pages(GSList *prefs_pages)
 {
        GSList *cur;
 
@@ -131,16 +122,19 @@ static void close_all_pages()
 
 static void apply_button_released(GtkButton *button, gpointer user_data)
 {
-       save_all_pages();
+       PrefsWindow *prefswindow = (PrefsWindow *) user_data;
+
+       save_all_pages(prefswindow->prefs_pages);
 }
 
 static void ok_button_released(GtkButton *button, gpointer user_data)
 {
        PrefsWindow *prefswindow = (PrefsWindow *) user_data;
 
-       save_all_pages();
+       save_all_pages(prefswindow->prefs_pages);
        gtk_widget_destroy(prefswindow->window);
-       close_all_pages();
+       close_all_pages(prefswindow->prefs_pages);
+       g_slist_free(prefswindow->prefs_pages);
        g_free(prefswindow);
 }
 
@@ -149,7 +143,8 @@ static void cancel_button_released(GtkButton *button, gpointer user_data)
        PrefsWindow *prefswindow = (PrefsWindow *) user_data;
 
        gtk_widget_destroy(prefswindow->window);
-       close_all_pages();
+       close_all_pages(prefswindow->prefs_pages);
+       g_slist_free(prefswindow->prefs_pages);
        g_free(prefswindow);
 }
 
@@ -173,7 +168,7 @@ static gboolean find_child_by_name(GtkCTree *ctree, GtkCTreeNode *node, struct n
        return FALSE;
 }
 
-void prefswindow_create()
+void prefswindow_open(GSList *prefs_pages, gpointer data)
 {
        static gchar *titles [] = {"Page Index"};
        GSList *cur;
@@ -182,6 +177,9 @@ void prefswindow_create()
 
        prefswindow = g_new0(PrefsWindow, 1);
 
+       prefswindow->data = data;
+       prefswindow->prefs_pages = g_slist_copy(prefs_pages);
+
        prefswindow->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
        gtk_window_set_title(GTK_WINDOW(prefswindow->window), _("Preferences"));
        gtk_window_set_default_size(GTK_WINDOW(prefswindow->window), 600, 340);
@@ -269,14 +267,3 @@ void prefswindow_create()
 
        gtk_widget_show_all(prefswindow->window);
 }
-
-void prefswindow_destroy_all_pages()
-{
-       GSList *cur;
-
-       for (cur = prefs_pages; cur != NULL; cur = g_slist_next(cur)) {
-               PrefsPage *page = (PrefsPage *) cur->data;
-
-               page->destroy_page(page);
-       }
-}