[CalendarServer-changes] [6211] CalendarServer/trunk/twistedcaldav/notify.py

source_changes at macosforge.org source_changes at macosforge.org
Tue Aug 31 08:56:13 PDT 2010


Revision: 6211
          http://trac.macosforge.org/projects/calendarserver/changeset/6211
Author:   sagen at apple.com
Date:     2010-08-31 08:56:12 -0700 (Tue, 31 Aug 2010)
Log Message:
-----------
Only include the XMPP port if it's not the default (5222)

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/notify.py

Modified: CalendarServer/trunk/twistedcaldav/notify.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/notify.py	2010-08-31 15:17:41 UTC (rev 6210)
+++ CalendarServer/trunk/twistedcaldav/notify.py	2010-08-31 15:56:12 UTC (rev 6211)
@@ -1221,7 +1221,10 @@
             results['service'] = settings['ServiceAddress']
             results['host'] = config.ServerHostName
             results['port'] = config.SSLPort or config.HTTPPort
-            results['xmpp-server'] = "%s:%d" % (settings['Host'], settings['Port'])
+            results['xmpp-server'] = (
+                settings['Host'] if settings['Port'] == 5222
+                else "%s:%d" % (settings['Host'], settings['Port'])
+            )
             results['subscription-url'] = settings['SubscriptionURL']
             results['aps-bundle-id'] = settings['APSBundleID']
             results['heartrate'] = settings['HeartbeatMinutes']
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100831/4cead4a0/attachment.html>


More information about the calendarserver-changes mailing list