[Gpg4win-commits] r1017 - trunk/src

[scm-commit@wald.intevation.org]

Author: colinleroy
Date: 2008-11-05 09:14:55 +0100 (Wed, 05 Nov 2008)
New Revision: 1017

Modified:
   trunk/src/inst-claws-mail.nsi
   trunk/src/uninst-claws-mail.nsi
Log:
2008-11-05  Colin Leroy  <colin at colino.net>

	* src/inst-claws.nsi: Fix registration of Claws in the list
	of available clients
	* src/uninst-claws.nsi: Remove Claws from the list of 
	available clients


Modified: trunk/src/inst-claws-mail.nsi
===================================================================
--- trunk/src/inst-claws-mail.nsi	2008-11-04 21:40:00 UTC (rev 1016)
+++ trunk/src/inst-claws-mail.nsi	2008-11-05 08:14:55 UTC (rev 1017)
@@ -54,6 +54,8 @@
 
   MessageBox MB_YESNO "$(T_SetDefaultClient)" IDNO skip_default_client
 
+#register user's default client
+
   WriteRegStr HKCU "Software\Classes\mailto" "" "URL:MailTo-Protocol"
   WriteRegStr HKCU "Software\Classes\mailto" "URL Protocol" ""
   WriteRegDword HKCU "Software\Classes\mailto" "EditFlags" 2
@@ -62,15 +64,17 @@
   WriteRegStr HKCU "Software\Classes\mailto\shell\open\command" "" "$INSTDIR\claws-mail.exe --compose %1"
   WriteRegStr HKCU "SOFTWARE\Clients\Mail" "" "Claws Mail"
 skip_default_client:
-  WriteRegStr HKCU "SOFTWARE\Clients\Mail\Claws Mail" "" "Claws Mail"
-  WriteRegStr HKCU "SOFTWARE\Clients\Mail\Claws Mail" "DLLPath" ""
-  WriteRegStr HKCU "SOFTWARE\Clients\Mail\Claws Mail\Protocols\mailto" "" "URL:MailTo-Protocol"
-  WriteRegStr HKCU "SOFTWARE\Clients\Mail\Claws Mail\Protocols\mailto" "URL Protocol" ""
-  WriteRegDword HKCU "SOFTWARE\Clients\Mail\Claws Mail\Protocols\mailto" "EditFlags" 2
-  WriteRegStr HKCU "SOFTWARE\Clients\Mail\Claws Mail\Protocols\mailto\DefaultIcon" "" "$INSTDIR\claws-mail.exe,0"
-  WriteRegStr HKCU "SOFTWARE\Clients\Mail\Claws Mail\Protocols\mailto\shell\open\command" "" "$INSTDIR\claws-mail.exe --compose %1"
-  WriteRegStr HKCU "SOFTWARE\Clients\Mail\Claws Mail\shell\open\command" "" "$INSTDIR\claws-mail.exe"
 
+#just register Claws in the list of available mailers
+  WriteRegStr HKLM "SOFTWARE\Clients\Mail\Claws Mail" "" "Claws Mail"
+  WriteRegStr HKLM "SOFTWARE\Clients\Mail\Claws Mail" "DLLPath" ""
+  WriteRegStr HKLM "SOFTWARE\Clients\Mail\Claws Mail\Protocols\mailto" "" "URL:MailTo-Protocol"
+  WriteRegStr HKLM "SOFTWARE\Clients\Mail\Claws Mail\Protocols\mailto" "URL Protocol" ""
+  WriteRegDword HKLM "SOFTWARE\Clients\Mail\Claws Mail\Protocols\mailto" "EditFlags" 2
+  WriteRegStr HKLM "SOFTWARE\Clients\Mail\Claws Mail\Protocols\mailto\DefaultIcon" "" "$INSTDIR\claws-mail.exe,0"
+  WriteRegStr HKLM "SOFTWARE\Clients\Mail\Claws Mail\Protocols\mailto\shell\open\command" "" "$INSTDIR\claws-mail.exe --compose %1"
+  WriteRegStr HKLM "SOFTWARE\Clients\Mail\Claws Mail\shell\open\command" "" "$INSTDIR\claws-mail.exe"
+
 !endif
 ${MementoSectionEnd}
 

Modified: trunk/src/uninst-claws-mail.nsi
===================================================================
--- trunk/src/uninst-claws-mail.nsi	2008-11-04 21:40:00 UTC (rev 1016)
+++ trunk/src/uninst-claws-mail.nsi	2008-11-05 08:14:55 UTC (rev 1017)
@@ -56,5 +56,7 @@
   RMDir "$INSTDIR\share\claws-mail"
   RMDir "$INSTDIR\share"
   RMDir "$INSTDIR"
+  DeleteRegKey HKLM "SOFTWARE\Clients\Mail\Claws Mail"
+
 !endif
 SectionEnd