Attachment 21431 Details for Bug 19250 – patch

[patch] patch

aliasing.patch (text/plain), 3.32 KB, created by Olivier Le Thanh Duong on 2008-12-23 01:32:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Olivier Le Thanh Duong

Created: 2008-12-23 01:32:08 UTC

Size: 3.32 KB

patch

obsolete

>=== modified file 'butterfly/aliasing.py'
>--- butterfly/aliasing.py	2008-01-13 14:07:41 +0000
>+++ butterfly/aliasing.py	2008-12-23 09:18:37 +0000
>@@ -19,6 +19,7 @@
> import logging
> 
> import telepathy
>+import telepathy.constants
> import pymsn
> from pymsn.service.description.AB.constants import \
>     ContactGeneral, ContactAnnotations
>@@ -38,28 +39,24 @@
>         telepathy.server.ConnectionInterfaceAliasing.__init__(self)
>         pymsn.event.ContactEventInterface.__init__(self, self.msn_client)
> 
>+    def GetAliasFlags(self):
>+        return telepathy.constants.CONNECTION_ALIAS_FLAG_USER_SET
>+
>     def RequestAliases(self, contacts):
>-        result = []
>-        for handle_id in contacts:
>-            handle = self.handle(telepathy.HANDLE_TYPE_CONTACT, handle_id)
>-            if handle == ButterflyHandleFactory(self, 'self'):
>-                display_name = self.msn_client.profile.display_name
>-                if display_name == "":
>-                    display_name = handle.get_name().split('@', 1)[0]
>-                    display_name = display_name.replace("_", " ")
>-                result.append(unicode(display_name, 'utf-8'))
>-            else:
>-                contact = handle.contact
>-                if contact is None:
>-                    result.append(unicode(handle.account, 'utf-8'))
>-                else:
>-                    alias = contact.infos.get(ContactGeneral.ANNOTATIONS, {}).\
>-                        get(ContactAnnotations.NICKNAME, None)
>-                    if alias == "" or alias is None:
>-                         alias = contact.display_name
>-                    result.append(unicode(alias, 'utf-8'))
>+        logger.debug("Called RequestAliases")
>+        return [self._get_alias(handle_id)\
>+                    for handle_id in contacts]
>+
>+
>+    def GetAliases(self,contacts):
>+        logger.debug("Called GetAliases")
>+
>+        result = {}
>+        for contact in contacts :
>+            result[contact] = self._get_alias(contact)
>         return result
> 
>+
>     def SetAliases(self, aliases):
>         for handle_id, alias in aliases.iteritems():
>             handle = self.handle(telepathy.HANDLE_TYPE_CONTACT, handle_id)
>@@ -107,6 +104,27 @@
>                     update_contact_infos(contact, infos)
>                 handle.pending_alias = None
> 
>+    def _get_alias(self, handle_id):
>+        """Get the alias from one handle id"""
>+        handle = self.handle(telepathy.HANDLE_TYPE_CONTACT, handle_id)
>+        if handle == ButterflyHandleFactory(self, 'self'):
>+            display_name = self.msn_client.profile.display_name
>+            if display_name == "":
>+                display_name = handle.get_name().split('@', 1)[0]
>+                display_name = display_name.replace("_", " ")
>+            alias = unicode(display_name, 'utf-8')
>+        else:
>+            contact = handle.contact
>+            if contact is None:
>+                alias = unicode(handle.account, 'utf-8')
>+            else:
>+                alias = contact.infos.get(ContactGeneral.ANNOTATIONS, {}).\
>+                    get(ContactAnnotations.NICKNAME, None)
>+                if alias == "" or alias is None:
>+                     alias = contact.display_name
>+                alias = unicode(alias, 'utf-8')
>+        return alias
>+
>     @async
>     def _contact_alias_changed(self, contact):
>         handle = ButterflyHandleFactory(self, 'contact',
>

Actions: View | Splinter Review

Attachments on bug 19250: 21431

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.