Fix a memory leak in the "no imap" account prefs label.

[claws.git] / tools / outlook2claws-mail.pl

diff --git a/tools/outlook2claws-mail.pl b/tools/outlook2claws-mail.pl
old mode 100644 (file)
new mode 100755 (executable)
index 9248e27..b0d703a
--- a/tools/outlook2claws-mail.pl
+++ b/tools/outlook2claws-mail.pl
@@ -1,27 +1,27 @@
 #!/usr/bin/perl -w
 
-#  * Copyright 2002-2003 Ricardo Mones Lastra <mones@aic.uniovi.es>
-#  *
-#  * This file is free software; you can redistribute it and/or modify it
-#  * under the terms of the GNU General Public License as published by
-#  * the Free Software Foundation; either version 2 of the License, or
-#  * (at your option) any later version.
-#  *
-#  * This program is distributed in the hope that it will be useful, but
-#  * WITHOUT ANY WARRANTY; without even the implied warranty of
-#  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#  * General Public License for more details.
-#  *
-#  * You should have received a copy of the GNU General Public License
-#  * along with this program; if not, write to the Free Software
-#  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# Copyright 2002-2003 Ricardo Mones <ricardo@mones.org>
+# 
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #
-# outlook2sylpheed.pl -- perl script to convert an Outlook generated 
-#                       contact list into a Claws Mail XML address book.
+# outlook2claws-mail.pl -- perl script to convert an Outlook generated 
+#                         contact list into a Claws Mail XML address book.
 # 
 # This script is based on:
 #      out2syl.sh by Rafael Lossurdo <mugas@via-rs.net>
-#      kmail2claws-mail.pl by Paul Mangan <claws@thewildbeast.co.uk>
+#      kmail2claws-mail.pl by Paul Mangan <paul@claws-mail.org>
 #
 # See README file for details and usage.
 #
@@ -41,7 +41,7 @@ else {
        $outl_file = $ARGV[0];
 }
 # some init
-$clawsconf = ".claws-mail";
+$clawsconf = ".claws-mail/addrbook";
 $indexname = "$clawsconf/addrbook--index.xml";
 
 # the next is mostly Paul's code
@@ -103,9 +103,9 @@ sub write_address {
        my($al, $em, $re) = @_;
        if ($em eq "") {
                $em = "No e-mail address"; 
-               # email is a must -> no address breaks sylpheed display
-               # (sylpheed says file is ok but no name is shown) 
-               # maybe this is a bug on sylpheed?
+               # email is a must -> no address breaks claws-mail display
+               # (claws-mail says file is ok but no name is shown) 
+               # maybe this is a bug on claws-mail?
        }
        print NEWB "      <address uid=\"", $time++, "\" ";
        print NEWB "alias=\"", $al, "\" email=\"", $em, "\" remarks=\"", $re, "\" />\n";
@@ -190,7 +190,7 @@ if ($do_csv) {
                unless ($#headerline == $nboffields);
 }
 open(NEWB, '>', "$clawsconf/$new_book") 
-       or die "Error: can't open $clawsconf/$new_book for writting\n";
+       or die "Error: can't open $clawsconf/$new_book for writing\n";
 if ($do_csv) { process_csv(); }
 else { process_text(); }
 
@@ -211,7 +211,7 @@ foreach $index_line (@index_file) {
        }
 }
 open (INDX, '>', $indexname)
-       or die "Error: can't open $indexname for writting\n";
+       or die "Error: can't open $indexname for writing\n";
 print INDX "$new_index";
 close INDX;