From 070973b0bae99f19a8d5b6eea512fddca1e03406 Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Wed, 31 Mar 2010 16:00:03 +0000 Subject: [PATCH] Fix for #490. See ChangeLog. Monotone-Parent: 39447fbdf1de4d7eee3f87ded919230e8afb9bb2 Monotone-Revision: fc7652ed896945e9e9171d1081661b72921d2cb6 Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2010-03-31T16:00:03 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 3 +++ SoObjects/Mailer/SOGoDraftObject.m | 7 ++++++- SoObjects/Mailer/Version | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4ed71bc00..7960c0f27 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2010-03-31 Francis Lachapelle + * SoObjects/Mailer/SOGoDraftObject.m (+initialize): updated the + User-Agent header with the proper version. + * UI/WebServerResources/SchedulerUIDnD.js (onDragStart): don't start the dragging when the target element has a scrollbar. diff --git a/SoObjects/Mailer/SOGoDraftObject.m b/SoObjects/Mailer/SOGoDraftObject.m index e08aa0c85..0e7cebc42 100644 --- a/SoObjects/Mailer/SOGoDraftObject.m +++ b/SoObjects/Mailer/SOGoDraftObject.m @@ -88,12 +88,17 @@ static NSString *headerKeys[] = {@"subject", @"to", @"cc", @"bcc", @implementation SOGoDraftObject static NGMimeType *MultiMixedType = nil; -static NSString *userAgent = @"SOGoMail 1.0"; +static NSString *userAgent = nil; + (void) initialize { MultiMixedType = [NGMimeType mimeType: @"multipart" subType: @"mixed"]; [MultiMixedType retain]; + userAgent = [NSString stringWithFormat: @"SOGoMail %d.%d.%d", + UIX_MAILER_MAJOR_VERSION, + UIX_MAILER_MINOR_VERSION, + UIX_MAILER_SUBMINOR_VERSION]; + [userAgent retain]; } - (id) init diff --git a/SoObjects/Mailer/Version b/SoObjects/Mailer/Version index 329d3f4a8..c2c92d121 100644 --- a/SoObjects/Mailer/Version +++ b/SoObjects/Mailer/Version @@ -1,6 +1,6 @@ # Version file -SUBMINOR_VERSION:=126 +SUBMINOR_VERSION:=2 # v0.9.114 requires libNGMime v4.5.229 # v0.9.114 requires libNGExtensions v4.5.165