aboutsummaryrefslogtreecommitdiffstats
path: root/src/ephy-shell.c
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2005-01-13 03:04:48 +0800
committerChristian Persch <chpe@src.gnome.org>2005-01-13 03:04:48 +0800
commit3564d87bc51c44ac10645479f3523fff81d892f1 (patch)
tree96c9c817cd8ccc33c0188c8a7c7d311e618f4f4b /src/ephy-shell.c
parenta27be014985599ab073926bbf676846bdb2657c3 (diff)
downloadgsoc2013-epiphany-3564d87bc51c44ac10645479f3523fff81d892f1.tar.gz
gsoc2013-epiphany-3564d87bc51c44ac10645479f3523fff81d892f1.tar.zst
gsoc2013-epiphany-3564d87bc51c44ac10645479f3523fff81d892f1.zip
Add Toolbar toggle to document context menu in fullscreen mode.
2005-01-12 Christian Persch <chpe@cvs.gnome.org> * data/ui/epiphany-ui.xml: Add Toolbar toggle to document context menu in fullscreen mode. * lib/egg/egg-editable-toolbar.c: (set_fixed_style), (update_fixed), (egg_editable_toolbar_set_fixed): * lib/egg/egg-editable-toolbar.h: Changed to allow setting a toolbar as fixed, not just one item. * lib/widgets/ephy-search-entry.h: Add _ prefixed struct declarations. * po/POTFILES.in: Updated. * src/Makefile.am: A src/ephy-fullscreen-popup.c: A src/ephy-fullscreen-popup.h: * src/ephy-history-window.c: * src/ephy-shell.c: (ephy_shell_new_tab): A src/ephy-toolbar.c: A src/ephy-toolbar.h: * src/ephy-window.c: (destroy_fullscreen_popup), (ephy_window_destroy), (exit_fullscreen_clicked_cb), (get_toolbar_visibility), (sync_chromes_visibility), (ephy_window_fullscreen), (ephy_window_unfullscreen), (sync_tab_address), (sync_tab_icon), (sync_tab_navigation), (sync_tab_security), (sync_tab_load_status), (sync_tab_zoom), (show_embed_popup), (modal_alert_cb), (ephy_window_focus_in_event), (ephy_window_focus_out_event), (ephy_window_init), (ephy_window_activate_location): R src/toolbar.c: R src/toolbar.h: * src/window-commands.c: (window_cmd_load_location): Implemented in-toolbar exit button, and integrated status indicator in the exit fullscreen popup. Moved toolbar.[ch] to ephy-toolbar.[ch] for namespace correcness, and much-needed code cleanup.
Diffstat (limited to 'src/ephy-shell.c')
-rw-r--r--src/ephy-shell.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/ephy-shell.c b/src/ephy-shell.c
index 806e49776..235cdc3f5 100644
--- a/src/ephy-shell.c
+++ b/src/ephy-shell.c
@@ -36,12 +36,12 @@
#include "prefs-dialog.h"
#include "ephy-debug.h"
#include "ephy-extensions-manager.h"
-#include "toolbar.h"
#include "ephy-session.h"
#include "downloader-view.h"
#include "egg-toolbars-model.h"
#include "eggtypebuiltins.h"
#include "ephy-toolbars-model.h"
+#include "ephy-toolbar.h"
#include "ephy-automation.h"
#include "print-dialog.h"
@@ -551,7 +551,7 @@ ephy_shell_new_tab (EphyShell *shell,
EphyEmbed *previous_embed = NULL;
GtkWidget *nb;
int position = -1;
- Toolbar *toolbar;
+ EphyToolbar *toolbar;
if (flags & EPHY_NEW_TAB_IN_NEW_WINDOW) in_new_window = TRUE;
if (flags & EPHY_NEW_TAB_IN_EXISTING_WINDOW) in_new_window = FALSE;
@@ -597,7 +597,7 @@ ephy_shell_new_tab (EphyShell *shell,
flags & EPHY_NEW_TAB_NEW_PAGE)
{
ephy_tab_set_location (tab, "", EPHY_TAB_ADDRESS_EXPIRE_NEXT);
- toolbar_activate_location (toolbar);
+ ephy_toolbar_activate_location (toolbar);
load_homepage (embed);
}
else if (flags & EPHY_NEW_TAB_OPEN_PAGE)