diff options
| author | Marco Pesenti Gritti <marco@it.gnome.org> | 2003-03-04 19:42:28 +0800 |
|---|---|---|
| committer | Marco Pesenti Gritti <mpeseng@src.gnome.org> | 2003-03-04 19:42:28 +0800 |
| commit | 0edd1d380be6ee3a7dbcf5b93fe757ed5bbc1ebb (patch) | |
| tree | 29233fdea4c356af916664bf0b779907e20bf9fc /src/prefs-dialog.c | |
| parent | c615a211b12f14649045651af653d251dd46a29b (diff) | |
| download | gsoc2013-epiphany-0edd1d380be6ee3a7dbcf5b93fe757ed5bbc1ebb.tar gsoc2013-epiphany-0edd1d380be6ee3a7dbcf5b93fe757ed5bbc1ebb.tar.gz gsoc2013-epiphany-0edd1d380be6ee3a7dbcf5b93fe757ed5bbc1ebb.tar.bz2 gsoc2013-epiphany-0edd1d380be6ee3a7dbcf5b93fe757ed5bbc1ebb.tar.lz gsoc2013-epiphany-0edd1d380be6ee3a7dbcf5b93fe757ed5bbc1ebb.tar.xz gsoc2013-epiphany-0edd1d380be6ee3a7dbcf5b93fe757ed5bbc1ebb.tar.zst gsoc2013-epiphany-0edd1d380be6ee3a7dbcf5b93fe757ed5bbc1ebb.zip | |
about:options and about:epiphany
2003-03-04 Marco Pesenti Gritti <marco@it.gnome.org>
* data/Makefile.am:
* embed/mozilla/Makefile.am:
* embed/mozilla/MozRegisterComponents.cpp:
* src/Makefile.am:
about:options and about:epiphany
* src/ephy-shell.c: (ephy_init_services):
monitor proxy changes
* src/prefs-dialog.c: (create_page), (prefs_dialog_get_page):
* src/ui-prefs.c:
* src/ui-prefs.h:
* lib/widgets/ephy-spinner.c: (ephy_spinner_get_theme_info),
(ephy_spinner_init_directory_list), (ephy_spinner_info_free),
(ephy_spinner_get_theme_path):
* lib/widgets/ephy-spinner.h:
Remove spinner configuration, this should be part of the icon theme
at some point.
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"; |