diff options
| author | Marco Pesenti Gritti <marco@it.gnome.org> | 2003-05-27 03:02:39 +0800 |
|---|---|---|
| committer | Marco Pesenti Gritti <mpeseng@src.gnome.org> | 2003-05-27 03:02:39 +0800 |
| commit | 5ff8f7cb898f02ddf1f2dfe0370e90c1c8d3e061 (patch) | |
| tree | f1a60e760e06a39a3966e301fc520e90aed00263 /src/ephy-shell.c | |
| parent | 70183cca32190c0d2b038441c01bd927e11b8148 (diff) | |
| download | gsoc2013-epiphany-5ff8f7cb898f02ddf1f2dfe0370e90c1c8d3e061.tar gsoc2013-epiphany-5ff8f7cb898f02ddf1f2dfe0370e90c1c8d3e061.tar.gz gsoc2013-epiphany-5ff8f7cb898f02ddf1f2dfe0370e90c1c8d3e061.tar.bz2 gsoc2013-epiphany-5ff8f7cb898f02ddf1f2dfe0370e90c1c8d3e061.tar.lz gsoc2013-epiphany-5ff8f7cb898f02ddf1f2dfe0370e90c1c8d3e061.tar.xz gsoc2013-epiphany-5ff8f7cb898f02ddf1f2dfe0370e90c1c8d3e061.tar.zst gsoc2013-epiphany-5ff8f7cb898f02ddf1f2dfe0370e90c1c8d3e061.zip | |
s/DESTROYED/DESTROY which is more useulf
2003-05-26 Marco Pesenti Gritti <marco@it.gnome.org>
* lib/ephy-node.c: (callback), (ephy_node_dispose):
* lib/ephy-node.h:
s/DESTROYED/DESTROY which is more useulf
* lib/widgets/ephy-tree-model-node.c:
(ephy_tree_model_node_set_property), (root_destroy_cb):
* src/bookmarks/ephy-bookmarks-editor.c:
(ephy_bookmarks_editor_update_menu):
* src/bookmarks/ephy-bookmarks.c: (ephy_bookmarks_init_defaults),
(ephy_bookmarks_set_toolbars_model), (ephy_bookmarks_set_property),
(ephy_bookmarks_get_property), (ephy_bookmarks_class_init),
(bookmarks_removed_cb), (topics_removed_cb), (ephy_bookmarks_init),
(ephy_bookmarks_finalize):
* src/ephy-shell.c: (ephy_shell_get_toolbars_model):
* src/ephy-toolbars-model.c: (impl_add_item),
(ephy_toolbars_model_set_bookmarks),
(ephy_toolbars_model_set_property),
(ephy_toolbars_model_get_property),
(ephy_toolbars_model_class_init), (ephy_toolbars_model_init),
(ephy_toolbars_model_finalize), (ephy_toolbars_model_new):
* src/ephy-toolbars-model.h:
* src/toolbar.c: (topic_destroy_cb), (bookmark_destroy_cb),
(toolbar_ensure_action), (toolbar_init):
Better way to remove unrefed bookmarks from the toolbar.
Ref bookmarks in toolbars model and weak reaf toolbars model
in bookmarks. So setting defaults really works.
Diffstat (limited to 'src/ephy-shell.c')
| -rw-r--r-- | src/ephy-shell.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/ephy-shell.c b/src/ephy-shell.c index 4fcbcdf28..b2faa8cb3 100644 --- a/src/ephy-shell.c +++ b/src/ephy-shell.c @@ -663,8 +663,11 @@ ephy_shell_get_toolbars_model (EphyShell *gs) { char *xml_file; EggToolbarsModel *model; + EphyBookmarks *bookmarks; - gs->priv->toolbars_model = ephy_toolbars_model_new (); + bookmarks = ephy_shell_get_bookmarks (gs); + + gs->priv->toolbars_model = ephy_toolbars_model_new (bookmarks); model = EGG_TOOLBARS_MODEL (gs->priv->toolbars_model); xml_file = g_build_filename (ephy_dot_dir (), @@ -682,6 +685,9 @@ ephy_shell_get_toolbars_model (EphyShell *gs) egg_toolbars_model_load (model, default_xml); } g_free (xml_file); + + g_object_set (bookmarks, "toolbars_model", + gs->priv->toolbars_model, NULL); } return gs->priv->toolbars_model; |