diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rwxr-xr-x | lib/egg/egg-editable-toolbar.c | 14 | ||||
| -rw-r--r-- | src/bookmarks/ephy-topics-entry.c | 2 |
3 files changed, 20 insertions, 3 deletions
@@ -1,3 +1,10 @@ +2006-02-02 Jean-François Rameau <jframeau@cvs.gnome.org> + + * lib/egg/egg-editable-toolbar.c: (toolbar_visibility_refresh): + * src/bookmarks/ephy-topics-entry.c: (update_database): + + Fix some memory leaks. + 2006-02-02 Peter Harvey <peter.a.harvey@gmail.com> * src/bookmarks/ephy-bookmark-action.c diff --git a/lib/egg/egg-editable-toolbar.c b/lib/egg/egg-editable-toolbar.c index 532debb1d..e7deb4129 100755 --- a/lib/egg/egg-editable-toolbar.c +++ b/lib/egg/egg-editable-toolbar.c @@ -794,15 +794,23 @@ toolbar_visibility_refresh (EggEditableToolbar *etoolbar) g_value_init (&value, G_TYPE_STRING); g_object_get_property (G_OBJECT (action), "label", &value); name = g_value_get_string (&value); - if (name == NULL) continue; - + if (name == NULL) + { + g_value_unset (&value); + continue; + } k += g_utf8_strlen (name, -1) + 2; if (j > 0) { g_string_append (string, ", "); - if (k > 25) break; + if (k > 25) + { + g_value_unset (&value); + break; + } } g_string_append (string, name); + g_value_unset (&value); } if (j < n_items) { diff --git a/src/bookmarks/ephy-topics-entry.c b/src/bookmarks/ephy-topics-entry.c index e9fc3ab74..2c501b3d6 100644 --- a/src/bookmarks/ephy-topics-entry.c +++ b/src/bookmarks/ephy-topics-entry.c @@ -295,6 +295,8 @@ update_database (EphyTopicsEntry *entry) valid = gtk_tree_model_iter_next (model, &iter); } + g_strfreev (split); + priv->lock = FALSE; } |