diff options
| author | Marco Pesenti Gritti <marco@it.gnome.org> | 2003-02-01 03:26:37 +0800 |
|---|---|---|
| committer | Marco Pesenti Gritti <mpeseng@src.gnome.org> | 2003-02-01 03:26:37 +0800 |
| commit | 7423fae667b40119604f2376a0bc2cc14701bbe5 (patch) | |
| tree | a0c0025a9c4929bafb72cdeb7dccaa44e071c7e7 | |
| parent | 69f9268e0676daa1d8a358d568355f73665c4f2d (diff) | |
| download | gsoc2013-epiphany-7423fae667b40119604f2376a0bc2cc14701bbe5.tar.gz gsoc2013-epiphany-7423fae667b40119604f2376a0bc2cc14701bbe5.tar.zst gsoc2013-epiphany-7423fae667b40119604f2376a0bc2cc14701bbe5.zip | |
Make favorites really work and avoid they crash when closing window, 0.5
2003-01-31 Marco Pesenti Gritti <marco@it.gnome.org>
* lib/ephy-types.h:
* src/bookmarks/ephy-bookmarks.c: (ephy_bookmarks_init):
* src/ephy-favorites-menu.c: (ephy_favorites_menu_clean),
(ephy_favorites_menu_rebuild):
Make favorites really work and avoid they crash when
closing window, 0.5 is nearer now :)
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | lib/ephy-types.h | 1 | ||||
| -rw-r--r-- | src/bookmarks/ephy-bookmarks.c | 2 | ||||
| -rw-r--r-- | src/ephy-favorites-menu.c | 3 |
4 files changed, 14 insertions, 2 deletions
@@ -1,5 +1,15 @@ 2003-01-31 Marco Pesenti Gritti <marco@it.gnome.org> + * lib/ephy-types.h: + * src/bookmarks/ephy-bookmarks.c: (ephy_bookmarks_init): + * src/ephy-favorites-menu.c: (ephy_favorites_menu_clean), + (ephy_favorites_menu_rebuild): + + Make favorites really work and avoid they crash when + closing window, 0.5 is nearer now :) + +2003-01-31 Marco Pesenti Gritti <marco@it.gnome.org> + * data/art/epiphany-bookmarks.png: better icon, thanks to jeroen diff --git a/lib/ephy-types.h b/lib/ephy-types.h index da27ceaaf..4b3652527 100644 --- a/lib/ephy-types.h +++ b/lib/ephy-types.h @@ -36,6 +36,7 @@ enum { BOOKMARKS_NODE_ID = 0, KEYWORDS_NODE_ID = 1, + FAVORITES_NODE_ID = 2, HOSTS_NODE_ID = 5, PAGES_NODE_ID = 6, ICONS_NODE_ID = 9, diff --git a/src/bookmarks/ephy-bookmarks.c b/src/bookmarks/ephy-bookmarks.c index 42be2aa12..87ae1ad03 100644 --- a/src/bookmarks/ephy-bookmarks.c +++ b/src/bookmarks/ephy-bookmarks.c @@ -552,7 +552,7 @@ ephy_bookmarks_init (EphyBookmarks *eb) G_OBJECT (eb), 0); - eb->priv->favorites = ephy_node_new (); + eb->priv->favorites = ephy_node_new_with_id (FAVORITES_NODE_ID); ephy_node_ref (eb->priv->favorites); g_signal_connect_object (G_OBJECT (eb->priv->favorites), "child_added", diff --git a/src/ephy-favorites-menu.c b/src/ephy-favorites-menu.c index c8be1e816..ae4cff59f 100644 --- a/src/ephy-favorites-menu.c +++ b/src/ephy-favorites-menu.c @@ -123,6 +123,7 @@ ephy_favorites_menu_clean (EphyFavoritesMenu *wrhm) if (p->ui_id >= 0) { egg_menu_merge_remove_ui (merge, p->ui_id); + egg_menu_merge_ensure_update (merge); } if (p->action_group != NULL) @@ -279,7 +280,7 @@ ephy_favorites_menu_rebuild (EphyFavoritesMenu *wrhm) if (children->len > 0) { GError *error = NULL; - + LOG ("Merging ui\n%s",xml->str); p->ui_id = egg_menu_merge_add_ui_from_string (merge, xml->str, -1, &error); } |