From 38830c96866387f20350a301fed6e2999bda9556 Mon Sep 17 00:00:00 2001 From: Jean-Marie Traissard Date: Thu, 5 Oct 2006 13:10:33 +0000 Subject: [PATCH] Show "This room has no subject" only in textview, not sometimes in banner and sometimes not, nor in actions->change topic --- src/groupchat_control.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/groupchat_control.py b/src/groupchat_control.py index 85e3f93c0..dc374e13e 100644 --- a/src/groupchat_control.py +++ b/src/groupchat_control.py @@ -674,8 +674,6 @@ class GroupchatControl(ChatControlBase): text += '\n%s' % (font_attrs_small, subject) self.name_label.set_markup(text) event_box = self.name_label.get_parent() - if subject == '': - self.subject = _('This room has no subject') # tooltip must always hold ALL the subject self.subject_tooltip.set_tip(event_box, self.subject) @@ -1040,8 +1038,10 @@ class GroupchatControl(ChatControlBase): new_topic = message_array.pop(0) gajim.connections[self.account].send_gc_subject(self.room_jid, new_topic) - else: + elif self.subject is not '': self.print_conversation(self.subject, 'info') + else: + self.print_conversation(_('This room has no subject'), 'info') self.clear(self.msg_textview) return True elif command == 'invite':