2007-02-01 [paul] 2.7.2cvs13

	* AUTHORS
	* src/gtk/authors.h
	* tools/freshmeat_search.pl
	* tools/google_search.pl
	* tools/multiwebsearch.pl
		add support for non ISO-8859-1 compatible locales
		Patch by Alex Gorbachenko <agent_007@immo.ru>

diff --git a/AUTHORS b/AUTHORS
index 3ee644e385e73f0aacec86cba660b9de370317b4..2cdaa019bd06ca895c8fad0268ec3bbd19de2094 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -238,3 +238,4 @@ contributors (in addition to the above; based on Changelog)
        Michael Hughes
        Jindrich Makovicka
        Pascal Terjan
        Michael Hughes
        Jindrich Makovicka
        Pascal Terjan

+       Alex Gorbachenko

diff --git a/ChangeLog b/ChangeLog
index 16ed6d390ec18dee8c8bdb291c3a2fd297ce94cf..601c53bea1199cfb1a6bdd37bc7db4ade3def322 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2007-02-01 [paul]      2.7.2cvs13
+
+       * AUTHORS
+       * src/gtk/authors.h
+       * tools/freshmeat_search.pl
+       * tools/google_search.pl
+       * tools/multiwebsearch.pl
+               add support for non ISO-8859-1 compatible locales
+               Patch by Alex Gorbachenko <agent_007@immo.ru>
+

 2007-02-01 [colin]     2.7.2cvs12
 
        * src/prefs_other.c
 2007-02-01 [colin]     2.7.2cvs12
 
        * src/prefs_other.c

diff --git a/PATCHSETS b/PATCHSETS
index 99c222929990909a34818565223aaadfa9a54dcc..e7cce2037e56068e835428de425b8c873aa4d68d 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2330,3 +2330,4 @@
 ( cvs diff -u -r 1.9.2.11 -r 1.9.2.12 src/addressadd.c;  cvs diff -u -r 1.65.2.55 -r 1.65.2.56 src/codeconv.c;  cvs diff -u -r 1.96.2.166 -r 1.96.2.167 src/textview.c;  ) > 2.7.2cvs10.patchset
 ( cvs diff -u -r 1.14.2.50 -r 1.14.2.51 src/plugins/trayicon/trayicon.c;  ) > 2.7.2cvs11.patchset
 ( cvs diff -u -r 1.1.2.17 -r 1.1.2.18 src/prefs_other.c;  cvs diff -u -r 1.1.2.35 -r 1.1.2.36 src/prefs_summaries.c;  ) > 2.7.2cvs12.patchset
 ( cvs diff -u -r 1.9.2.11 -r 1.9.2.12 src/addressadd.c;  cvs diff -u -r 1.65.2.55 -r 1.65.2.56 src/codeconv.c;  cvs diff -u -r 1.96.2.166 -r 1.96.2.167 src/textview.c;  ) > 2.7.2cvs10.patchset
 ( cvs diff -u -r 1.14.2.50 -r 1.14.2.51 src/plugins/trayicon/trayicon.c;  ) > 2.7.2cvs11.patchset
 ( cvs diff -u -r 1.1.2.17 -r 1.1.2.18 src/prefs_other.c;  cvs diff -u -r 1.1.2.35 -r 1.1.2.36 src/prefs_summaries.c;  ) > 2.7.2cvs12.patchset

+( cvs diff -u -r 1.100.2.47 -r 1.100.2.48 AUTHORS;  cvs diff -u -r 1.1.2.32 -r 1.1.2.33 src/gtk/authors.h;  cvs diff -u -r 1.3.2.5 -r 1.3.2.6 tools/freshmeat_search.pl;  cvs diff -u -r 1.3.2.5 -r 1.3.2.6 tools/google_search.pl;  cvs diff -u -r 1.3.2.5 -r 1.3.2.6 tools/multiwebsearch.pl;  ) > 2.7.2cvs13.patchset

diff --git a/configure.ac b/configure.ac
index 18e89b68817c9fed3d0fac733744a2cdee2796e5..ae4b14556d34be9574384a5f2482b063077856e2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=7
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=12
+EXTRA_VERSION=13

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/gtk/authors.h b/src/gtk/authors.h
index 93ad6619c89c24b059a2ed4920db5b51da87c360..28e706b2132567c95a0e570f5b2c39be39d075aa 100644 (file)
--- a/src/gtk/authors.h
+++ b/src/gtk/authors.h
@@ -111,6 +111,7 @@ static char *CONTRIBS_LIST[] = {
 "Stoyan Genov",
 "Thomas Gilgin",
 "Thierry Godefroy",
 "Stoyan Genov",
 "Thomas Gilgin",
 "Thierry Godefroy",

+"Alex Gorbachenko",

 "Yang Guilong",
 "Daniel Gustafson",
 "HIROSHIMA",
 "Yang Guilong",
 "Daniel Gustafson",
 "HIROSHIMA",

diff --git a/tools/freshmeat_search.pl b/tools/freshmeat_search.pl
index 1c9bed0f2b226dd0c00e3dc4a15688c174c9920c..2177abecc50b303966e67ff6d3bc37e316eba5d5 100644 (file)
--- a/tools/freshmeat_search.pl
+++ b/tools/freshmeat_search.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
 #!/usr/bin/perl
 

-#  * Copyright 2003 Paul Mangan <paul@claws-mail.org>
+#  * 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
 #  *
 #  * 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,9 +17,24 @@
 #  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, 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 $freshmeat = "http://freshmeat.net/search?q";
 $_ = <>;
 
 my $freshmeat = "http://freshmeat.net/search?q";
 $_ = <>;
 

+$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, "<clawsrc") || die("Can't open the clawsrc file\n");
 chdir($ENV{HOME} . "/.claws-mail") || die("Can't find your .claws-mail directory\n");
 
 open (SYLRC, "<clawsrc") || die("Can't open the clawsrc file\n");


@@ -30,7 +45,7 @@ foreach $rcline (@rclines) {
        if ($rcline =~ m/^uri_open_command/) {
                chomp $rcline;
                @browser = split(/=/, $rcline);
        if ($rcline =~ m/^uri_open_command/) {
                chomp $rcline;
                @browser = split(/=/, $rcline);

-               $browser[1] =~ s/%s/$freshmeat=$_/;
+               $browser[1] =~ s/%s/$freshmeat=$safe/;

        }
 }
 
        }
 }
 

diff --git a/tools/google_search.pl b/tools/google_search.pl
index eae3d22849d079c6ec1f7089fbc74803e4b57257..f75d4ce17959a13e678ea8a7745c797979247048 100644 (file)
--- a/tools/google_search.pl
+++ b/tools/google_search.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
 #!/usr/bin/perl
 

-#  * Copyright 2003 Paul Mangan <paul@claws-mail.org>
+#  * 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
 #  *
 #  * 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,9 +17,24 @@
 #  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, 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";
 $_ = <>;
 
 my $google = "http://www.google.com/search?q";
 $_ = <>;
 

+$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, "<clawsrc") || die("Can't open the clawsrc file\n");
 chdir($ENV{HOME} . "/.claws-mail") || die("Can't find your .claws-mail directory\n");
 
 open (SYLRC, "<clawsrc") || die("Can't open the clawsrc file\n");


@@ -30,7 +45,7 @@ foreach $rcline (@rclines) {
        if ($rcline =~ m/^uri_open_command/) {
                chomp $rcline;
                @browser = split(/=/, $rcline);
        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]&");
        }
 }
 system("$browser[1]&");

diff --git a/tools/multiwebsearch.pl b/tools/multiwebsearch.pl
index 158054d50514d8c836374e475bac02b837922667..8265ea22c8afd2c29f61393fbe0599c9784d1cb1 100644 (file)
--- a/tools/multiwebsearch.pl
+++ b/tools/multiwebsearch.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
 #!/usr/bin/perl
 

-#  * Copyright 2003 Paul Mangan <paul@claws-mail.org>
+#  * 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
 #  *
 #  * 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,7 +17,15 @@
 #  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, 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 Getopt::Long;
 use Getopt::Long;

+use URI::Escape;
+use POSIX qw(locale_h);
+use Text::Iconv;

 
 my $where = '';
 my $what  = '';
 
 my $where = '';
 my $what  = '';


@@ -25,7 +33,12 @@ my $what  = '';
 GetOptions("where=s"   => \$where,
           "what=s"     => \$what);
 
 GetOptions("where=s"   => \$where,
           "what=s"     => \$what);
 

-$what =~ s/\s/%20/g;
+$locale = setlocale(LC_CTYPE);
+$locale =~ s/\S+\.//;
+
+$converter = Text::Iconv->new("$locale", "UTF-8");
+$safe=uri_escape($converter->convert("$what"));
+$what=$safe;

 
 chdir($ENV{HOME} . "/.claws-mail") 
        || die("Can't find your ~/.claws-mail directory\n");
 
 chdir($ENV{HOME} . "/.claws-mail") 
        || die("Can't find your ~/.claws-mail directory\n");