diff options
| author | Marco Pesenti Gritti <marco@gnome.org> | 2003-08-30 20:34:34 +0800 |
|---|---|---|
| committer | Marco Pesenti Gritti <marco@src.gnome.org> | 2003-08-30 20:34:34 +0800 |
| commit | 676d6d40cf906f7fd2c626ec21ef66e28c5aa3f0 (patch) | |
| tree | 5912819b0ffde208dca101c2237342226e7a203c /src/toolbar.c | |
| parent | a03cfa7451bad9af112897db73bd7eecc43e2f2c (diff) | |
| download | gsoc2013-epiphany-676d6d40cf906f7fd2c626ec21ef66e28c5aa3f0.tar gsoc2013-epiphany-676d6d40cf906f7fd2c626ec21ef66e28c5aa3f0.tar.gz gsoc2013-epiphany-676d6d40cf906f7fd2c626ec21ef66e28c5aa3f0.tar.bz2 gsoc2013-epiphany-676d6d40cf906f7fd2c626ec21ef66e28c5aa3f0.tar.lz gsoc2013-epiphany-676d6d40cf906f7fd2c626ec21ef66e28c5aa3f0.tar.xz gsoc2013-epiphany-676d6d40cf906f7fd2c626ec21ef66e28c5aa3f0.tar.zst gsoc2013-epiphany-676d6d40cf906f7fd2c626ec21ef66e28c5aa3f0.zip | |
Complete gtk 2.3 port. It doesnt run here but it could be my env.
2003-08-30 Marco Pesenti Gritti <marco@gnome.org>
* src/ephy-encoding-menu.c: (ephy_encoding_menu_verb_cb):
* src/ephy-favicon-action.c: (create_tool_item):
* src/ephy-favicon-action.h:
* src/ephy-favorites-menu.c: (ephy_favorites_menu_clean):
* src/ephy-go-action.c: (create_tool_item), (create_menu_proxy_cb):
* src/ephy-go-action.h:
* src/ephy-history-window.c: (ephy_history_window_construct):
* src/ephy-location-action.c: (ephy_location_action_get_widget):
* src/ephy-location-action.h:
* src/ephy-navigation-action.c:
* src/ephy-navigation-action.h:
* src/ephy-spinner-action.c: (create_tool_item),
(item_parent_set_cb):
* src/ephy-spinner-action.h:
* src/ephy-tab.c: (ephy_tab_init):
* src/ephy-tabs-menu.c: (ephy_tabs_menu_clean),
(tab_set_action_accelerator), (ephy_tabs_menu_update):
* src/ephy-window.c: (ephy_window_state_event_cb), (setup_window),
(update_layout_toggles):
* src/popup-commands.c:
* src/ppview-toolbar.c: (ppview_toolbar_set_window),
(ppview_toolbar_init):
* src/toolbar.c: (toolbar_activate_location):
* src/window-commands.c: (window_cmd_view_bookmarks_bar),
(window_cmd_view_toolbar), (window_cmd_view_statusbar),
(window_cmd_view_fullscreen):
Complete gtk 2.3 port. It doesnt run here but it could be
my env.
Diffstat (limited to 'src/toolbar.c')
| -rwxr-xr-x | src/toolbar.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/toolbar.c b/src/toolbar.c index dd88179dd..ad74702e9 100755 --- a/src/toolbar.c +++ b/src/toolbar.c @@ -24,7 +24,6 @@ #endif #include "toolbar.h" -#include "egg-menu-merge.h" #include "ephy-file-helpers.h" #include "ephy-shell.h" #include "ephy-location-entry.h" @@ -43,11 +42,12 @@ #include "ephy-debug.h" #include "ephy-new-bookmark.h" #include "ephy-stock-icons.h" -#include "eggtoolbar.h" #include "ephy-toolbars-model.h" #include <string.h> #include <bonobo/bonobo-i18n.h> +#include <gtk/gtkuimanager.h> +#include <gtk/gtktoolbar.h> static void toolbar_class_init (ToolbarClass *klass); static void toolbar_init (Toolbar *t); @@ -564,7 +564,7 @@ toolbar_activate_location (Toolbar *t) location = get_location_entry (t); g_return_if_fail (location != NULL); - location_tb = gtk_widget_get_ancestor (location, EGG_TYPE_TOOLBAR); + location_tb = gtk_widget_get_ancestor (location, GTK_TYPE_TOOLBAR); g_return_if_fail (location_tb != NULL); if (!GTK_WIDGET_VISIBLE (location_tb)) |