diff options
| author | Xan Lopez <xan@igalia.com> | 2011-12-13 23:45:10 +0800 |
|---|---|---|
| committer | Xan Lopez <xan@igalia.com> | 2011-12-14 23:30:21 +0800 |
| commit | c1c74c929c1e773d1f79d1b3bd0cf10bb572f8f9 (patch) | |
| tree | 407b07bc318b263f518747ece8e668b933f9ed04 /src/ephy-lockdown.c | |
| parent | 1ce161d56a3db3c436e5fbf888472c1f864cebb8 (diff) | |
| download | gsoc2013-epiphany-c1c74c929c1e773d1f79d1b3bd0cf10bb572f8f9.tar gsoc2013-epiphany-c1c74c929c1e773d1f79d1b3bd0cf10bb572f8f9.tar.gz gsoc2013-epiphany-c1c74c929c1e773d1f79d1b3bd0cf10bb572f8f9.tar.bz2 gsoc2013-epiphany-c1c74c929c1e773d1f79d1b3bd0cf10bb572f8f9.tar.lz gsoc2013-epiphany-c1c74c929c1e773d1f79d1b3bd0cf10bb572f8f9.tar.xz gsoc2013-epiphany-c1c74c929c1e773d1f79d1b3bd0cf10bb572f8f9.tar.zst gsoc2013-epiphany-c1c74c929c1e773d1f79d1b3bd0cf10bb572f8f9.zip | |
Remove custom EphyToolbar in favor of a vanilla GtkToolbar
This allows us to stop using EggEditableToolbar here, we just load a
normal toolbar from GtkUIManager in EphyWindow. The special toolbar
actions and methods have been moved to EphyWindow too, mostly in a
mechanical fashion (probably some simplifications are possible).
The code in the bookmarks UI that depended on EphyToolbar has been #if
zeroed instead of porting it, since it will go away in the near future
too.
https://bugzilla.gnome.org/show_bug.cgi?id=664483
Diffstat (limited to 'src/ephy-lockdown.c')
| -rw-r--r-- | src/ephy-lockdown.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/ephy-lockdown.c b/src/ephy-lockdown.c index 54eb58a29..801b08ad1 100644 --- a/src/ephy-lockdown.c +++ b/src/ephy-lockdown.c @@ -30,7 +30,6 @@ #include "ephy-lockdown.h" #include "ephy-extension.h" #include "ephy-settings.h" -#include "ephy-toolbar.h" #include "ephy-prefs.h" #include "ephy-debug.h" @@ -68,7 +67,6 @@ arbitrary_url_cb (GSettings *settings, EphyWindow *window) { EphyEmbed *embed; - GtkWidget *toolbar; char *address; /* Restore the real web page address when disabling entry */ @@ -79,9 +77,8 @@ arbitrary_url_cb (GSettings *settings, if (embed == NULL) return; - toolbar = ephy_window_get_toolbar (window); address = ephy_web_view_get_location (ephy_embed_get_web_view (embed), TRUE); - ephy_toolbar_set_location (EPHY_TOOLBAR (toolbar), address); + ephy_window_set_location (window, address); ephy_web_view_set_typed_address (ephy_embed_get_web_view (embed), NULL); g_free (address); } |