talons

commit a1e39ff5b7455e40cb882cded91655499d72bc8d
parent 02b5e1ced57de18def0b13011932748935dfed8a
Author: Colin Leroy <colin@colino.net>
Date:   Wed, 16 Sep 2009 16:32:32 +0000

2009-09-16 [colin]	3.7.2cvs34

	* src/main.c
		Go grab files in /etc/skel if they exist
		at first startup

Diffstat:
M
ChangeLog
 | 
6
++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/main.c
 | 
16
++++++++++++----

4 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+2009-09-16 [colin]	3.7.2cvs34
+
+	* src/main.c
+		Go grab files in /etc/skel if they exist
+		at first startup 
+
 2009-09-15 [colin]	3.7.2cvs33
 
 	* src/procmime.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3858,3 +3858,4 @@
 ( cvs diff -u -r 1.36.2.174 -r 1.36.2.175 src/common/utils.c;  ) > 3.7.2cvs31.patchset
 ( cvs diff -u -r 1.75.2.65 -r 1.75.2.66 src/matcher.c;  cvs diff -u -r 1.39.2.17 -r 1.39.2.18 src/matcher.h;  cvs diff -u -r 1.25.2.33 -r 1.25.2.34 src/matcher_parser_parse.y;  cvs diff -u -r 1.43.2.81 -r 1.43.2.82 src/prefs_matcher.c;  ) > 3.7.2cvs32.patchset
 ( cvs diff -u -r 1.49.2.130 -r 1.49.2.131 src/procmime.c;  ) > 3.7.2cvs33.patchset
+( cvs diff -u -r 1.115.2.222 -r 1.115.2.223 src/main.c;  ) > 3.7.2cvs34.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=33
+EXTRA_VERSION=34
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/main.c b/src/main.c
@@ -1228,12 +1228,20 @@ int main(int argc, char *argv[])
 		/* If migration failed or the user didn't want to do it,
 		 * we create a new one (and we'll hit wizard later). 
 		 */
-		if (r == FALSE && !is_dir_exist(RC_DIR) && make_dir(RC_DIR) < 0) {
+		if (r == FALSE && !is_dir_exist(RC_DIR)) {
+#ifdef G_OS_UNIX
+			if (copy_dir(SYSCONFDIR "/skel/.claws-mail", RC_DIR) < 0) {
+#endif
+				if (!is_dir_exist(RC_DIR) && make_dir(RC_DIR) < 0) {
 #ifdef G_OS_WIN32
-			win32_close_log();
+					win32_close_log();
 #endif
-			exit(1);
-	}
+					exit(1);
+				}
+#ifdef G_OS_UNIX
+			}
+#endif
+		}
 	}