aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook
diff options
context:
space:
mode:
Diffstat (limited to 'addressbook')
-rw-r--r--addressbook/ChangeLog7
-rw-r--r--addressbook/gui/contact-editor/e-contact-quick-add.c1
-rw-r--r--addressbook/gui/widgets/eab-popup-control.c2
3 files changed, 9 insertions, 1 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 04ddcca937..e6d4130c33 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,10 @@
+2006-06-09 Chris Heath <chris@heathens.co.nz>
+
+ * gui/widgets/eab-popup-control.c (eab_popup_control_set_free_form): Fix
+ memory leak
+ * gui/contact-editor/e-contact-quick-add.c (quick_add_merge_contact): Ditto.
+ Fixes bug #335423.
+
2006-05-25 Devashish Sharma <sdevashish@novell.com>
* gui/contact-editor/e-contact-quick-add.c : Right click add to
diff --git a/addressbook/gui/contact-editor/e-contact-quick-add.c b/addressbook/gui/contact-editor/e-contact-quick-add.c
index 66144a65d7..ec70ac360e 100644
--- a/addressbook/gui/contact-editor/e-contact-quick-add.c
+++ b/addressbook/gui/contact-editor/e-contact-quick-add.c
@@ -138,7 +138,6 @@ merge_cb (EBook *book, EBookStatus status, gpointer closure)
static void
quick_add_merge_contact (QuickAdd *qa)
{
- quick_add_ref (qa);
addressbook_load (qa->book, merge_cb, qa);
}
diff --git a/addressbook/gui/widgets/eab-popup-control.c b/addressbook/gui/widgets/eab-popup-control.c
index b682e189a2..bf8a26b002 100644
--- a/addressbook/gui/widgets/eab-popup-control.c
+++ b/addressbook/gui/widgets/eab-popup-control.c
@@ -208,6 +208,8 @@ eab_popup_control_set_free_form (EABPopupControl *pop, const gchar *txt)
gchar *email = g_strndup (lt+1, gt-lt-1);
eab_popup_control_set_name (pop, name);
eab_popup_control_set_email (pop, email);
+ g_free(name);
+ g_free(email);
return TRUE;
}