aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook/tools/evolution-addressbook-export-list-cards.c
diff options
context:
space:
mode:
Diffstat (limited to 'addressbook/tools/evolution-addressbook-export-list-cards.c')
-rw-r--r--addressbook/tools/evolution-addressbook-export-list-cards.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/addressbook/tools/evolution-addressbook-export-list-cards.c b/addressbook/tools/evolution-addressbook-export-list-cards.c
index 89fd75834f..a884e6e0a6 100644
--- a/addressbook/tools/evolution-addressbook-export-list-cards.c
+++ b/addressbook/tools/evolution-addressbook-export-list-cards.c
@@ -612,29 +612,29 @@ action_list_cards (GSList *contacts,
length = g_slist_length (contacts);
if (length <= 0) {
- g_warning ("Couldn't load addressbook correctly!!!! %s####", p_actctx->action_list_cards.addressbook_source_uid ?
- p_actctx->action_list_cards.addressbook_source_uid : "NULL");
+ g_warning ("Couldn't load addressbook correctly!!!! %s####", p_actctx->addressbook_source_uid ?
+ p_actctx->addressbook_source_uid : "NULL");
exit (-1);
}
- if (p_actctx->action_list_cards.output_file == NULL) {
+ if (p_actctx->output_file == NULL) {
outputfile = stdout;
} else {
/* fopen output file */
- if (!(outputfile = g_fopen (p_actctx->action_list_cards.output_file, "w"))) {
+ if (!(outputfile = g_fopen (p_actctx->output_file, "w"))) {
g_warning (_("Can not open file"));
exit (-1);
}
}
- if (p_actctx->action_list_cards.IsVCard == TRUE)
+ if (p_actctx->IsVCard == TRUE)
format = CARD_FORMAT_VCARD;
else
format = CARD_FORMAT_CSV;
output_n_cards_file (outputfile, contacts, length, 0, format);
- if (p_actctx->action_list_cards.output_file != NULL) {
+ if (p_actctx->output_file != NULL) {
fclose (outputfile);
}
}
@@ -703,7 +703,7 @@ action_list_cards_init (ESourceRegistry *registry,
g_return_val_if_fail (E_IS_SOURCE_REGISTRY (registry), FAILED);
- uid = p_actctx->action_list_cards.addressbook_source_uid;
+ uid = p_actctx->addressbook_source_uid;
if (uid != NULL)
source = e_source_registry_ref_source (registry, uid);
@@ -722,8 +722,8 @@ action_list_cards_init (ESourceRegistry *registry,
if (error != NULL) {
g_warning (
"Couldn't load addressbook %s: %s",
- p_actctx->action_list_cards.addressbook_source_uid ?
- p_actctx->action_list_cards.addressbook_source_uid :
+ p_actctx->addressbook_source_uid ?
+ p_actctx->addressbook_source_uid :
"'default'", error->message);
g_error_free (error);
exit (-1);