diff options
| author | Vincent Sanders <vince@kyllikki.org> | 2012-12-30 01:17:17 +0000 |
|---|---|---|
| committer | Vincent Sanders <vince@kyllikki.org> | 2013-01-01 00:59:47 +0000 |
| commit | 33934e12713f2ba8f5369a27f6abf725862f1a18 (patch) | |
| tree | 2e44e88ae51bd73d7b7b2f2b40e63100c0451946 /gtk/scaffolding.c | |
| parent | ea3f09a72433be165cc4ec09052b3d636e64ac0c (diff) | |
| download | netsurf-33934e12713f2ba8f5369a27f6abf725862f1a18.tar.gz netsurf-33934e12713f2ba8f5369a27f6abf725862f1a18.tar.bz2 | |
implement the GTK preferances dialog with signals
Diffstat (limited to 'gtk/scaffolding.c')
| -rw-r--r-- | gtk/scaffolding.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/gtk/scaffolding.c b/gtk/scaffolding.c index 91288a22e..8b9b8f3b1 100644 --- a/gtk/scaffolding.c +++ b/gtk/scaffolding.c @@ -53,7 +53,7 @@ #include "desktop/tree.h" #include "gtk/cookies.h" #include "gtk/completion.h" -#include "gtk/dialogs/options.h" +#include "gtk/dialogs/preferences.h" #include "gtk/dialogs/about.h" #include "gtk/dialogs/source.h" #include "gtk/bitmap.h" @@ -138,7 +138,6 @@ struct gtk_scaffolding { GtkBuilder *xml; struct gtk_history_window *history_window; - GtkDialog *preferences_dialog; int throb_frame; struct gui_window *top_level; @@ -1027,10 +1026,12 @@ MULTIHANDLER(find) MULTIHANDLER(preferences) { struct browser_window *bw = nsgtk_get_browser_window(g->top_level); - if (g->preferences_dialog == NULL) - g->preferences_dialog = nsgtk_options_init(bw, g->window); - else - gtk_widget_show(GTK_WIDGET(g->preferences_dialog)); + GtkWidget* wndpreferences; + + wndpreferences = nsgtk_preferences(bw, g->window); + if (wndpreferences != NULL) { + gtk_widget_show(GTK_WIDGET(wndpreferences)); + } return TRUE; } @@ -1769,8 +1770,6 @@ nsgtk_scaffolding *nsgtk_new_scaffolding(struct gui_window *toplevel) g->menu_bar = nsgtk_menu_bar_create(GTK_MENU_SHELL(gtk_builder_get_object(g->xml, "menubar")), group); - g->preferences_dialog = NULL; - /* set this window's size and position to what's in the options, or * or some sensible default if they're not set yet. */ |