diff options
Diffstat (limited to 'addressbook/gui')
| -rw-r--r-- | addressbook/gui/contact-editor/e-contact-quick-add.c | 1 | ||||
| -rw-r--r-- | addressbook/gui/merging/e-card-merging.c | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/addressbook/gui/contact-editor/e-contact-quick-add.c b/addressbook/gui/contact-editor/e-contact-quick-add.c index 30c67a53ba..9559add2ee 100644 --- a/addressbook/gui/contact-editor/e-contact-quick-add.c +++ b/addressbook/gui/contact-editor/e-contact-quick-add.c @@ -83,7 +83,6 @@ quick_add_unref (QuickAdd *qa) if (qa) { --qa->refs; if (qa->refs == 0) { - g_message ("freeing %s / %s", qa->name, qa->email); g_free (qa->name); g_free (qa->email); gtk_object_unref (GTK_OBJECT (qa->card)); diff --git a/addressbook/gui/merging/e-card-merging.c b/addressbook/gui/merging/e-card-merging.c index d18c14f5bf..b9aacabde7 100644 --- a/addressbook/gui/merging/e-card-merging.c +++ b/addressbook/gui/merging/e-card-merging.c @@ -71,6 +71,7 @@ static void match_query_callback (ECard *card, ECard *match, ECardMatchType type, gpointer closure) { ECardMergingLookup *lookup = closure; + if ((gint) type <= (gint) E_CARD_MATCH_VAGUE) { doit (lookup); g_free (lookup); @@ -113,6 +114,7 @@ e_card_merging_book_add_card (EBook *book, gpointer closure) { ECardMergingLookup *lookup; + lookup = g_new (ECardMergingLookup, 1); lookup->op = E_CARD_MERGING_ADD; @@ -122,6 +124,7 @@ e_card_merging_book_add_card (EBook *book, lookup->closure = closure; e_card_locate_match_full (book, card, NULL, match_query_callback, lookup); + return TRUE; } @@ -133,6 +136,7 @@ e_card_merging_book_commit_card (EBook *book, { ECardMergingLookup *lookup; GList *avoid; + lookup = g_new (ECardMergingLookup, 1); lookup->op = E_CARD_MERGING_COMMIT; |