aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <rburton@src.gnome.org>2005-04-28 17:27:39 +0800
committerRoss Burton <rburton@src.gnome.org>2005-04-28 17:27:39 +0800
commit317bcecd09f60134dda35f25942aed85924f9ea8 (patch)
tree89b2df992dc4d2d5eb29ef5ccd39f890ad3243c3
parent4d64f19cd294718fc7fc8bbc8892d3a6f1b86d5f (diff)
downloadgsoc2013-evolution-317bcecd09f60134dda35f25942aed85924f9ea8.tar.gz
gsoc2013-evolution-317bcecd09f60134dda35f25942aed85924f9ea8.tar.zst
gsoc2013-evolution-317bcecd09f60134dda35f25942aed85924f9ea8.zip
Fix some leaks
svn path=/trunk/; revision=29237
-rw-r--r--addressbook/ChangeLog6
-rw-r--r--addressbook/gui/widgets/e-addressbook-view.c10
-rw-r--r--addressbook/gui/widgets/eab-contact-display.c4
3 files changed, 19 insertions, 1 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 30cf2fccbe..a8a44278d4 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,9 @@
+2005-04-28 Ross Burton <ross@burtonini.com>
+
+ * gui/widgets/e-addressbook-view.c:
+ * gui/widgets/eab-contact-display.c:
+ Fix some memory leaks.
+
2005-04-21 Mengjie Yu <meng-jie.yu@sun.com>
* gui/widgets/e-minicard-view-widget.c:
diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c
index 3d2e9fdef5..d98c328cc6 100644
--- a/addressbook/gui/widgets/e-addressbook-view.c
+++ b/addressbook/gui/widgets/e-addressbook-view.c
@@ -368,6 +368,16 @@ eab_view_dispose (GObject *object)
eav->invisible = NULL;
}
+ if (eav->search_context) {
+ g_object_unref (eav->search_context);
+ eav->search_context = NULL;
+ }
+
+ if (eav->search_rule) {
+ g_object_unref (eav->search_rule);
+ eav->search_rule = NULL;
+ }
+
if (eav->ecml_changed_id != 0) {
g_signal_handler_disconnect (get_master_list(),
eav->ecml_changed_id);
diff --git a/addressbook/gui/widgets/eab-contact-display.c b/addressbook/gui/widgets/eab-contact-display.c
index 145b755781..95e0893b1b 100644
--- a/addressbook/gui/widgets/eab-contact-display.c
+++ b/addressbook/gui/widgets/eab-contact-display.c
@@ -75,6 +75,8 @@ on_url_requested (GtkHTML *html, const char *url, GtkHTMLStream *handle,
gtk_html_stream_write (handle, photo->data, photo->length);
gtk_html_end (html, handle, GTK_HTML_STREAM_OK);
+
+ e_contact_photo_free (photo);
}
else if (!strncmp (url, "evo-icon:", strlen ("evo-icon:"))) {
gchar *data;
@@ -435,7 +437,7 @@ eab_contact_display_render_normal (EABContactDisplay *display, EContact *contact
}
- if (e_contact_get (contact, E_CONTACT_IS_LIST))
+ if (e_contact_get_const (contact, E_CONTACT_IS_LIST))
render_contact_list (html_stream, contact);
else
render_contact (html_stream, contact);