2006-09-27 [colin] 2.5.2cvs4

	* AUTHORS
	* src/prefs_account.c
	* src/gtk/authors.h
		Fix bug #1024 (Array index out of
		range in sylpheed-claws-2.5.2)
		Patch by Ales Nosek <anosek@suse.cz>

diff --git a/AUTHORS b/AUTHORS
index 1ee713c9a8fb40ea75c5ec61e98f8aab14e8f448..13da27ffb4d4769f1cab6f310873353a53b24395 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -233,3 +233,4 @@ contributors (in addition to the above; based on Changelog)
        Leonid Evdokimov
        Rafal Weglarz
        Charles A. Edwards
+       Ales Nosek

diff --git a/ChangeLog b/ChangeLog
index 4a81e739a3b4a1148a001c2377b07da03d10b925..6897368af8a21328947fc6ff7d6c9f67d711c10d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-09-27 [colin]     2.5.2cvs4
+
+       * AUTHORS
+       * src/prefs_account.c
+       * src/gtk/authors.h
+               Fix bug #1024 (Array index out of
+               range in sylpheed-claws-2.5.2)
+               Patch by Ales Nosek <anosek@suse.cz>
+
 2006-09-27 [colin]     2.5.2cvs3
 
        * src/addr_compl.c

diff --git a/PATCHSETS b/PATCHSETS
index f0124a0b2be4cd08d7422695860a9bb6549820bb..bea3e8aaee2af02cea2eec6a6478251624b48dbe 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1917,3 +1917,4 @@
 ( cvs diff -u -r 1.155.2.41 -r 1.155.2.42 src/Makefile.am;  cvs diff -u -r 1.27.2.20 -r 1.27.2.21 src/addr_compl.c;  cvs diff -u -r 1.8.2.5 -r 1.8.2.6 src/addr_compl.h;  cvs diff -u -r 1.22.2.8 -r 1.22.2.9 src/addrbook.c;  cvs diff -u -r 1.7.2.1 -r 1.7.2.2 src/addrbook.h;  cvs diff -u -r 1.60.2.63 -r 1.60.2.64 src/addressbook.c;  cvs diff -u -r 1.28.2.18 -r 1.28.2.19 src/addrindex.c;  cvs diff -u -r 1.9.2.7 -r 1.9.2.8 src/addrindex.h;  cvs diff -u -r 1.382.2.310 -r 1.382.2.311 src/compose.c;  cvs diff -u -r 1.204.2.102 -r 1.204.2.103 src/prefs_common.c;  cvs diff -u -r 1.1.4.30 -r 1.1.4.31 src/prefs_filtering_action.c;  cvs diff -u -r 1.52.2.23 -r 1.52.2.24 src/prefs_folder_item.c;  cvs diff -u -r 1.12.2.30 -r 1.12.2.31 src/prefs_template.c;  cvs diff -u -r 1.25.2.27 -r 1.25.2.28 src/stock_pixmap.c;  cvs diff -u -r 1.18.2.18 -r 1.18.2.19 src/stock_pixmap.h;  diff -u /dev/null src/pixmaps/addr_one.xpm;  diff -u /dev/null src/pixmaps/addr_two.xpm;  ) > 2.5.2cvs1.patchset
 ( cvs diff -u -r 1.27.2.21 -r 1.27.2.22 src/addr_compl.c;  cvs diff -u -r 1.8.2.6 -r 1.8.2.7 src/addr_compl.h;  ) > 2.5.2cvs2.patchset
 ( cvs diff -u -r 1.27.2.22 -r 1.27.2.23 src/addr_compl.c;  ) > 2.5.2cvs3.patchset
+( cvs diff -u -r 1.100.2.42 -r 1.100.2.43 AUTHORS;  cvs diff -u -r 1.105.2.66 -r 1.105.2.67 src/prefs_account.c;  cvs diff -u -r 1.1.2.24 -r 1.1.2.25 src/gtk/authors.h;  ) > 2.5.2cvs4.patchset

diff --git a/configure.ac b/configure.ac
index 5e3e34bb6035be7f216a79caa85f1042783476a8..ffd509a71fe9dc593792b8bf70f0c9f1e8d86b31 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=5
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=3
+EXTRA_VERSION=4
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/gtk/authors.h b/src/gtk/authors.h
index 05a74b753ee1828eb1f34c2b91ea9cb0a751ef03..09e6fab76aba4fe3e7d2e854e5c73eaaf8fdc56a 100644 (file)
--- a/src/gtk/authors.h
+++ b/src/gtk/authors.h
@@ -170,6 +170,7 @@ static char *CONTRIBS_LIST[] = {
 "Nishimura",
 "Nishiyama",
 "Masaaki Noro",
+"Ales Nosek",
 "James Noyes",
 "Jens Oberender",
 "Ohmasa",

diff --git a/src/prefs_account.c b/src/prefs_account.c
index ff1d95f39b023d1f8a957120756b24462dcad7fc..9b0cfbd6f9a1999c84aba1747b5834b68107248a 100644 (file)
--- a/src/prefs_account.c
+++ b/src/prefs_account.c
@@ -758,7 +758,7 @@ void prefs_account_init()
        static gchar *path[2];
 
        path[0] = _("Account");
-       path[2] = NULL;
+       path[1] = NULL;
         
        account_page.page.path = path;
        account_page.page.weight = 1000.0;