diff options
author | Christian Persch <chpe@cvs.gnome.org> | 2004-09-14 04:46:14 +0800 |
---|---|---|
committer | Christian Persch <chpe@src.gnome.org> | 2004-09-14 04:46:14 +0800 |
commit | bf60b7ae05e75e10a8f15ec8ca2635874c4dab90 (patch) | |
tree | 141774e6817ed54e8bab9e6a0ea362f3cc19b148 /src/toolbar.c | |
parent | 816da20fe31c6186a80ef92fe824ccd9088f9a15 (diff) | |
download | gsoc2013-epiphany-bf60b7ae05e75e10a8f15ec8ca2635874c4dab90.tar gsoc2013-epiphany-bf60b7ae05e75e10a8f15ec8ca2635874c4dab90.tar.gz gsoc2013-epiphany-bf60b7ae05e75e10a8f15ec8ca2635874c4dab90.tar.bz2 gsoc2013-epiphany-bf60b7ae05e75e10a8f15ec8ca2635874c4dab90.tar.lz gsoc2013-epiphany-bf60b7ae05e75e10a8f15ec8ca2635874c4dab90.tar.xz gsoc2013-epiphany-bf60b7ae05e75e10a8f15ec8ca2635874c4dab90.tar.zst gsoc2013-epiphany-bf60b7ae05e75e10a8f15ec8ca2635874c4dab90.zip |
Add ephy_window_get_ui_manager(), and remove the manager from the public
2004-09-13 Christian Persch <chpe@cvs.gnome.org>
* data/art/epiphany-entry.png:
* src/bookmarks/ephy-bookmarks-menu.c:
(ephy_bookmarks_menu_set_window):
* src/bookmarks/ephy-bookmarksbar.c:
(ephy_bookmarksbar_set_window):
* src/bookmarks/ephy-favorites-menu.c: (ephy_favorites_menu_clean),
(ephy_favorites_menu_rebuild):
* src/ephy-encoding-menu.c: (ephy_encoding_menu_set_window):
* src/ephy-tabs-menu.c: (ephy_tabs_menu_set_window),
(ephy_tabs_menu_clean), (ephy_tabs_menu_update):
* src/ephy-window.c: (add_widget), (sync_chromes_visibility),
(ephy_window_key_press_event), (init_menu_updaters),
(setup_ui_manager), (show_embed_popup), (ephy_window_init),
(ephy_window_finalize), (ephy_window_set_print_preview),
(ephy_window_get_ui_manager):
* src/ephy-window.h:
* src/ppview-toolbar.c: (ppview_toolbar_set_window):
* src/toolbar.c: (toolbar_set_window), (toolbar_new):
* src/window-commands.c: (window_cmd_edit_toolbar):
Add ephy_window_get_ui_manager(), and remove the manager
from the public EphyWindow struct.
Diffstat (limited to 'src/toolbar.c')
-rwxr-xr-x | src/toolbar.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/toolbar.c b/src/toolbar.c index 142b92806..a15257599 100755 --- a/src/toolbar.c +++ b/src/toolbar.c @@ -389,7 +389,7 @@ toolbar_set_window (Toolbar *t, EphyWindow *window) g_return_if_fail (t->priv->window == NULL); t->priv->window = window; - manager = GTK_UI_MANAGER (window->ui_merge); + manager = GTK_UI_MANAGER (ephy_window_get_ui_manager (window)); toolbar_setup_actions (t); gtk_ui_manager_insert_action_group (manager, @@ -472,7 +472,7 @@ toolbar_new (EphyWindow *window) { return EPHY_TOOLBAR (g_object_new (EPHY_TYPE_TOOLBAR, "window", window, - "ui-manager", window->ui_merge, + "ui-manager", ephy_window_get_ui_manager (window), NULL)); } |