[Gpg4win-commits] r1305 - in trunk: . packages src

Tue Dec 8 21:45:50 CET 2009

Author: colinleroy
Date: 2009-12-08 21:45:49 +0100 (Tue, 08 Dec 2009)
New Revision: 1305

Modified:
   trunk/ChangeLog
   trunk/packages/packages.current
   trunk/src/Makefile.am
   trunk/src/inst-claws-mail.nsi
   trunk/src/uninst-claws-mail.nsi
Log:
2009-12-08  Colin Leroy  <colin at colino.net>

	* src/inst-claws-mail.nsi, src/uninst-claws-mail.nsi, 
	src/Makefile.am, packages/packages.current: Update Claws Mail
	and its plugins.



Modified: trunk/ChangeLog
===================================================================

--- trunk/ChangeLog	2009-10-20 10:19:00 UTC (rev 1304)
+++ trunk/ChangeLog	2009-12-08 20:45:49 UTC (rev 1305)
@@ -1,3 +1,9 @@
+2009-12-08  Colin Leroy  <colin at colino.net>
+
+	* src/inst-claws-mail.nsi, src/uninst-claws-mail.nsi, 
+	src/Makefile.am, packages/packages.current: Update Claws Mail
+	and its plugins.
+
 2009-10-20  Marcus Brinkmann  <marcus at g10code.com>
 
 	* src/gpg4win.mk.in (SPKG stamps/stamp-$(1)-04-install): Remove

Modified: trunk/packages/packages.current
===================================================================
--- trunk/packages/packages.current	2009-10-20 10:19:00 UTC (rev 1304)
+++ trunk/packages/packages.current	2009-12-08 20:45:49 UTC (rev 1305)
@@ -127,36 +127,36 @@
 # (Kept on our own mirror due to Sourceforge peculiarities.)
 
 server http://www.claws-mail.org/win32
-file   claws-mail-3.7.2cvs27.tar.bz2
-chk    5ff608783781c6de1410737e8b5cbb1f96681614
+file   claws-mail-3.7.3cvs6.tar.bz2
+chk    907c811763819fdd6ab3e922ebbd168293cbea07
 
 server http://www.claws-mail.org/win32
 file   attachwarner-0.2.17.tar.gz
-chk    65d92cfb41f48679cadc8fa8db17a55fdc0d6c0b
+chk    ce1c5d851c17804c2bb2e1739c41a0deda90962c
 
 server http://www.claws-mail.org/win32
-file   bsfilter_plugin-1.0.1cvs1.tar.gz
-chk    179f5e83431376a8914b349d51c85a733e4eb780
+file   bsfilter_plugin-1.0.2.tar.gz
+chk    4db1dcf1ac3d0b113f197ecedc20acedcaf7e7a1
 
 server http://www.claws-mail.org/win32
-file   gtkhtml2_viewer-0.24cvs2.tar.gz
-chk    c6224101ba8d4e4a59112a5235567b4ca162e802
+file   gtkhtml2_viewer-0.25.tar.gz
+chk    4423bf561895b6377133b508b512b766cf22b4b3
 
 server http://www.claws-mail.org/win32
-file   notification_plugin-0.22cvs3.tar.gz
-chk    9def3108dab352b170eaf9b0a346d83b80c0a419
+file   notification_plugin-0.23cvs2.tar.gz
+chk    102bf9a3aa5a401c936c92ff2cf89bcc242342e4
 
 server http://www.claws-mail.org/win32
 file   rssyl-0.25.tar.gz
-chk    3a2a652907c163abda7f2a7dbae1c0ba157a8728
+chk    0f4d8a3e0ff8f2eae97c2c8813209b1790ed6a07
 
 server http://www.claws-mail.org/win32
-file   tnef_parse-0.3.5cvs1.tar.gz
-chk    e7e07be77878f83ed91331eb79e99303f4302b95
+file   tnef_parse-0.3.6.tar.gz
+chk    85de488d9d056a0817f21647e4cb63445e2a2d20
 
 server http://www.claws-mail.org/win32
-file   vcalendar-2.0.5.tar.gz
-chk    b2b6e3ada7b36a5fdd9e1cb263249b6929efbf45
+file   vcalendar-2.0.6.tar.gz
+chk    48c9e04a6f6917b2d4e26429ebb2447ae330b092
 
 #
 # Pthreads for Windows.

Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am	2009-10-20 10:19:00 UTC (rev 1304)
+++ trunk/src/Makefile.am	2009-12-08 20:45:49 UTC (rev 1305)
@@ -263,7 +263,7 @@
 
 gpg4win_pkg_notification_plugin_configure = \
   --with-lib-prefix=$(idir) --with-libiconv-prefix=$(idir) \
-  --disable-libnotify --disable-lcdproc
+  --disable-libnotify --disable-lcdproc --disable-hotkeys
 
 gpg4win_pkg_gtkhtml2_viewer_configure = \
   --with-lib-prefix=$(idir) --with-libiconv-prefix=$(idir) LIBS=\"-L$(idir)/bin\"

Modified: trunk/src/inst-claws-mail.nsi
===================================================================
--- trunk/src/inst-claws-mail.nsi	2009-10-20 10:19:00 UTC (rev 1304)
+++ trunk/src/inst-claws-mail.nsi	2009-12-08 20:45:49 UTC (rev 1305)
@@ -27,7 +27,7 @@
      "Do you want to make Claws Mail your default mail client?"
      
 
-${MementoUnselectedSection} "Claws-Mail" SEC_claws_mail
+${MementoSection} "Claws-Mail" SEC_claws_mail
   SetOutPath "$INSTDIR"
 !ifdef SOURCES
   File "${gpg4win_pkg_claws_mail}"
@@ -62,6 +62,7 @@
   WriteRegStr HKCU "Software\Classes\mailto" "" "URL:MailTo-Protocol"
   WriteRegStr HKCU "Software\Classes\mailto" "URL Protocol" ""
   WriteRegDword HKCU "Software\Classes\mailto" "EditFlags" 2
+  WriteRegStr HKCU "Software\Classes\mailto" "FriendlyTypeName" "Claws-Mail URL"
 
   WriteRegStr HKCU "Software\Classes\mailto\DefaultIcon" "" "$INSTDIR\claws-mail.exe,0"
   WriteRegStr HKCU "Software\Classes\mailto\shell\open\command" "" "$INSTDIR\claws-mail.exe --compose %1"
@@ -73,11 +74,19 @@
   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" ""
+  WriteRegStr HKLM "SOFTWARE\Clients\Mail\Claws Mail\Protocols\mailto" "FriendlyTypeName" "Claws-Mail URL"
   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"
 
+  WriteRegStr HKLM "SOFTWARE\Classes\Claws-Mail.Url.mailto" "" "Claws-Mail URL"
+  WriteRegStr HKLM "SOFTWARE\Classes\Claws-Mail.Url.mailto" "FriendlyTypeName" "Claws-Mail URL"
+  WriteRegStr HKLM "SOFTWARE\Classes\Claws-Mail.Url.mailto" "URL Protocol" ""
+  WriteRegDword HKLM "SOFTWARE\Classes\Claws-Mail.Url.mailto" "EditFlags" 2
+
+  WriteRegStr HKLM "SOFTWARE\Classes\Claws-Mail.Url.mailto\DefaultIcon" "" "$INSTDIR\claws-mail.exe,0"
+  WriteRegStr HKLM "SOFTWARE\Classes\Claws-Mail.Url.mailto\mailto\shell\open\command" "" "$INSTDIR\claws-mail.exe --compose %1"
 !endif
 ${MementoSectionEnd}
 

Modified: trunk/src/uninst-claws-mail.nsi
===================================================================
--- trunk/src/uninst-claws-mail.nsi	2009-10-20 10:19:00 UTC (rev 1304)
+++ trunk/src/uninst-claws-mail.nsi	2009-12-08 20:45:49 UTC (rev 1305)
@@ -60,6 +60,7 @@
   RMDir "$INSTDIR\share"
   RMDir "$INSTDIR"
   DeleteRegKey HKLM "SOFTWARE\Clients\Mail\Claws Mail"
+  DeleteRegKey HKLM "SOFTWARE\Classes\Claws-Mail.Url.mailto"
 
 !endif
 SectionEnd

