Changeset 9651

Timestamp:

05/17/08 16:00:27 (3 months ago)

Author:

roidelapluie

Message:

One-to-one chat to MUC: set a beter tab name than the jid of the room. See #2095.

Files:

• trunk/src/groupchat_control.py (modified) (3 diffs)

trunk/src/groupchat_control.py

@@ -465 +465 @@
                         color = gtk.gdk.colormap_get_system().alloc_color(color_name)
 
-                label_str = self.name
+                if self.is_continued:
+                        # if this is a continued conversation
+                        label_str = self.get_continued_conversation_name()
+                else:
+                        label_str = self.name
 
                 # count waiting highlighted messages
@@ -522 +526 @@
                 banner_status_img.set_from_pixbuf(scaled_pix)
 
+        def get_continued_conversation_name(self):
+                '''Get the name of a continued conversation.
+                Will return Continued Conversation if there isn't any other
+                contact in the room
+                '''
+                nicks = []
+                for nick in gajim.contacts.get_nick_list(self.account,
+                self.room_jid):
+                        if nick != self.nick:
+                                nicks.append(nick)
+                if nicks != []:
+                        title = ', '
+                        title = _('Conversation with ') + title.join(nicks)
+                else:
+                        title = _('Continued conversation')
+                return title
+
         def draw_banner_text(self):
                 '''Draw the text in the fat line at the top of the window that 
@@ -530 +551 @@
                 font_attrs, font_attrs_small = self.get_font_attrs()
                 if self.is_continued:
-                        nicks = []
-                        for nick in gajim.contacts.get_nick_list(self.account, self.room_jid):
-                                if nick != self.nick:
-                                        nicks.append(nick)
-                        if nicks != []:
-                                title = ', '
-                                title = 'Conversation with ' + title.join(nicks)
-                        else:
-                                title = 'Continued conversation'
-                        text = '<span %s>%s</span>' % (font_attrs, title)
-                else:
-                        text = '<span %s>%s</span>' % (font_attrs, self.room_jid)
+                        name = self.get_continued_conversation_name()
+                else:
+                        name = self.room_jid
+                text = '<span %s>%s</span>' % (font_attrs, name)
                 self.name_label.set_markup(text)