ooo-build r14695 - in branches/ooo-build-3-0-1: . patches/dev300

[rengelhard svn gnome org]

Author: rengelhard
Date: Tue Dec  2 22:03:16 2008
New Revision: 14695
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14695&view=rev

Log:
2008-12-02  Rene Engelhard  <rene debian org>

       * patches/dev300/apply,
         patches/dev300/mailmerge-ssl-ehlo.diff: add patch fixing SMTP
         dialog


Added:
   branches/ooo-build-3-0-1/patches/dev300/mailmerge-ssl-ehlo.diff
Modified:
   branches/ooo-build-3-0-1/ChangeLog
   branches/ooo-build-3-0-1/patches/dev300/apply

Modified: branches/ooo-build-3-0-1/patches/dev300/apply
==============================================================================
--- branches/ooo-build-3-0-1/patches/dev300/apply	(original)
+++ branches/ooo-build-3-0-1/patches/dev300/apply	Tue Dec  2 22:03:16 2008
@@ -421,6 +421,8 @@
 # allow other types of signing certs, fix by Jacob Berkman <jberkman novell com>
 xmlsecurity-verify-usages.diff, i#76871, pmladek
 
+mailmerge-sssl-ehlo.diff, i#76655, deb#5074448
+
 [ LinuxOnly ]
 # fix that allows OOo to work with a standard (unpatched) libjpeg,
 jpegc.c.diff, i#80674, n#272574, flr

Added: branches/ooo-build-3-0-1/patches/dev300/mailmerge-ssl-ehlo.diff
==============================================================================
--- (empty file)
+++ branches/ooo-build-3-0-1/patches/dev300/mailmerge-ssl-ehlo.diff	Tue Dec  2 22:03:16 2008
@@ -0,0 +1,17 @@
+Index: source/pyprov/mailmerge.py
+===================================================================
+RCS file: /cvs/framework/scripting/source/pyprov/mailmerge.py,v
+retrieving revision 1.8
+diff -u -r1.8 mailmerge.py
+--- scripting/source/pyprov/mailmerge.py	6 Dec 2007 10:57:39 -0000	1.8
++++ scripting/source/pyprov/mailmerge.py	2 Dec 2008 14:09:24 -0000
+@@ -83,7 +83,9 @@
+ 		if dbg:
+ 			print >> sys.stderr, connectiontype
+ 		if connectiontype == 'Ssl':
++			self.server.ehlo()
+ 			self.server.starttls()
++			self.server.ehlo()
+ 
+ 		user = xAuthenticator.getUserName()
+ 		password = xAuthenticator.getPassword()