[telepathy-butterfly/master] Returns the pending alias when calling GetAliases on a new contact

Louis-Francis Ratté-Boulianne louis-francis.ratte-boulianne at collabora.co.uk
Fri Jul 24 13:21:55 PDT 2009


---
 butterfly/aliasing.py |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/butterfly/aliasing.py b/butterfly/aliasing.py
index c46fb9b..bc636a8 100644
--- a/butterfly/aliasing.py
+++ b/butterfly/aliasing.py
@@ -118,7 +118,9 @@ class ButterflyAliasing(
             alias = unicode(display_name, 'utf-8')
         else:
             contact = handle.contact
-            if contact is None:
+            if handle.pending_alias is not None:
+                alias = handle.pending_alias
+            elif contact is None:
                 alias = unicode(handle.account, 'utf-8')
             else:
                 alias = contact.infos.get(ContactGeneral.ANNOTATIONS, {}).\
-- 
1.5.6.5




More information about the telepathy-commits mailing list