| 1 | diff --git a/obexd/plugins/phonebook-ebook.c b/obexd/plugins/phonebook-ebook.c
|
| 2 | index d772edca0445..62c88f02623b 100644
|
| 3 | |
| 4 | |
| 5 | @@ -109,13 +109,13 @@ static char *evcard_to_string(EVCard *evcard, unsigned int format,
|
| 6 | char *vcard;
|
| 7 |
|
| 8 | if (!filter)
|
| 9 | - return e_vcard_to_string(evcard, format);
|
| 10 | + return e_vcard_convert_to_string(evcard, format);
|
| 11 |
|
| 12 | /*
|
| 13 | * Mandatory attributes for vCard 2.1 are VERSION ,N and TEL.
|
| 14 | * Mandatory attributes for vCard 3.0 are VERSION, N, FN and TEL
|
| 15 | */
|
| 16 | - filter = format == EVC_FORMAT_VCARD_30 ? filter | 0x87: filter | 0x85;
|
| 17 | + filter = format == E_VCARD_VERSION_30 ? filter | 0x87: filter | 0x85;
|
| 18 |
|
| 19 | l = e_vcard_get_attributes(evcard);
|
| 20 | evcard2 = e_vcard_new();
|
| 21 | @@ -140,7 +140,7 @@ static char *evcard_to_string(EVCard *evcard, unsigned int format,
|
| 22 | }
|
| 23 | }
|
| 24 |
|
| 25 | - vcard = e_vcard_to_string(evcard2, format);
|
| 26 | + vcard = e_vcard_convert_to_string(evcard2, format);
|
| 27 | g_object_unref(evcard2);
|
| 28 |
|
| 29 | return vcard;
|
| 30 | @@ -312,10 +312,10 @@ static void phonebook_pull_read_ready(GObject *source_object,
|
| 31 | char *vcard;
|
| 32 |
|
| 33 | if (data->params->format == PB_FORMAT_VCARD30)
|
| 34 | - vcard = evcard_to_string(evcard, EVC_FORMAT_VCARD_30,
|
| 35 | + vcard = evcard_to_string(evcard, E_VCARD_VERSION_30,
|
| 36 | data->params->filter);
|
| 37 | else if (data->params->format == PB_FORMAT_VCARD21)
|
| 38 | - vcard = evcard_to_string(evcard, EVC_FORMAT_VCARD_21,
|
| 39 | + vcard = evcard_to_string(evcard, E_VCARD_VERSION_21,
|
| 40 | data->params->filter);
|
| 41 | else
|
| 42 | error("unknown format: %d", data->params->format);
|
| 43 | @@ -393,10 +393,10 @@ static void phonebook_get_entry_ready(GObject *source_object,
|
| 44 | evcard = E_VCARD(contact);
|
| 45 |
|
| 46 | if (data->params->format == PB_FORMAT_VCARD30)
|
| 47 | - vcard = evcard_to_string(evcard, EVC_FORMAT_VCARD_30,
|
| 48 | + vcard = evcard_to_string(evcard, E_VCARD_VERSION_30,
|
| 49 | data->params->filter);
|
| 50 | else if (data->params->format == PB_FORMAT_VCARD21)
|
| 51 | - vcard = evcard_to_string(evcard, EVC_FORMAT_VCARD_21,
|
| 52 | + vcard = evcard_to_string(evcard, E_VCARD_VERSION_21,
|
| 53 | data->params->filter);
|
| 54 | else
|
| 55 | error("Unknown vCard format: %d", data->params->format);
|
| 56 |
|