inital gtk2 patch

[claws.git] / src / vcard.c

diff --git a/src/vcard.c b/src/vcard.c
index 6f9f7a59a784cc31524baf468e17e1836901e026..fe3ee5b19456d5a9ead852cb31bf4d36fcb60d3c 100644 (file)
--- a/src/vcard.c
+++ b/src/vcard.c
@@ -48,7 +48,6 @@ VCardFile *vcard_create() {
        cardFile = g_new0( VCardFile, 1 );
        cardFile->type = ADBOOKTYPE_VCARD;
        cardFile->addressCache = addrcache_create();
-       cardFile->accessFlag = FALSE;
        cardFile->retVal = MGU_SUCCESS;
 
        cardFile->file = NULL;
@@ -72,29 +71,35 @@ void vcard_set_file( VCardFile* cardFile, const gchar *value ) {
 }
 void vcard_set_accessed( VCardFile *cardFile, const gboolean value ) {
        g_return_if_fail( cardFile != NULL );
-       cardFile->accessFlag = value;
+       cardFile->addressCache->accessFlag = value;
 }
 
 /*
 * Test whether file was modified since last access.
 * Return: TRUE if file was modified.
 */
-gboolean vcard_get_modified( VCardFile *vcardFile ) {
-       g_return_val_if_fail( vcardFile != NULL, FALSE );
-       return addrcache_check_file( vcardFile->addressCache, vcardFile->path );
+gboolean vcard_get_modified( VCardFile *cardFile ) {
+       g_return_val_if_fail( cardFile != NULL, FALSE );
+       cardFile->addressCache->modified =
+               addrcache_check_file( cardFile->addressCache, cardFile->path );
+       return cardFile->addressCache->modified;
 }
-gboolean vcard_get_accessed( VCardFile *vcardFile ) {
-       g_return_val_if_fail( vcardFile != NULL, FALSE );
-       return addrcache_check_file( vcardFile->addressCache, vcardFile->path );
+gboolean vcard_get_accessed( VCardFile *cardFile ) {
+       g_return_val_if_fail( cardFile != NULL, FALSE );
+       return cardFile->addressCache->accessFlag;
 }
 
 /*
 * Test whether file was read.
 * Return: TRUE if file was read.
 */
-gboolean vcard_get_read_flag( VCardFile *vcardFile ) {
-       g_return_val_if_fail( vcardFile != NULL, FALSE );
-       return vcardFile->addressCache->dataRead;
+gboolean vcard_get_read_flag( VCardFile *cardFile ) {
+       g_return_val_if_fail( cardFile != NULL, FALSE );
+       return cardFile->addressCache->dataRead;
+}
+void vcard_set_read_flag( VCardFile *cardFile, const gboolean value ) {
+       g_return_if_fail( cardFile != NULL );
+       cardFile->addressCache->dataRead = value;
 }
 
 /*
@@ -155,7 +160,6 @@ void vcard_free( VCardFile *cardFile ) {
 
        cardFile->type = ADBOOKTYPE_NONE;
        cardFile->addressCache = NULL;
-       cardFile->accessFlag = FALSE;
        cardFile->retVal = MGU_SUCCESS;
 
        /* Now release file object */
@@ -185,7 +189,7 @@ static gint vcard_open_file( VCardFile* cardFile ) {
        /* fprintf( stdout, "Opening file\n" ); */
        cardFile->addressCache->dataRead = FALSE;
        if( cardFile->path ) {
-               cardFile->file = fopen( cardFile->path, "r" );
+               cardFile->file = fopen( cardFile->path, "rb" );
                if( ! cardFile->file ) {
                        /* fprintf( stderr, "can't open %s\n", cardFile->path ); */
                        cardFile->retVal = MGU_OPEN_FILE;
@@ -277,10 +281,8 @@ static gchar *vcard_read_qp( VCardFile *cardFile, char *tagvalue ) {
        while( line ) {
                listQP = g_slist_append( listQP, line );
                len = strlen( line ) - 1;
-               if( len > 0 ) {
-                       if( line[ len ] != '=' ) break;
-                       line[ len ] = '\0';
-               }
+               if( line[ len ] != '=' ) break;
+               line[ len ] = '\0';
                line = vcard_get_line( cardFile );
        }
 
@@ -343,29 +345,12 @@ static gchar *vcard_get_tagvalue( gchar* line, gchar dlm ) {
        return value;
 }
 
-/*
-* Dump linked lists of character strings (for debug).
-*/
-static void vcard_dump_lists( GSList *listName, GSList *listAddr, GSList *listRem, GSList *listID, FILE *stream ) {
-       fprintf( stream, "dump name\n" );
-       fprintf( stream, "------------\n" );
-       mgu_print_list( listName, stdout );
-       fprintf( stream, "dump address\n" );
-       fprintf( stream, "------------\n" );
-       mgu_print_list( listAddr, stdout );
-       fprintf( stream, "dump remarks\n" );
-       fprintf( stdout, "------------\n" );
-       mgu_print_list( listRem, stdout );
-       fprintf( stream, "dump id\n" );
-       fprintf( stdout, "------------\n" );
-       mgu_print_list( listID, stdout );
-}
-
 /*
 * Build an address list entry and append to list of address items.
 */
-static void vcard_build_items( VCardFile *cardFile, GSList *listName, GSList *listAddr, GSList *listRem,
-                               GSList *listID )
+static void vcard_build_items(
+       VCardFile *cardFile, GSList *listName, GSList *listAddr,
+       GSList *listRem, GSList *listID )
 {
        GSList *nodeName = listName;
        GSList *nodeID = listID;
@@ -384,7 +369,8 @@ static void vcard_build_items( VCardFile *cardFile, GSList *listName, GSList *li
                                if( nodeRemarks ) {
                                        if( str ) {
                                                if( g_strcasecmp( str, "internet" ) != 0 ) {
-                                                       if( *str != '\0' ) addritem_email_set_remarks( email, str );
+                                                       if( *str != '\0' )
+                                                               addritem_email_set_remarks( email, str );
                                                }
                                        }
                                }
@@ -397,14 +383,14 @@ static void vcard_build_items( VCardFile *cardFile, GSList *listName, GSList *li
                if( person->listEMail ) {
                        addrcache_id_person( cardFile->addressCache, person );
                        addrcache_add_person( cardFile->addressCache, person );
+                       if( nodeID ) {
+                               str = nodeID->data;
+                               addritem_person_set_external_id( person, str );
+                       }
                }
                else {
                        addritem_free_item_person( person );
                }
-               if( nodeID ) {
-                       str = nodeID->data;
-                       addritem_person_set_external_id( person, str );
-               }
                nodeName = g_slist_next( nodeName );
                nodeID = g_slist_next( nodeID );
        }
@@ -558,7 +544,7 @@ gint vcard_read_data( VCardFile *cardFile ) {
        g_return_val_if_fail( cardFile != NULL, -1 );
 
        cardFile->retVal = MGU_SUCCESS;
-       cardFile->accessFlag = FALSE;
+       cardFile->addressCache->accessFlag = FALSE;
        if( addrcache_check_file( cardFile->addressCache, cardFile->path ) ) {
                addrcache_clear( cardFile->addressCache );
                vcard_open_file( cardFile );
@@ -640,7 +626,7 @@ gboolean vcard_validate( const VCardFile *cardFile ) {
 *      be g_free() when done.
 */
 gchar *vcard_find_gnomecard( void ) {
-       gchar *homedir;
+       const gchar *homedir;
        gchar buf[ WORK_BUFLEN ];
        gchar str[ WORK_BUFLEN ];
        gchar *fileSpec;
@@ -663,7 +649,7 @@ gchar *vcard_find_gnomecard( void ) {
        strcat( str, GNOMECARD_FILE );
 
        fileSpec = NULL;
-       if( ( fp = fopen( str, "r" ) ) != NULL ) {
+       if( ( fp = fopen( str, "rb" ) ) != NULL ) {
                /* Read configuration file */
                lenlbl = strlen( GNOMECARD_SECTION );
                while( fgets( buf, sizeof( buf ), fp ) != NULL ) {