[glabels/glabels-3_2] Fixed missing contacts when importing from vcard.



commit 9ca7fc78363650e91e5cd5e2a5c6d4c729a37970
Author: Tim Waugh <twaugh redhat com>
Date:   Tue Jan 6 09:34:20 2015 +0000

    Fixed missing contacts when importing from vcard.
    
    Fixes Bug #742440.  After checking for an END line, another line was read
    before breaking out of the loop. This could have been the BEGIN line for
    the next record, in which case that record will be lost.

 src/merge-vcard.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/src/merge-vcard.c b/src/merge-vcard.c
index 6554015..57e1817 100644
--- a/src/merge-vcard.c
+++ b/src/merge-vcard.c
@@ -348,7 +348,7 @@ parse_next_vcard (FILE *fp)
 
         vcard = g_malloc0(size);
 
-        while (fgets(line, sizeof(line), fp) && found_end == FALSE)
+        while (found_end == FALSE && fgets(line, sizeof(line), fp))
         {
                 if (found_begin == TRUE)
                 {


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]