2005-10-27 Jim Evins <evins@snaught.com>

	* src/merge-evolution.c: (gl_merge_evolution_get_record):
	* src/merge-vcard.c: (gl_merge_vcard_get_record),
	(parse_next_vcard):
		Additional cleanup of EDS and vcard backends.  Provided by
		Austin Henry <ahenry@users.sourceforge.net>.

git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@558 f5e0f49d-192f-0410-a22d-a8d8700d0965

diff --git a/glabels2/ChangeLog b/glabels2/ChangeLog
index ce58c1630671df98774e81844c783dcf9d134c37..9965d0ec46929ca5c3c9503b30e63675757373c7 100644 (file)
--- a/glabels2/ChangeLog
+++ b/glabels2/ChangeLog
@@ -1,3 +1,11 @@
+2005-10-27  Jim Evins  <evins@snaught.com>
+
+       * src/merge-evolution.c: (gl_merge_evolution_get_record):
+       * src/merge-vcard.c: (gl_merge_vcard_get_record),
+       (parse_next_vcard):
+               Additional cleanup of EDS and vcard backends.  Provided by
+               Austin Henry <ahenry@users.sourceforge.net>.
+
 2005-10-24  Jim Evins  <evins@snaught.com>
 
        * AUTHORS:

diff --git a/glabels2/src/merge-evolution.c b/glabels2/src/merge-evolution.c
index 77d73de310e79b6f8d230d80d54ae5d4a849c91e..2a63b233c7d8da936ca5453fa727d9f700fc1bc6 100644 (file)
--- a/glabels2/src/merge-evolution.c
+++ b/glabels2/src/merge-evolution.c
@@ -431,28 +431,28 @@ gl_merge_evolution_get_record (glMerge *merge)
        /* get the record key */
        field = g_new0 (glMergeField, 1);
        field->key = g_strdup ("record_key");
-       field->value = g_strdup (e_contact_get(contact, E_CONTACT_FILE_AS));
+       field->value = g_strdup (e_contact_get_const(contact, E_CONTACT_FILE_AS));
 
        record->field_list = g_list_append (record->field_list, field);
 
        /* get the full name */
        field = g_new0 (glMergeField, 1);
        field->key = g_strdup ("full_name");
-       field->value = g_strdup (e_contact_get(contact, E_CONTACT_FULL_NAME));
+       field->value = g_strdup (e_contact_get_const(contact, E_CONTACT_FULL_NAME));
 
        record->field_list = g_list_append (record->field_list, field);
 
        /* get the home address */
        field = g_new0 (glMergeField, 1);
        field->key = g_strdup ("home_address");
-       field->value = g_strdup (e_contact_get(contact, E_CONTACT_ADDRESS_LABEL_HOME));
+       field->value = g_strdup (e_contact_get_const(contact, E_CONTACT_ADDRESS_LABEL_HOME));
 
        record->field_list = g_list_append (record->field_list, field);
 
        /* get the work address */
        field = g_new0 (glMergeField, 1);
        field->key = g_strdup ("work_address");
-       field->value = g_strdup (e_contact_get(contact, E_CONTACT_ADDRESS_LABEL_WORK));
+       field->value = g_strdup (e_contact_get_const(contact, E_CONTACT_ADDRESS_LABEL_WORK));
 
        record->field_list = g_list_append (record->field_list, field);
 

diff --git a/glabels2/src/merge-vcard.c b/glabels2/src/merge-vcard.c
index 65834dd5aafdcf3ca06adee7b025225788014b66..490d29a773568d2142e1ae23400a44b006df53e3 100644 (file)
--- a/glabels2/src/merge-vcard.c
+++ b/glabels2/src/merge-vcard.c
@@ -301,7 +301,7 @@ gl_merge_vcard_get_record (glMerge *merge)
        merge_vcard = GL_MERGE_VCARD (merge);
 
        vcard = parse_next_vcard(merge_vcard->private->fp);
-       if (vcard[0] == '\0') {
+       if (vcard == NULL || vcard[0] == '\0') {
                return NULL; /* EOF */
        }
        contact = e_contact_new_from_vcard(vcard);
@@ -319,21 +319,21 @@ gl_merge_vcard_get_record (glMerge *merge)
        /* get the full name */
        field = g_new0 (glMergeField, 1);
        field->key = g_strdup ("full_name");
-       field->value = g_strdup (e_contact_get(contact, E_CONTACT_FULL_NAME));
+       field->value = g_strdup (e_contact_get_const(contact, E_CONTACT_FULL_NAME));
 
        record->field_list = g_list_append (record->field_list, field);
 
        /* get the home address */
        field = g_new0 (glMergeField, 1);
        field->key = g_strdup ("home_address");
-       field->value = g_strdup (e_contact_get(contact, E_CONTACT_ADDRESS_LABEL_HOME));
+       field->value = g_strdup (e_contact_get_const(contact, E_CONTACT_ADDRESS_LABEL_HOME));
 
        record->field_list = g_list_append (record->field_list, field);
 
        /* get the work address */
        field = g_new0 (glMergeField, 1);
        field->key = g_strdup ("work_address");
-       field->value = g_strdup (e_contact_get(contact, E_CONTACT_ADDRESS_LABEL_WORK));
+       field->value = g_strdup (e_contact_get_const(contact, E_CONTACT_ADDRESS_LABEL_WORK));
 
        record->field_list = g_list_append (record->field_list, field);
 
@@ -374,6 +374,11 @@ parse_next_vcard (FILE *fp)
        char line[512];
        int size = 2048, cursize = 0;
 
+       /* if no source has been set up, don't try to read from the file */
+       if (!fp) {
+               return NULL;
+       }
+
        vcard = g_malloc0(size);
 
        while (fgets(line, sizeof(line), fp) && found_end == FALSE) {