diff options
Diffstat (limited to 'src/prefs-dialog.c')
| -rw-r--r-- | src/prefs-dialog.c | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/src/prefs-dialog.c b/src/prefs-dialog.c index 1d7bb34ee..813821cb6 100644 --- a/src/prefs-dialog.c +++ b/src/prefs-dialog.c @@ -23,7 +23,6 @@ #include "prefs-dialog.h" #include "general-prefs.h" #include "appearance-prefs.h" -#include "ui-prefs.h" #include "ephy-dialog.h" #include "ephy-prefs.h" #include "ephy-embed-prefs.h" @@ -78,6 +77,23 @@ EphyDialogProperty network_properties [] = { -1, NULL, NULL } }; +enum +{ + OPEN_IN_TABS_PROP, + JUMP_TO_PROP, + POPUPS_PROP +}; + +static const +EphyDialogProperty ui_properties [] = +{ + { OPEN_IN_TABS_PROP, "open_in_tabs_checkbutton", CONF_TABS_TABBED, PT_AUTOAPPLY, NULL }, + { JUMP_TO_PROP, "jump_to_checkbutton", CONF_TABS_TABBED_AUTOJUMP, PT_AUTOAPPLY, NULL }, + { POPUPS_PROP, "popups_checkbutton", CONF_TABS_TABBED_POPUPS, PT_AUTOAPPLY, NULL }, + + { -1, NULL, NULL } +}; + struct PrefsDialogPrivate { GtkWidget *notebook; @@ -167,8 +183,6 @@ create_page (PrefsPageID id, page = appearance_prefs_new (); break; case PREFS_PAGE_UI: - page = ui_prefs_new (); - break; case PREFS_PAGE_ADVANCED: page = ephy_dialog_new (); ephy_dialog_construct (EPHY_DIALOG(page), @@ -199,6 +213,7 @@ prefs_dialog_get_page (PrefsDialog *pd, break; case PREFS_PAGE_UI: page_widget = "ui_page_box"; + prop = ui_properties; break; case PREFS_PAGE_ADVANCED: page_widget = "network_page_box"; |