diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2012-04-22 02:52:23 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2012-04-22 05:07:15 +0800 |
| commit | 7950d6a0c6efd6c4d48afd99c138f38952bdd1bb (patch) | |
| tree | 3a8fd7957dd29441120d2db18ccb1cc23f5935f2 /addressbook/importers | |
| parent | 397b15ff4aa5afd1d5c7e0a093a33616624401cf (diff) | |
| download | gsoc2013-evolution-7950d6a0c6efd6c4d48afd99c138f38952bdd1bb.tar.gz gsoc2013-evolution-7950d6a0c6efd6c4d48afd99c138f38952bdd1bb.tar.zst gsoc2013-evolution-7950d6a0c6efd6c4d48afd99c138f38952bdd1bb.zip | |
Adapt to libedataserver[ui] changes.
Diffstat (limited to 'addressbook/importers')
| -rw-r--r-- | addressbook/importers/evolution-csv-importer.c | 11 | ||||
| -rw-r--r-- | addressbook/importers/evolution-ldif-importer.c | 11 | ||||
| -rw-r--r-- | addressbook/importers/evolution-vcard-importer.c | 11 |
3 files changed, 24 insertions, 9 deletions
diff --git a/addressbook/importers/evolution-csv-importer.c b/addressbook/importers/evolution-csv-importer.c index 66cc0a7051..92290e8d1c 100644 --- a/addressbook/importers/evolution-csv-importer.c +++ b/addressbook/importers/evolution-csv-importer.c @@ -755,10 +755,14 @@ static void primary_selection_changed_cb (ESourceSelector *selector, EImportTarget *target) { + ESource *source; + + source = e_source_selector_ref_primary_selection (selector); + g_return_if_fail (source != NULL); + g_datalist_set_data_full ( &target->data, "csv-source", - g_object_ref (e_source_selector_get_primary_selection (selector)), - g_object_unref); + source, (GDestroyNotify) g_object_unref); } static GtkWidget * @@ -921,7 +925,8 @@ csv_import (EImport *ei, source = g_datalist_get_data (&target->data, "csv-source"); - e_client_utils_open_new (source, E_CLIENT_SOURCE_TYPE_CONTACTS, FALSE, NULL, + e_client_utils_open_new ( + source, E_CLIENT_SOURCE_TYPE_CONTACTS, FALSE, NULL, e_client_utils_authenticate_handler, NULL, book_loaded_cb, gci); } diff --git a/addressbook/importers/evolution-ldif-importer.c b/addressbook/importers/evolution-ldif-importer.c index 989bb805f4..1ba350a70f 100644 --- a/addressbook/importers/evolution-ldif-importer.c +++ b/addressbook/importers/evolution-ldif-importer.c @@ -553,10 +553,14 @@ static void primary_selection_changed_cb (ESourceSelector *selector, EImportTarget *target) { + ESource *source; + + source = e_source_selector_ref_primary_selection (selector); + g_return_if_fail (source != NULL); + g_datalist_set_data_full ( &target->data, "ldif-source", - g_object_ref (e_source_selector_get_primary_selection (selector)), - g_object_unref); + source, (GDestroyNotify) g_object_unref); } static GtkWidget * @@ -711,7 +715,8 @@ ldif_import (EImport *ei, source = g_datalist_get_data (&target->data, "ldif-source"); - e_client_utils_open_new (source, E_CLIENT_SOURCE_TYPE_CONTACTS, FALSE, NULL, + e_client_utils_open_new ( + source, E_CLIENT_SOURCE_TYPE_CONTACTS, FALSE, NULL, e_client_utils_authenticate_handler, NULL, book_loaded_cb, gci); } diff --git a/addressbook/importers/evolution-vcard-importer.c b/addressbook/importers/evolution-vcard-importer.c index b35553943e..1dbbed0a39 100644 --- a/addressbook/importers/evolution-vcard-importer.c +++ b/addressbook/importers/evolution-vcard-importer.c @@ -391,10 +391,14 @@ static void primary_selection_changed_cb (ESourceSelector *selector, EImportTarget *target) { + ESource *source; + + source = e_source_selector_ref_primary_selection (selector); + g_return_if_fail (source != NULL); + g_datalist_set_data_full ( &target->data, "vcard-source", - g_object_ref (e_source_selector_get_primary_selection (selector)), - g_object_unref); + source, (GDestroyNotify) g_object_unref); } static GtkWidget * @@ -569,7 +573,8 @@ vcard_import (EImport *ei, source = g_datalist_get_data (&target->data, "vcard-source"); - e_client_utils_open_new (source, E_CLIENT_SOURCE_TYPE_CONTACTS, FALSE, NULL, + e_client_utils_open_new ( + source, E_CLIENT_SOURCE_TYPE_CONTACTS, FALSE, NULL, e_client_utils_authenticate_handler, NULL, book_loaded_cb, gci); } |