2007-02-19 [paul] 2.7.2cvs51

[claws.git] / tools / google_search.pl

diff --git a/tools/google_search.pl b/tools/google_search.pl
index 6f0d68fa5a805e8fcbea3be52372a04f320ff668..f75d4ce17959a13e678ea8a7745c797979247048 100644 (file)
--- a/tools/google_search.pl
+++ b/tools/google_search.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-#  * Copyright © 2003 Paul Mangan <claws@thewildbeast.co.uk>
+#  * Copyright 2003-2007 Paul Mangan <paul@claws-mail.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
@@ -17,12 +17,27 @@
 #  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #  *
 
+# Changes:
+#      Feb 2007: add support for non ISO-8859-1 compatible locales
+#                by Alex Gorbachenko <agent_007@immo.ru>
+#
+
+use URI::Escape;
+use POSIX qw(locale_h);
+use Text::Iconv;
+
 my $google = "http://www.google.com/search?q";
 $_ = <>;
 
-chdir($ENV{HOME} . "/.sylpheed-claws") || die("Can't find your .sylpheed-claws directory\n");
+$locale = setlocale(LC_CTYPE);
+$locale =~ s/\S+\.//;
+
+$converter = Text::Iconv->new("$locale", "UTF-8");
+$safe=uri_escape($converter->convert("$_"));
+
+chdir($ENV{HOME} . "/.claws-mail") || die("Can't find your .claws-mail directory\n");
 
-open (SYLRC, "<sylpheedrc") || die("Can't open the sylpheedrc file\n");
+open (SYLRC, "<clawsrc") || die("Can't open the clawsrc file\n");
        @rclines = <SYLRC>;
 close SYLRC;
 
@@ -30,7 +45,7 @@ foreach $rcline (@rclines) {
        if ($rcline =~ m/^uri_open_command/) {
                chomp $rcline;
                @browser = split(/=/, $rcline);
-               $browser[1] =~ s/%s/$google=$_/;
+               $browser[1] =~ s/%s/$google=$safe/;
        }
 }
 system("$browser[1]&");