talons

commit f027ee69ba2a264a45b43f73d0d0caa20a7ab4a8
parent 3b93b188232e8a7fd552da8dee541e3a8284243b
Author: Colin Leroy <colin@colino.net>
Date:   Wed,  5 Nov 2008 08:21:32 +0000

2008-11-05 [colin]	3.6.1cvs17

	* src/mainwindow.c
		Setting the Mail start menu item in HKCU
		confuses the Internet Options dialog. Do
		it in HKLM as this dialog does.

Diffstat:
M
ChangeLog
 | 
7
+++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/mainwindow.c
 | 
7
++++---

4 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,10 @@
+2008-11-05 [colin]	3.6.1cvs17
+
+	* src/mainwindow.c
+		Setting the Mail start menu item in HKCU 
+		confuses the Internet Options dialog. Do 
+		it in HKLM as this dialog does.
+
 2008-11-04 [colin]	3.6.1cvs16
 
 	* src/common/w32_reg.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3598,3 +3598,4 @@
 ( cvs diff -u -r 1.65.2.62 -r 1.65.2.63 src/codeconv.c;  ) > 3.6.1cvs14.patchset
 ( cvs diff -u -r 1.274.2.285 -r 1.274.2.286 src/mainwindow.c;  cvs diff -u -r 1.83.2.146 -r 1.83.2.147 src/mimeview.c;  cvs diff -u -r 1.204.2.181 -r 1.204.2.182 src/prefs_common.c;  cvs diff -u -r 1.103.2.116 -r 1.103.2.117 src/prefs_common.h;  cvs diff -u -r 1.3.2.23 -r 1.3.2.24 src/prefs_ext_prog.c;  cvs diff -u -r 1.49.2.118 -r 1.49.2.119 src/procmime.c;  cvs diff -u -r 1.96.2.209 -r 1.96.2.210 src/textview.c;  cvs diff -u -r 1.36.2.153 -r 1.36.2.154 src/common/utils.c;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/common/w32_reg.c;  cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/common/w32lib.h;  ) > 3.6.1cvs15.patchset
 ( cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/common/w32_reg.c;  ) > 3.6.1cvs16.patchset
+( cvs diff -u -r 1.274.2.286 -r 1.274.2.287 src/mainwindow.c;  ) > 3.6.1cvs17.patchset
diff --git a/configure.ac b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=6
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=16
+EXTRA_VERSION=17
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/mainwindow.c b/src/mainwindow.c
@@ -4932,10 +4932,11 @@ static void set_default_client_cb(GtkAction *action, gpointer data)
 	binary_compose = g_strconcat(exename, " --compose %1", NULL);
 	binary_run = g_strconcat(exename, NULL);
 
-	r = write_w32_registry_string("HKCU", "Software\\Clients\\Mail", 
+	/* Try to set the Mail Start menu item to Claws. It may fail if we're not root; we don't care */
+	r = write_w32_registry_string("HKLM", "Software\\Clients\\Mail", 
 			"", "Claws Mail");
-	if (!r)
-		r = write_w32_registry_string("HKCU", "Software\\Clients\\Mail\\Claws Mail", 
+	
+	r = write_w32_registry_string("HKCU", "Software\\Clients\\Mail\\Claws Mail", 
 				"", "Claws Mail");
 	if (!r)
 		r = write_w32_registry_string("HKCU", "Software\\Clients\\Mail\\Claws Mail",