[Commits] [SCM] claws branch, master, updated. 3.9.2-85-gf8d35f8

claws at claws-mail.org claws at claws-mail.org
Wed Aug 28 09:00:36 CEST 2013


The branch master of project "claws" (Claws Mail) has been updated
       via  f8d35f8d40194ac94ee4e8503e8ff8a3480b6284 (commit)
      from  e377eee114ead1ecafd829a5937869e9bead2584 (commit)


- Log -----------------------------------------------------------------
commit f8d35f8d40194ac94ee4e8503e8ff8a3480b6284
Author: Paul <paul at claws-mail.org>
Date:   Wed Aug 28 08:00:29 2013 +0100

    revert part of last commit
    
    bug 2989 remains fixed in as much as the segfault is prevented

diff --git a/src/file_checker.c b/src/file_checker.c
index fb4c89f..0ecee42 100644
--- a/src/file_checker.c
+++ b/src/file_checker.c
@@ -109,26 +109,6 @@ static gboolean verify_folderlist_xml()
 			g_free(bak);
 		}
   	}
-  	
-  	if (is_file_exist(filename) && is_file_exist(bak) && folder_read_list() < 0) {
-		AlertValue aval;
-		gchar *msg;
-
-		msg = g_strdup_printf
-			(_("The file %s is corrupted! "
-			   "Do you want to use the backup file from %s?"), FOLDER_LIST,buf);
-		aval = alertpanel(_("Warning"), msg, GTK_STOCK_NO, GTK_STOCK_YES, NULL);
-		g_free(msg);
-		if (aval != G_ALERTALTERNATE)
-			return FALSE;
-		else {
-			if (copy_file(bak,filename,FALSE) < 0) {
-				alertpanel_warning(_("Could not copy %s to %s"),bak,filename);
-				return FALSE;
-			}
-			g_free(bak);	
-		}		
-	}
 
 	return TRUE;
 }

-----------------------------------------------------------------------

Summary of changes:
 src/file_checker.c |   20 --------------------
 1 files changed, 0 insertions(+), 20 deletions(-)


hooks/post-receive
-- 
Claws Mail


More information about the Commits mailing list