← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/evolution/oneiric-proposed

« back to all changes in this revision

Viewing changes to addressbook/gui/merging/eab-contact-compare.c

  • Committer: Bazaar Package Importer
  • Author(s): Mathieu Trudel-Lapierre
  • Date: 2011-08-18 11:10:01 UTC
  • mfrom: (1.1.83 upstream)
  • Revision ID: james.westby@ubuntu.com-20110818111001-559uzyuqsoyj7xjg
Tags: 3.1.5-0ubuntu1
https://launchpad.net/bugs/828693
* New upstream release.
* debian/control: bump e-d-s Build-Depends to 3.1.5.
* debian/patches/03_lpi.patch: refreshed.
* debian/patches/11_remove_upstream_submit_bugreport.patch: refreshed.
* debian/patches/bogofilter_init_903b8e6.patch,
  debian/patches/evo_fbee43e_to_f4505a2.patch,
  debian/patches/spamassassin_init_4fc04af.patch: dropped, included upstream.
* debian/patches/spamd_sbin_path.patch: correct the path to spamd as
  /usr/sbin/spamd, which is the correct path in Ubuntu. (LP: #828693)

Show diffs side-by-side

added added

removed removed

Lines of Context:
addressbook/gui/merging/eab-contact-compare.c
573
573
}
574
574
 
575
575
static void
576
 
query_cb (GObject *source_object, GAsyncResult *result, gpointer user_data)
 
576
query_cb (GObject *source_object,
 
577
          GAsyncResult *result,
 
578
          gpointer user_data)
577
579
{
578
580
        MatchSearchInfo *info = (MatchSearchInfo *) user_data;
579
581
        EABContactMatchType best_match = EAB_CONTACT_MATCH_NONE;
584
586
        GError *error = NULL;
585
587
        const GSList *ii;
586
588
 
587
 
        if (result && !e_book_client_get_contacts_finish (book_client, result, &contacts, &error)) {
588
 
                g_debug ("%s: Failed to get contacts: %s\n", G_STRFUNC, error ? error->message : "Unknown error");
589
 
                if (error)
590
 
                        g_error_free (error);
591
 
 
592
 
                info->cb (info->contact, NULL, EAB_CONTACT_MATCH_NONE, info->closure);
 
589
        if (result != NULL)
 
590
                e_book_client_get_contacts_finish (
 
591
                        book_client, result, &contacts, &error);
 
592
 
 
593
        if (error != NULL) {
 
594
                g_warning (
 
595
                        "%s: Failed to get contacts: %s\n",
 
596
                        G_STRFUNC, error->message);
 
597
                g_error_free (error);
 
598
 
 
599
                info->cb (
 
600
                        info->contact, NULL,
 
601
                        EAB_CONTACT_MATCH_NONE,
 
602
                        info->closure);
 
603
 
593
604
                match_search_info_free (info);
594
605
                g_object_unref (book_client);
595
606
                return;
751
762
        MatchSearchInfo *info = user_data;
752
763
        EClient *client = NULL;
753
764
 
754
 
        if (!e_client_utils_open_new_finish (source, result, &client, NULL))
755
 
                client = NULL;
 
765
        e_client_utils_open_new_finish (source, result, &client, NULL);
756
766
 
757
 
        use_common_book_client (client ? E_BOOK_CLIENT (client): NULL, info);
 
767
        /* Client may be NULL; don't use a type cast macro. */
 
768
        use_common_book_client ((EBookClient *) client, info);
758
769
}
759
770
 
760
771
void