2005-10-26 [wwp] 1.9.15cvs110

	* src/folder.c
	* src/manual.c
	* src/summaryview.c
		fix uninitialized pointers in the folder updating hook
		(thanks to Colin)

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 391af1fbb026ac1961b9972ecb5e852c02ea3882..5134607f8ff196045cf133e6e1da8d3c67948362 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,11 @@
+2005-10-26 [wwp]       1.9.15cvs110
+
+       * src/folder.c
+       * src/manual.c
+       * src/summaryview.c
+               fix uninitialized pointers in the folder updating hook
+               (thanks to Colin)
+

 2005-10-25 [mones]     1.9.15cvs109
 
        * manual/faq.xml
 2005-10-25 [mones]     1.9.15cvs109
 
        * manual/faq.xml

diff --git a/PATCHSETS b/PATCHSETS
index ed61b60a41544ad4a099d9dcea03ff3b02782d0b..e8bc178c37a0e6c6b4a7944c2375bd198a536c26 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -946,3 +946,4 @@
 ( cvs diff -u -r 1.22.2.5 -r 1.22.2.6 src/addrbook.c;  cvs diff -u -r 1.28.2.11 -r 1.28.2.12 src/addrindex.c;  cvs diff -u -r 1.382.2.188 -r 1.382.2.189 src/compose.c;  cvs diff -u -r 1.49.2.64 -r 1.49.2.65 src/procmime.c;  ) > 1.9.15cvs107.patchset
 ( cvs diff -u -r 1.382.2.189 -r 1.382.2.190 src/compose.c;  ) > 1.9.15cvs108.patchset
 ( cvs diff -u -r 1.1.2.1 -r 1.1.2.2 manual/Makefile;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 manual/faq.xml;  diff -u /dev/null manual/dtd/manual.dsl;  ) > 1.9.15cvs109.patchset
 ( cvs diff -u -r 1.22.2.5 -r 1.22.2.6 src/addrbook.c;  cvs diff -u -r 1.28.2.11 -r 1.28.2.12 src/addrindex.c;  cvs diff -u -r 1.382.2.188 -r 1.382.2.189 src/compose.c;  cvs diff -u -r 1.49.2.64 -r 1.49.2.65 src/procmime.c;  ) > 1.9.15cvs107.patchset
 ( cvs diff -u -r 1.382.2.189 -r 1.382.2.190 src/compose.c;  ) > 1.9.15cvs108.patchset
 ( cvs diff -u -r 1.1.2.1 -r 1.1.2.2 manual/Makefile;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 manual/faq.xml;  diff -u /dev/null manual/dtd/manual.dsl;  ) > 1.9.15cvs109.patchset

+( cvs diff -u -r 1.213.2.66 -r 1.213.2.67 src/folder.c;  cvs diff -u -r 1.11.2.2 -r 1.11.2.3 src/manual.c;  cvs diff -u -r 1.395.2.141 -r 1.395.2.142 src/summaryview.c;  ) > 1.9.15cvs110.patchset

diff --git a/configure.ac b/configure.ac
index 57ad684f4e704c8a117d3dac5464bb4522d46ab6..35371a53d9e2e3dd0bdc808e2301f1f55dc0b615 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=15
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=15
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=109
+EXTRA_VERSION=110

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/folder.c b/src/folder.c
index cb6574b9df3afdfad127ea131f159fe87e71fc0b..33153e5ae3213f1f5e5bc0ae36444807b27fbcc6 100644 (file)
--- a/src/folder.c
+++ b/src/folder.c
@@ -3572,6 +3572,7 @@ static void folder_item_update_func(FolderItem *item, gpointer data)
        if (item->update_flags) {
                source.item = item;
                source.update_flags = item->update_flags;
        if (item->update_flags) {
                source.item = item;
                source.update_flags = item->update_flags;

+               source.msg = NULL;

                hooks_invoke(FOLDER_ITEM_UPDATE_HOOKLIST, &source);                             
                item->update_flags = 0;
        }
                hooks_invoke(FOLDER_ITEM_UPDATE_HOOKLIST, &source);                             
                item->update_flags = 0;
        }

diff --git a/src/manual.c b/src/manual.c
index de5e65d5d03de995f7d390c89f75dce5b7526ac1..ddd07546d883a4a9651293b4d8560e18153c1d70 100644 (file)
--- a/src/manual.c
+++ b/src/manual.c
@@ -25,7 +25,11 @@
 
 #include <glib.h>
 #include <string.h>
 
 #include <glib.h>
 #include <string.h>

-#include <locale.h>
+
+#if HAVE_LOCALE_H
+#  include <locale.h>
+#endif
+

 
 #include "prefs_common.h"
 #include "manual.h"
 
 #include "prefs_common.h"
 #include "manual.h"

diff --git a/src/summaryview.c b/src/summaryview.c
index 4c7d733a2c6f4caae3d93067b8904418fe106f82..638af944fadeb8e1b154f57b34c6eeb0df7021d6 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -5438,6 +5438,7 @@ void summary_toggle_show_read_messages(SummaryView *summaryview)
 
        source.item = summaryview->folder_item;
        source.update_flags = F_ITEM_UPDATE_NAME;
 
        source.item = summaryview->folder_item;
        source.update_flags = F_ITEM_UPDATE_NAME;

+       source.msg = NULL;

        hooks_invoke(FOLDER_ITEM_UPDATE_HOOKLIST, &source);
        summary_show(summaryview, summaryview->folder_item);
 }
        hooks_invoke(FOLDER_ITEM_UPDATE_HOOKLIST, &source);
        summary_show(summaryview, summaryview->folder_item);
 }