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/bookmarks | |
| 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/bookmarks')
| -rw-r--r-- | src/bookmarks/ephy-bookmarks-menu.c | 2 | ||||
| -rw-r--r-- | src/bookmarks/ephy-bookmarksbar.c | 2 | ||||
| -rw-r--r-- | src/bookmarks/ephy-favorites-menu.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/bookmarks/ephy-bookmarks-menu.c b/src/bookmarks/ephy-bookmarks-menu.c index 0e06ac199..10e0dc201 100644 --- a/src/bookmarks/ephy-bookmarks-menu.c +++ b/src/bookmarks/ephy-bookmarks-menu.c @@ -523,7 +523,7 @@ ephy_bookmarks_menu_set_window (EphyBookmarksMenu *menu, EphyWindow *window) { menu->priv->window = window; - menu->priv->manager = GTK_UI_MANAGER (window->ui_merge); + menu->priv->manager = GTK_UI_MANAGER (ephy_window_get_ui_manager (window)); } static void diff --git a/src/bookmarks/ephy-bookmarksbar.c b/src/bookmarks/ephy-bookmarksbar.c index f6d6a49f3..9e0fecff9 100644 --- a/src/bookmarks/ephy-bookmarksbar.c +++ b/src/bookmarks/ephy-bookmarksbar.c @@ -284,7 +284,7 @@ ephy_bookmarksbar_set_window (EphyBookmarksBar *toolbar, { EggEditableToolbar *eggtoolbar = EGG_EDITABLE_TOOLBAR (toolbar); EggToolbarsModel *model = toolbar->priv->toolbars_model; - GtkUIManager *manager = GTK_UI_MANAGER (window->ui_merge); + GtkUIManager *manager = GTK_UI_MANAGER (ephy_window_get_ui_manager (window)); int i, n_toolbars; g_return_if_fail (toolbar->priv->window == NULL); diff --git a/src/bookmarks/ephy-favorites-menu.c b/src/bookmarks/ephy-favorites-menu.c index f2ef1e814..7a30f46a0 100644 --- a/src/bookmarks/ephy-favorites-menu.c +++ b/src/bookmarks/ephy-favorites-menu.c @@ -85,7 +85,7 @@ static void ephy_favorites_menu_clean (EphyFavoritesMenu *menu) { EphyFavoritesMenuPrivate *p = menu->priv; - GtkUIManager *merge = GTK_UI_MANAGER (p->window->ui_merge); + GtkUIManager *merge = GTK_UI_MANAGER (ephy_window_get_ui_manager (p->window)); if (p->ui_id > 0) { @@ -114,7 +114,7 @@ ephy_favorites_menu_rebuild (EphyFavoritesMenu *menu) gint i; EphyNode *fav; GPtrArray *children; - GtkUIManager *merge = GTK_UI_MANAGER (p->window->ui_merge); + GtkUIManager *merge = GTK_UI_MANAGER (ephy_window_get_ui_manager (p->window)); LOG ("Rebuilding favorites menu") |