aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook
diff options
context:
space:
mode:
authorJon Trowbridge <trow@ximian.com>2001-10-21 08:19:25 +0800
committerJon Trowbridge <trow@src.gnome.org>2001-10-21 08:19:25 +0800
commit17a415bd21dfa41e5ba2b9711a5170d3765d7eac (patch)
tree631522c8e60c3f3bf9d4a748686f8101ac40caff /addressbook
parent259a514b63fd46a013d3689833754e42525435e8 (diff)
downloadgsoc2013-evolution-17a415bd21dfa41e5ba2b9711a5170d3765d7eac.tar
gsoc2013-evolution-17a415bd21dfa41e5ba2b9711a5170d3765d7eac.tar.gz
gsoc2013-evolution-17a415bd21dfa41e5ba2b9711a5170d3765d7eac.tar.bz2
gsoc2013-evolution-17a415bd21dfa41e5ba2b9711a5170d3765d7eac.tar.lz
gsoc2013-evolution-17a415bd21dfa41e5ba2b9711a5170d3765d7eac.tar.xz
gsoc2013-evolution-17a415bd21dfa41e5ba2b9711a5170d3765d7eac.tar.zst
gsoc2013-evolution-17a415bd21dfa41e5ba2b9711a5170d3765d7eac.zip
We shouldn't leak the info returned by oaf_query.
2001-10-20 Jon Trowbridge <trow@ximian.com> * backend/ebook/e-book.c (activate_factories_for_uri): We shouldn't leak the info returned by oaf_query. * gui/contact-editor/e-contact-quick-add.c (card_added_cb): Remove superfluous call to quick_add_unref. (editor_closed_cb): Remove superfluous call to quick_add_unref. * gui/component/select-names/e-select-names.c (esn_get_key_fn): We need to unref the card returned by e_addressbook_model_get_card. svn path=/trunk/; revision=13834
Diffstat (limited to 'addressbook')
-rw-r--r--addressbook/ChangeLog12
-rw-r--r--addressbook/backend/ebook/e-book.c2
-rw-r--r--addressbook/gui/component/select-names/e-select-names.c1
-rw-r--r--addressbook/gui/contact-editor/e-contact-quick-add.c4
4 files changed, 17 insertions, 2 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index a820c5a521..d3a5a1ec93 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,15 @@
+2001-10-20 Jon Trowbridge <trow@ximian.com>
+
+ * backend/ebook/e-book.c (activate_factories_for_uri): We
+ shouldn't leak the info returned by oaf_query.
+
+ * gui/contact-editor/e-contact-quick-add.c (card_added_cb): Remove
+ superfluous call to quick_add_unref.
+ (editor_closed_cb): Remove superfluous call to quick_add_unref.
+
+ * gui/component/select-names/e-select-names.c (esn_get_key_fn): We
+ need to unref the card returned by e_addressbook_model_get_card.
+
2001-10-20 Ettore Perazzoli <ettore@ximian.com>
* gui/component/addressbook-component.c: Make LDAP servers
diff --git a/addressbook/backend/ebook/e-book.c b/addressbook/backend/ebook/e-book.c
index 251a2fa6f9..41d5ec7e06 100644
--- a/addressbook/backend/ebook/e-book.c
+++ b/addressbook/backend/ebook/e-book.c
@@ -662,6 +662,8 @@ activate_factories_for_uri (EBook *book, const char *uri)
factory);
}
+ CORBA_free (info_list);
+
if (!book->priv->book_factories) {
g_warning ("Couldn't activate any book factories.");
return FALSE;
diff --git a/addressbook/gui/component/select-names/e-select-names.c b/addressbook/gui/component/select-names/e-select-names.c
index d91b7181d8..ceae5fc754 100644
--- a/addressbook/gui/component/select-names/e-select-names.c
+++ b/addressbook/gui/component/select-names/e-select-names.c
@@ -247,6 +247,7 @@ esn_get_key_fn (ETableModel *source, int row, void *closure)
EAddressbookModel *model = E_ADDRESSBOOK_MODEL (closure);
ECard *card = e_addressbook_model_get_card (model, row);
void *key = card_key (card);
+ gtk_object_unref (GTK_OBJECT (card));
return key;
}
diff --git a/addressbook/gui/contact-editor/e-contact-quick-add.c b/addressbook/gui/contact-editor/e-contact-quick-add.c
index 9559add2ee..7b84f50281 100644
--- a/addressbook/gui/contact-editor/e-contact-quick-add.c
+++ b/addressbook/gui/contact-editor/e-contact-quick-add.c
@@ -165,7 +165,7 @@ card_added_cb (EContactEditor *ce, EBookStatus status, ECard *card, gpointer clo
if (qa->cb)
qa->cb (qa->card, qa->closure);
- quick_add_unref (qa);
+ /* We don't need to unref qa because we set_data_full below */
gtk_object_set_data (GTK_OBJECT (ce), "quick_add", NULL);
}
}
@@ -176,7 +176,7 @@ editor_closed_cb (GtkWidget *w, gpointer closure)
QuickAdd *qa = (QuickAdd *) gtk_object_get_data (GTK_OBJECT (w), "quick_add");
if (qa) {
- quick_add_unref (qa);
+ /* We don't need to unref qa because we set_data_full below */
gtk_object_set_data (GTK_OBJECT (w), "quick_add", NULL);
gtk_object_unref (GTK_OBJECT (w));
}