Fix use of uninitialized value in sgpgme_has_secret_key().

[claws.git] / tools / tb2claws-mail

diff --git a/tools/tb2claws-mail b/tools/tb2claws-mail
old mode 100644 (file)
new mode 100755 (executable)
index 106877e..7030061
--- a/tools/tb2claws-mail
+++ b/tools/tb2claws-mail
@@ -7,7 +7,7 @@
 # Author : Aleksandar Urosevic aka Urke MMI <urke@gmx.net>
 # Licence : GPL
 #
-# Thanks goes to : Paul Mangan <claws@thewildbeast.co.uk>
+# Thanks goes to : Paul Mangan <paul@claws-mail.org>
 #
 # Usage: Export The Bat! Address Book to CSV file format
 #        with all fields selected to YES and then start:
@@ -37,13 +37,13 @@ use Getopt::Long;
 
 GetOptions("tbfile=s" => \$tbfile);
 
-#$tbfile = '/home/urke/bin/sylpheed/tb2ldif/thebat-addressbook.csv';
+#$tbfile = '/home/urke/bin/claws-mail/tb2ldif/thebat-addressbook.csv';
 $total_addresses = 0;
 
 chdir;
 
 # check is Claws-Mail instrtalled
-opendir(CLAWS, ".claws-mail") || die("Can't open Claws Mail directory! Conversion abroted\n");
+opendir(CLAWS, ".claws-mail/addrbook") || die("Can't open Claws Mail directory! Conversion aborted\n");
     push(@cached, (readdir(CLAWS)));
 closedir(CLAWS);
 
@@ -251,12 +251,12 @@ foreach $tbline (@tblines) {
 $claws_addr .= "</address-book>\n";
 
 # print new addressbook to file
-open (NEWADDR, ">.claws-mail/$new_addrbk");
+open (NEWADDR, ">.claws-mail/addrbook/$new_addrbk");
     print NEWADDR $claws_addr;
 close NEWADDR;
 
 # add new addressbook to index
-open (ADDRIN, "<.claws-mail/addrbook--index.xml") || die("Can't open addrbook--index.xml");
+open (ADDRIN, "<.claws-mail/addrbook/addrbook--index.xml") || die("Can't open addrbook--index.xml");
     @addrindex_file = <ADDRIN>;
 close ADDRIN;
 
@@ -269,7 +269,7 @@ foreach $addrindex_line (@addrindex_file) {
     }
 }
 
-open (NEWADDRIN, ">.claws-mail/addrbook--index.xml");
+open (NEWADDRIN, ">.claws-mail/addrbook/addrbook--index.xml");
     print NEWADDRIN "$rewrite_addrin";
 close NEWADDRIN;
 print "You have sucessfully converted your The Bat! addressbook\n";