X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=blobdiff_plain;f=tools%2Fgoogle_search.pl;h=fc0c92f16f92892e3b59d9f758e35566093f183d;hp=30b19088009c0f3dcc3939dd465ce69a1fb0b9a6;hb=16129f3b037b95c6b6708d0c8d1efc1d7effced7;hpb=afb847fe966e0b988d9c7bef18a9aee44e302f46

diff --git a/tools/google_search.pl b/tools/google_search.pl
old mode 100644
new mode 100755
index 30b190880..fc0c92f16
--- a/tools/google_search.pl
+++ b/tools/google_search.pl
@@ -1,10 +1,10 @@
 #!/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
-#  * the Free Software Foundation; either version 2 of the License, or
+#  * 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
@@ -14,15 +14,30 @@
 #  *
 #  * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#  * 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") || die("Can't find your .sylpheed 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]&");