From 9f70e82e7fd4d8888f55c63cf3eb911d27b0fbec Mon Sep 17 00:00:00 2001 From: Marco Pesenti Gritti Date: Sun, 13 Jul 2003 08:52:36 +0000 Subject: 2003-07-13 Marco Pesenti Gritti * Makefile.am: * configure.in: * embed/Makefile.am: * embed/ephy-embed-shell.c: (ephy_embed_shell_get_favicon_cache), (impl_get_downloader_view): * embed/ephy-embed-shell.h: * embed/ephy-embed-single.c: * embed/ephy-embed-single.h: * embed/mozilla/ProgressListener.cpp: * embed/mozilla/mozilla-embed.cpp: * lib/Makefile.am: * lib/ephy-langs.h: * lib/ephy-node.c: (unref_signal_objects), (ephy_node_signal_connect_object): * plugins/Makefile.am: * plugins/sample/Makefile.am: * plugins/sample/sample.c: (bmk_added), (bmk_removed), (bmk_changed), (switch_page_cb), (window_focus_in_cb), (location_changed_cb), (tab_added_cb), (new_window_cb), (plugin_init): * src/Makefile.am: * src/bookmarks/Makefile.am: * src/bookmarks/ephy-bookmark-action.c: (ephy_bookmark_action_sync_icon): * src/bookmarks/ephy-bookmark-properties.c: (set_window_icon), (ephy_bookmark_properties_init): * src/bookmarks/ephy-bookmarks-editor.c: (provide_favicon), (ephy_bookmarks_editor_init): * src/bookmarks/ephy-bookmarks.c: (update_favorites_menus): * src/bookmarks/ephy-topic-action.c: (build_bookmarks_menu): * src/ephy-automation.c: (impl_ephy_automation_loadurl), (impl_ephy_automation_quit), (impl_ephy_automation_load_session): * src/ephy-favicon-action.c: (ephy_favicon_action_init): * src/ephy-history-window.c: (confirmation_dialog_response_cb), (provide_favicon): * src/ephy-location-action.c: (connect_proxy): * src/ephy-notebook.c: (sync_icon): * src/ephy-shell.c: (ephy_shell_get_active_window), (ephy_shell_get_session), (ephy_shell_get_autocompletion), (ephy_shell_get_toolbars_model): * src/ephy-shell.h: * src/ephy-tab.c: (ephy_tab_net_state_cb), (ephy_tab_init), (ephy_tab_get_action): * src/ephy-tab.h: * src/ephy-tabs-menu.c: (ephy_tabs_menu_update): * src/ephy-window.c: (ephy_window_fullscreen), (ephy_window_unfullscreen), (sync_tab_icon), (ephy_window_init), (remove_from_session), (ephy_window_get_active_tab): --- src/toolbar.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'src/toolbar.c') diff --git a/src/toolbar.c b/src/toolbar.c index f2e071722..3d482f267 100755 --- a/src/toolbar.c +++ b/src/toolbar.c @@ -42,6 +42,7 @@ #include "ephy-new-bookmark.h" #include "ephy-stock-icons.h" #include "eggtoolbar.h" +#include "ephy-toolbars-model.h" #include #include @@ -138,7 +139,8 @@ topic_destroy_cb (EphyNode *node, EphyToolbarsModel *model; long id; - model = ephy_shell_get_toolbars_model (ephy_shell); + model = EPHY_TOOLBARS_MODEL + (ephy_shell_get_toolbars_model (ephy_shell)); id = ephy_node_get_id (node); name = ephy_toolbars_model_get_action_name (model, TRUE, id); @@ -161,7 +163,8 @@ bookmark_destroy_cb (EphyNode *node, EphyToolbarsModel *model; long id; - model = ephy_shell_get_toolbars_model (ephy_shell); + model = EPHY_TOOLBARS_MODEL + (ephy_shell_get_toolbars_model (ephy_shell)); id = ephy_node_get_id (node); name = ephy_toolbars_model_get_action_name (model, FALSE, id); @@ -422,7 +425,8 @@ init_bookmarks_toolbar (Toolbar *t) EphyToolbarsModel *model; int i, n_toolbars; - model = ephy_shell_get_toolbars_model (ephy_shell); + model = EPHY_TOOLBARS_MODEL + (ephy_shell_get_toolbars_model (ephy_shell)); n_toolbars = egg_toolbars_model_n_toolbars (EGG_TOOLBARS_MODEL (model)); @@ -527,7 +531,8 @@ toolbar_set_window (Toolbar *t, EphyWindow *window) G_CALLBACK (action_request_cb), NULL); - model = ephy_shell_get_toolbars_model (ephy_shell); + model = EPHY_TOOLBARS_MODEL + (ephy_shell_get_toolbars_model (ephy_shell)); g_signal_connect (EGG_TOOLBARS_MODEL (model), "toolbar_added", G_CALLBACK (update_toolbar_remove_flag), NULL); @@ -729,7 +734,8 @@ toolbar_set_visibility (Toolbar *t, EphyToolbarsModel *model; int i, n_toolbars; - model = ephy_shell_get_toolbars_model (ephy_shell); + model = EPHY_TOOLBARS_MODEL + (ephy_shell_get_toolbars_model (ephy_shell)); n_toolbars = egg_toolbars_model_n_toolbars (EGG_TOOLBARS_MODEL (model)); -- cgit v1.2.3