diff options
| author | Marco Pesenti Gritti <marco@it.gnome.org> | 2003-04-25 19:40:44 +0800 |
|---|---|---|
| committer | Marco Pesenti Gritti <mpeseng@src.gnome.org> | 2003-04-25 19:40:44 +0800 |
| commit | 22bf87253ddffa6a7225ecaad60c15cd0815c974 (patch) | |
| tree | 1af0677192450246e702ed0efcf97c6410f03ae2 /src/ephy-shell.c | |
| parent | 8b97477b0882b666962c56ed2c20d26c615b9db3 (diff) | |
| download | gsoc2013-epiphany-22bf87253ddffa6a7225ecaad60c15cd0815c974.tar gsoc2013-epiphany-22bf87253ddffa6a7225ecaad60c15cd0815c974.tar.gz gsoc2013-epiphany-22bf87253ddffa6a7225ecaad60c15cd0815c974.tar.bz2 gsoc2013-epiphany-22bf87253ddffa6a7225ecaad60c15cd0815c974.tar.lz gsoc2013-epiphany-22bf87253ddffa6a7225ecaad60c15cd0815c974.tar.xz gsoc2013-epiphany-22bf87253ddffa6a7225ecaad60c15cd0815c974.tar.zst gsoc2013-epiphany-22bf87253ddffa6a7225ecaad60c15cd0815c974.zip | |
Update from egg
2003-04-25 Marco Pesenti Gritti <marco@it.gnome.org>
* data/ui/epiphany-toolbar.xml.in:
* lib/egg/Makefile.am:
* lib/egg/egg-editable-toolbar.c:
* lib/egg/egg-editable-toolbar.h:
* lib/egg/egg-menu-merge.c:
* lib/egg/egg-radio-action.c:
* lib/egg/eggmarshalers.c:
* lib/egg/eggmarshalers.h:
* lib/egg/eggmarshalers.list:
* lib/egg/eggtoggletoolbutton.c:
* lib/egg/eggtoggletoolbutton.h:
* lib/egg/eggtoolbar.c:
* lib/egg/eggtoolbar.h:
* lib/egg/eggtoolbutton.c:
* lib/egg/eggtoolbutton.h:
* lib/egg/eggtoolitem.c:
* lib/egg/eggtoolitem.h:
* lib/egg/eggtreemodelfilter.c:
Update from egg
* src/Makefile.am:
* src/ephy-location-action.c: (create_tool_item):
* src/ephy-shell.c: (ephy_shell_init), (ephy_shell_get_bookmarks),
* src/ephy-shell.h:
* src/ephy-window.c: (setup_window), (ephy_window_finalize),
(ephy_window_set_chrome):
* src/toolbar.c: (toolbar_class_init), (toolbar_set_window),
(topic_remove_cb), (bookmark_remove_cb), (toolbar_init),
(toolbar_new):
* src/window-commands.c: (window_cmd_edit_toolbar):
Use the new toolbar editor api. This is incomplete, if you
use bookmarks toolbars please still do not update.
Diffstat (limited to 'src/ephy-shell.c')
| -rw-r--r-- | src/ephy-shell.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/src/ephy-shell.c b/src/ephy-shell.c index 731bec1ea..9d71bfcef 100644 --- a/src/ephy-shell.c +++ b/src/ephy-shell.c @@ -58,6 +58,7 @@ struct EphyShellPrivate Session *session; EphyAutocompletion *autocompletion; EphyBookmarks *bookmarks; + EphyToolbarsModel *toolbars_model; GtkWidget *bme; GtkWidget *history_window; }; @@ -263,6 +264,7 @@ ephy_shell_init (EphyShell *gs) gs->priv->bookmarks = NULL; gs->priv->bme = NULL; gs->priv->history_window = NULL; + gs->priv->toolbars_model = NULL; ephy_shell = gs; g_object_add_weak_pointer (G_OBJECT(ephy_shell), @@ -640,6 +642,19 @@ ephy_shell_get_bookmarks (EphyShell *gs) return gs->priv->bookmarks; } +EphyToolbarsModel * +ephy_shell_get_toolbars_model (EphyShell *gs) +{ + if (gs->priv->toolbars_model == NULL) + { + gs->priv->toolbars_model = ephy_toolbars_model_new (); + egg_toolbars_model_load (EGG_TOOLBARS_MODEL (gs->priv->toolbars_model), + ephy_file ("epiphany-toolbar.xml")); + } + + return gs->priv->toolbars_model; +} + static void bookmarks_hide_cb (GtkWidget *widget, gpointer data) { |