From 38f165dfad2c29b25f93efce2a29b1ea771615e8 Mon Sep 17 00:00:00 2001 From: Marco Pesenti Gritti Date: Sat, 10 May 2003 09:53:38 +0000 Subject: Rework prefs dialog ui a bit. Remove jumpto and tabbed_popups prefs 2003-05-10 Marco Pesenti Gritti * data/epiphany.schemas.in: * data/glade/prefs-dialog.glade: * lib/ephy-prefs.h: * src/Makefile.am: * src/ephy-shell.c: (ephy_shell_new_window_cb): * src/ephy-tab.c: (ephy_tab_new_window_cb): * src/prefs-dialog.c: (prefs_dialog_get_type), (prefs_dialog_new), (prefs_dialog_show_help), (setup_font_menu), (save_font_menu), (font_entry_changed_cb), (attach_font_signal), (attach_fonts_signals), (size_spinbutton_changed_cb), (attach_size_controls_signals), (setup_size_control), (setup_size_controls), (setup_fonts), (default_charset_menu_changed_cb), (find_charset_in_list_cmp), (create_default_charset_menu), (general_prefs_new_language_menu), (language_menu_changed_cb), (create_language_menu), (set_homepage_entry), (prefs_dialog_init), (prefs_dialog_response_cb), (prefs_clear_disk_cache_button_clicked_cb), (fonts_language_optionmenu_changed_cb), (prefs_homepage_current_button_clicked_cb), (prefs_homepage_blank_button_clicked_cb), (fill_language_editor), (language_dialog_changed_cb), (prefs_language_more_button_clicked_cb): * src/prefs-dialog.h: * src/window-commands.c: (window_cmd_edit_prefs): Rework prefs dialog ui a bit. Remove jumpto and tabbed_popups prefs (jumpto is still in the schemas. Remove the crazy page by page separation in the code. --- src/ephy-shell.c | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) (limited to 'src/ephy-shell.c') diff --git a/src/ephy-shell.c b/src/ephy-shell.c index 56f31799e..daf5f4513 100644 --- a/src/ephy-shell.c +++ b/src/ephy-shell.c @@ -219,23 +219,11 @@ ephy_shell_new_window_cb (EphyEmbedShell *shell, { EphyTab *new_tab; EphyWindow *window; - gboolean open_in_tab; g_assert (new_embed != NULL); - open_in_tab = (chromemask & EMBED_CHROME_OPENASCHROME) ? - FALSE : - eel_gconf_get_boolean (CONF_TABS_TABBED_POPUPS); - - if (open_in_tab) - { - window = ephy_shell_get_active_window (ephy_shell); - } - else - { - window = ephy_window_new (); - ephy_window_set_chrome (window, chromemask); - } + window = ephy_window_new (); + ephy_window_set_chrome (window, chromemask); new_tab = ephy_tab_new (); ephy_window_add_tab (window, new_tab, EPHY_NOTEBOOK_INSERT_GROUPED, FALSE); -- cgit v1.2.3