aboutsummaryrefslogtreecommitdiffstats
path: root/src/window-commands.c
diff options
context:
space:
mode:
authorXan Lopez <xan@igalia.com>2011-12-13 23:45:10 +0800
committerXan Lopez <xan@igalia.com>2011-12-14 23:30:21 +0800
commitc1c74c929c1e773d1f79d1b3bd0cf10bb572f8f9 (patch)
tree407b07bc318b263f518747ece8e668b933f9ed04 /src/window-commands.c
parent1ce161d56a3db3c436e5fbf888472c1f864cebb8 (diff)
downloadgsoc2013-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/window-commands.c')
-rw-r--r--src/window-commands.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/window-commands.c b/src/window-commands.c
index ace995d9d..3fb876513 100644
--- a/src/window-commands.c
+++ b/src/window-commands.c
@@ -38,7 +38,6 @@
#include "ephy-history-window.h"
#include "ephy-file-chooser.h"
#include "ephy-file-helpers.h"
-#include "ephy-toolbar.h"
#include "ephy-state.h"
#include "ephy-gui.h"
#include "ephy-zoom.h"
@@ -1447,11 +1446,9 @@ void
window_cmd_load_location (GtkAction *action,
EphyWindow *window)
{
- EphyToolbar *toolbar;
const char *location;
- toolbar = EPHY_TOOLBAR (ephy_window_get_toolbar (window));
- location = ephy_toolbar_get_location (toolbar);
+ location = ephy_window_get_location (window);
if (location)
{