2010-08-17 [colin] 3.7.6cvs28

	* src/main.c
		Fix previous patch (our own tmp dir is inside
		our rc dir)

diff --git a/ChangeLog b/ChangeLog
index 500aaaa46ff118da25c59aad67f0b3275ece3040..be12026cf844d30d422b9333d7f3cd408f3fcbc1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-08-17 [colin]     3.7.6cvs28
+
+       * src/main.c
+               Fix previous patch (our own tmp dir is inside
+               our rc dir)
+

 2010-08-16 [colin]     3.7.6cvs27
 
        * src/main.c
 2010-08-16 [colin]     3.7.6cvs27
 
        * src/main.c

diff --git a/PATCHSETS b/PATCHSETS
index 1cd57346de57bf668daf33670afbc6ee95e734b6..a3ae654b23fc149d0820d6a36927546b38d81bd0 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -4023,3 +4023,4 @@
 ( cvs diff -u -r 1.25.2.66 -r 1.25.2.67 src/stock_pixmap.c;  ) > 3.7.6cvs25.patchset
 ( cvs diff -u -r 1.1.4.12 -r 1.1.4.13 src/gtk/gtkshruler.c;  ) > 3.7.6cvs26.patchset
 ( cvs diff -u -r 1.115.2.226 -r 1.115.2.227 src/main.c;  ) > 3.7.6cvs27.patchset
 ( cvs diff -u -r 1.25.2.66 -r 1.25.2.67 src/stock_pixmap.c;  ) > 3.7.6cvs25.patchset
 ( cvs diff -u -r 1.1.4.12 -r 1.1.4.13 src/gtk/gtkshruler.c;  ) > 3.7.6cvs26.patchset
 ( cvs diff -u -r 1.115.2.226 -r 1.115.2.227 src/main.c;  ) > 3.7.6cvs27.patchset

+( cvs diff -u -r 1.115.2.227 -r 1.115.2.228 src/main.c;  ) > 3.7.6cvs28.patchset

diff --git a/configure.ac b/configure.ac
index c39740b5966d0ee127e47890e2d0316d4b3f07c7..dc3e84a03ee428d4e70bc3a2197ccd5055cc2542 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=27
+EXTRA_VERSION=28

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/main.c b/src/main.c
index 7cb14b937f1ad9cbc3d3d618b8ee1a80a88c517a..87ea4293e925711b4356f3af1bf8018453efc16e 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -793,8 +793,8 @@ static void win32_log(const gchar *log_domain, GLogLevelFlags log_level, const g
 
 static void win32_open_log(void)
 {
 
 static void win32_open_log(void)
 {

-       gchar *logfile = g_strconcat(get_tmp_dir(), G_DIR_SEPARATOR_S, "claws-win32.log", NULL);
-       gchar *oldlogfile = g_strconcat(get_tmp_dir(), G_DIR_SEPARATOR_S, "claws-win32.log.bak", NULL);
+       gchar *logfile = g_strconcat(g_get_tmp_dir(), G_DIR_SEPARATOR_S, "claws-win32.log", NULL);
+       gchar *oldlogfile = g_strconcat(g_get_tmp_dir(), G_DIR_SEPARATOR_S, "claws-win32.log.bak", NULL);

 
        if (is_file_exist(logfile)) {
                if (rename_force(logfile, oldlogfile) < 0)
 
        if (is_file_exist(logfile)) {
                if (rename_force(logfile, oldlogfile) < 0)