2005-02-20 [colin] 1.0.1cvs151

	* src/common/defs.h
		Change cache file to .sylpheed_claws_cache, as
		suggested by Alfons. Allows people to switch
		between Sylpheed and Sylpheed-Claws. it is
		a good idea to "Check for new messages" at next
		startup.

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index ee8f25b8b183f689361fa416605f4d2b0c978148..b3f0b6cbea117ddb82a8a41963d7d8abe012255e 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,13 @@
+2005-02-20 [colin]     1.0.1cvs151
+
+       * src/common/defs.h
+               Change cache file to .sylpheed_claws_cache, as
+               suggested by Alfons. Allows people to switch
+               between Sylpheed and Sylpheed-Claws. it is
+               a good idea to "Check for new messages" at next
+               startup.
+
+

 2005-02-18 [colin]     1.0.1cvs14.1
 
        * src/quote_fmt_lex.l
 2005-02-18 [colin]     1.0.1cvs14.1
 
        * src/quote_fmt_lex.l

diff --git a/PATCHSETS b/PATCHSETS
index 44313f10c628f06c9ddf6e4bf0e2c92fe0c60d4b..3e1216ea7b47fa8d1fb3eaf337483838ceafb62e 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -389,3 +389,4 @@
 ( cvs diff -u -r 1.65.2.23 -r 1.65.2.24 src/codeconv.c; cvs diff -u -r 1.83.2.31 -r 1.83.2.32 src/mimeview.c; ) > 1.0.1cvs11.5.patchset
 ( cvs diff -u -r 1.207.2.30 -r 1.207.2.31 src/folderview.c; ) > 1.0.1cvs11.6.patchset
 ( cvs diff -u -r 1.8.2.1 -r 1.8.2.2 src/quote_fmt_lex.l; cvs diff -u -r 1.22.2.6 -r 1.22.2.7 src/quote_fmt_parse.y; ) > 1.0.1cvs14.1.patchset
 ( cvs diff -u -r 1.65.2.23 -r 1.65.2.24 src/codeconv.c; cvs diff -u -r 1.83.2.31 -r 1.83.2.32 src/mimeview.c; ) > 1.0.1cvs11.5.patchset
 ( cvs diff -u -r 1.207.2.30 -r 1.207.2.31 src/folderview.c; ) > 1.0.1cvs11.6.patchset
 ( cvs diff -u -r 1.8.2.1 -r 1.8.2.2 src/quote_fmt_lex.l; cvs diff -u -r 1.22.2.6 -r 1.22.2.7 src/quote_fmt_parse.y; ) > 1.0.1cvs14.1.patchset

+( cvs diff -u -r 1.9.2.9 -r 1.9.2.10 src/common/defs.h; ) > 1.0.1cvs151.patchset

diff --git a/configure.ac b/configure.ac
index c408622248407d20d794305ec4370c60892e27ca..117948b994a71d08168620b76e6dbb549886799d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,9 +11,9 @@ MINOR_VERSION=0
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=14
+EXTRA_VERSION=15

 EXTRA_RELEASE=
 EXTRA_RELEASE=

-EXTRA_GTK2_VERSION=.1
+EXTRA_GTK2_VERSION=1

 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}${EXTRA_RELEASE}${EXTRA_GTK2_VERSION}
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}${EXTRA_RELEASE}${EXTRA_GTK2_VERSION}

diff --git a/src/common/defs.h b/src/common/defs.h
index dc1cca158704054ca8ff976241ad276bb7720832..08e874b5a0b64147726aa4b5b5a30c7d29b16d6f 100644 (file)
--- a/src/common/defs.h
+++ b/src/common/defs.h
@@ -75,7 +75,7 @@
 #define CLAWS_THEMES_URI       "http://sylpheed-claws.sourceforge.net/themes.php"
 #define THEMEINFO_FILE         ".sylpheed_themeinfo"
 #define FOLDER_LIST            "folderlist.xml"
 #define CLAWS_THEMES_URI       "http://sylpheed-claws.sourceforge.net/themes.php"
 #define THEMEINFO_FILE         ".sylpheed_themeinfo"
 #define FOLDER_LIST            "folderlist.xml"

-#define CACHE_FILE             ".sylpheed_cache"
+#define CACHE_FILE             ".sylpheed_claws_cache"

 #define MARK_FILE              ".sylpheed_mark"
 #define CACHE_VERSION          23
 #define MARK_VERSION           2
 #define MARK_FILE              ".sylpheed_mark"
 #define CACHE_VERSION          23
 #define MARK_VERSION           2