[Libreoffice-commits] .: scripting/source

[Caolán McNamara]

 scripting/source/pyprov/mailmerge.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit d5b6bd4fadfc44429d0f400be23ad5fa38fd5266
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Dec 22 10:07:52 2010 +0000

    fix up the default fallback string for this now

diff --git a/scripting/source/pyprov/mailmerge.py b/scripting/source/pyprov/mailmerge.py
index 6592a59..8fd697f 100644
--- a/scripting/source/pyprov/mailmerge.py
+++ b/scripting/source/pyprov/mailmerge.py
@@ -2,8 +2,8 @@
 # a simple email mailmerge component
 
 # manual installation for hackers, not necessary for users
-# cp mailmerge.py /usr/lib/openoffice.org2.0/program
-# cd /usr/lib/openoffice.org2.0/program
+# cp mailmerge.py /usr/lib/libreoffice/program
+# cd /usr/lib/libreoffice/program
 # ./unopkg add --shared mailmerge.py
 # edit ~/.openoffice.org2/user/registry/data/org/openoffice/Office/Writer.xcu
 # and change EMailSupported to as follows...
@@ -178,7 +178,7 @@ class PyMailSMTPService(unohelper.Base, XSmtpService):
 		if xMailMessage.ReplyToAddress != '':
 			msg['Reply-To'] = xMailMessage.ReplyToAddress
 
-		mailerstring = "OpenOffice.org 2.0 via Caolan's mailmerge component"
+		mailerstring = "LibreOffice via Caolan's mailmerge component"
 		try:
 			ctx = uno.getComponentContext() 
 			aConfigProvider = ctx.ServiceManager.createInstance("com.sun.star.configuration.ConfigurationProvider")