From c47bf7e5ca5bbe9fd3d17978d0a0cf7024d36d48 Mon Sep 17 00:00:00 2001 From: Nikos Kouremenos Date: Thu, 21 Jul 2005 18:05:04 +0000 Subject: [PATCH] align better if no status message. JID was removed in favor of status message because a. JID is static and jargonish b. JID is visible now via tooltip and of course via vcard [where it can also be copy pasted] c. status message has more info about the real person and his current mood so it is logical to have that in banner and remove jargon of JID --- src/tabbed_chat_window.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/tabbed_chat_window.py b/src/tabbed_chat_window.py index 6271ae837..ca8bdf72c 100644 --- a/src/tabbed_chat_window.py +++ b/src/tabbed_chat_window.py @@ -119,9 +119,6 @@ class TabbedChatWindow(chat.Chat): jid = contact.jid status = contact.status - if status is None: - status = '' - #FIXME: uncomment me when we support sending messages to specific resource # composing full jid #fulljid = jid @@ -131,11 +128,14 @@ class TabbedChatWindow(chat.Chat): # % (name, fulljid) if chatstate: - label_text = '%s (chat state: %s)\n%s' \ - % (name, chatstate, status) + label_text = \ + '%s (chat state: %s)' \ + % (name, chatstate) else: - label_text = '%s\n%s' \ - % (name, status) + label_text = '%s' % name + + if status is not None: + label_text += '\n%s' % status # setup the label that holds name and jid banner_name_label = self.xmls[jid].get_widget('banner_name_label')