-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
>>> I promised it to write a little patch for it, and so here it is.
>> You attached not patch but not unified diff output.
>> Re-do the same with -u key to get a patch:
>> diff -u >somefile.diff
Ah ok :)
>
> also it looks like you've done a reverse patch. The 'old file' should
> be the first file, and the 'new file' should be the second file on the
> command line.
>
Whoops
So here the correct one
Maarten
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.2 (GNU/Linux)
iD8DBQFEFrsaXjGr8JbE19URAvWZAKDnG90ACshBOtwKl50mIAJKxmBnewCgqIdy
sJ4ltDzkCNr8skb+yDxVQLI=
=TBwA
-----END PGP SIGNATURE-----
-------------- next part --------------
--- /root/PyMSN/src/session.py 2006-03-14 12:22:59.000000000 +0100
+++ /usr/local/PyMSNt/src/session.py 2006-03-14 12:45:05.000000000 +0100
@@ -48,6 +48,7 @@
self.username = username # the legacy network ID of the
Session's user
self.password = password
self.nickname = ""
+ self.fullname = ""
self.avatar = None
self.lang = ulang
@@ -121,6 +122,8 @@
for e in vCard.elements():
if e.name == "NICKNAME":
self.updateNickname(e.__str__())
+ if e.name == "FN":
+ self.updateFullname(e.__str__())
if e.name == "PHOTO":
imageData = avatar.parsePhotoEl(e)
if not imageData:
@@ -130,6 +133,14 @@
avatarSet = True
if not avatarSet:
self.legacycon.updateAvatar() # Default avatar
+
+ if not self.nickname:
+ self.nickname = self.fullname.split()[0] #Use
first name of Full Name if there is no nickname
+ if not self.nickname:
+ j = jid.intern(self.jabberID) #Otherwise use
user part of JID
+ self.nickname = j.user
+ self.setStatus(self.show, self.status)
+
def errback(args=None):
LogEvent(INFO, self.jabberID, "Error fetching avatar.")
@@ -143,10 +154,9 @@
def updateNickname(self, nickname):
self.nickname = nickname
- if not self.nickname:
- j = jid.intern(self.jabberID)
- self.nickname = j.user
- self.setStatus(self.show, self.status)
+
+ def updateFullname(self, fullname):
+ self.fullname = fullname
def setStatus(self, show, status):
self.show = show
From [EMAIL PROTECTED] Tue Mar 14 13:19:30 2006
From: [EMAIL PROTECTED] (Renato Botelho)
Date: Tue Mar 14 13:19:34 2006
Subject: [py-transports] Problems with PyMSNt + ejabberd-1.0.0
In-Reply-To: <[EMAIL PROTECTED]>
References: <[EMAIL PROTECTED]>
<[EMAIL PROTECTED]>
<[EMAIL PROTECTED]>
<[EMAIL PROTECTED]>
<[EMAIL PROTECTED]>
<[EMAIL PROTECTED]>
<[EMAIL PROTECTED]>
<[EMAIL PROTECTED]>
Message-ID: <[EMAIL PROTECTED]>
On 3/14/06, James Bunton <[EMAIL PROTECTED]> wrote:
> Its most likely a problem with either pyopenssl or pycrypto.
> Try using different or newer packages, if possible.
>
> You can also try running this
> trial --spew /usr/lib/python2.4/site-packages/twisted/test/test_ssl.py
>
> That will print lots of junk to the screen, which might help you to
> figure it out.
>
> Its most likely a packaging problem, but if you compile it from source
> and have the same trouble, then consider talking to the
> pyopenssl/pycrypto authors to see if they can help.
>
> Good luck!
I remove openssl-0.9.8a from ports, and back to use 0.9.7e from
base-system, and now everything worked fine \o/
Thanks
--
Renato Botelho
From [EMAIL PROTECTED] Tue Mar 14 22:32:01 2006
From: [EMAIL PROTECTED] (James Bunton)
Date: Tue Mar 14 22:32:27 2006
Subject: [py-transports] Problems with PyMSNt + ejabberd-1.0.0
In-Reply-To: <[EMAIL PROTECTED]>
References: <[EMAIL PROTECTED]>
<[EMAIL PROTECTED]>
<[EMAIL PROTECTED]>
<[EMAIL PROTECTED]>
<[EMAIL PROTECTED]>
<[EMAIL PROTECTED]>
<[EMAIL PROTECTED]>
<[EMAIL PROTECTED]>
<[EMAIL PROTECTED]>
Message-ID: <[EMAIL PROTECTED]>
On 15/03/2006, at 12:19 AM, Renato Botelho wrote:
> On 3/14/06, James Bunton <[EMAIL PROTECTED]> wrote:
>> Its most likely a problem with either pyopenssl or pycrypto.
>> Try using different or newer packages, if possible.
>>
>> You can also try running this
>> trial --spew /usr/lib/python2.4/site-packages/twisted/test/test_ssl.py
>>
>> That will print lots of junk to the screen, which might help you to
>> figure it out.
>>
>> Its most likely a packaging problem, but if you compile it from source
>> and have the same trouble, then consider talking to the
>> pyopenssl/pycrypto authors to see if they can help.
>>
>> Good luck!
>
> I remove openssl-0.9.8a from ports, and back to use 0.9.7e from
> base-system, and now everything worked fine \o/
>
> Thanks
> --
> Renato Botelho
Glad to hear it.
I'd be filing a bug report with the pyopenssl people, and/or the
openssl people.
---
James
