2011-01-06 [colin] 3.7.8cvs31

[claws.git] / src / addrharvest.c

diff --git a/src/addrharvest.c b/src/addrharvest.c
index 274054c23d6c30854b8983e3c3c2258004a3b47d..1e4dcfe96d1873a4224d4fa0c6e8c684324e26f0 100644 (file)
--- a/src/addrharvest.c
+++ b/src/addrharvest.c
@@ -152,7 +152,7 @@ AddressHarvester *addrharvest_create( void ) {
  *        value     Full directory path.
  */
 void addrharvest_set_path( AddressHarvester* harvester, const gchar *value ) {
-       g_return_if_fail( harvester != NULL );
+       cm_return_if_fail( harvester != NULL );
        harvester->path = mgu_replace_string( harvester->path, value );
        g_strstrip( harvester->path );
 }
@@ -165,7 +165,7 @@ void addrharvest_set_path( AddressHarvester* harvester, const gchar *value ) {
 void addrharvest_set_folder_size(
        AddressHarvester* harvester, const gint value )
 {
-       g_return_if_fail( harvester != NULL );
+       cm_return_if_fail( harvester != NULL );
        if( value > 0 ) {
                harvester->folderSize = value;
        }
@@ -179,7 +179,7 @@ void addrharvest_set_folder_size(
 void addrharvest_set_recurse(
        AddressHarvester* harvester, const gboolean value )
 {
-       g_return_if_fail( harvester != NULL );
+       cm_return_if_fail( harvester != NULL );
        harvester->folderRecurse = value;
 }
 
@@ -221,7 +221,7 @@ void addrharvest_set_header(
 {
        HeaderEntry *entry;
 
-       g_return_if_fail( harvester != NULL );
+       cm_return_if_fail( harvester != NULL );
        entry = addrharvest_find( harvester, name );
        if( entry != NULL ) {
                entry->selected = value;
@@ -239,7 +239,7 @@ gint addrharvest_get_count( AddressHarvester* harvester, const gchar *name ) {
        gint count;
 
        count = -1;
-       g_return_val_if_fail( harvester != NULL, count );
+       cm_return_val_if_fail( harvester != NULL, count );
        entry = addrharvest_find( harvester, name );
        if( entry != NULL ) {
                count = entry->count;
@@ -252,7 +252,7 @@ gint addrharvest_get_count( AddressHarvester* harvester, const gchar *name ) {
 * Enter: harvester Harvester.
 */
 void addrharvest_free( AddressHarvester *harvester ) {
-       g_return_if_fail( harvester != NULL );
+       cm_return_if_fail( harvester != NULL );
 
        /* Free internal stuff */
        addrharvest_free_table( harvester );
@@ -529,7 +529,7 @@ static void addrharvest_parse_address(
                        }
                        else {
                                name = buffer;
-                               name = conv_unmime_header(buffer, NULL);
+                               name = conv_unmime_header(buffer, NULL, TRUE);
                        }
 
                        /* Insert into address book */
@@ -712,14 +712,15 @@ static void addrharvest_harvest_dir(
        struct dirent *d;
        struct stat s;
        gint num;
+       int r;
 
        if( ( dp = opendir( dir ) ) == NULL ) {
                return;
        }
 
        /* Process directory */
-       chdir( dir );
-       while( ( d = readdir( dp ) ) != NULL ) {
+       r = chdir( dir );
+       while( r == 0 && ( d = readdir( dp ) ) != NULL ) {
                g_stat( d->d_name, &s );
                if( S_ISDIR( s.st_mode ) ) {
                        if( harvester->folderRecurse ) {
@@ -736,7 +737,7 @@ static void addrharvest_harvest_dir(
                        }
                }
        }
-       chdir( ".." );
+       r = chdir( ".." );
        closedir( dp );
 }
 
@@ -754,13 +755,14 @@ static void addrharvest_harvest_list(
        gint num;
        GList *node;
        gchar msgNum[ MSGNUM_BUFFSIZE ];
+       int r;
 
        if( ( dp = opendir( harvester->path ) ) == NULL ) {
                return;
        }
 
        /* Process message list */
-       chdir( harvester->path );
+       r = chdir( harvester->path );
        node = msgList;
        while( node ) {
                num = GPOINTER_TO_UINT( node->data );
@@ -788,9 +790,9 @@ gint addrharvest_harvest(
        GList *listHdr;
 
        retVal = MGU_BAD_ARGS;
-       g_return_val_if_fail( harvester != NULL, retVal );
-       g_return_val_if_fail( cache != NULL, retVal );
-       g_return_val_if_fail( harvester->path != NULL, retVal );
+       cm_return_val_if_fail( harvester != NULL, retVal );
+       cm_return_val_if_fail( cache != NULL, retVal );
+       cm_return_val_if_fail( harvester->path != NULL, retVal );
 
        /* Clear cache */
        addrcache_clear( cache );
@@ -840,7 +842,7 @@ gboolean addrharvest_check_header( AddressHarvester *harvester ) {
        GList *node;
 
        retVal = FALSE;
-       g_return_val_if_fail( harvester != NULL, retVal );
+       cm_return_val_if_fail( harvester != NULL, retVal );
 
        node = harvester->headerTable;
        while( node ) {