Commit 9922ce1d authored by Philipp Hörist's avatar Philipp Hörist

Groupchat: Remove traces of continued conversations

parent 44e6b0f0
......@@ -44,7 +44,7 @@ class Event:
printed_chat: [message, subject, control, msg_log_id]
printed_*: None
messages that are already printed in chat, but not read
gc-invitation: [room_jid, reason, password, is_continued, jid_from]
gc-invitation: [room_jid, reason, password, jid_from]
subscription_request: [text, nick]
unsubscribed: contact
jingle-incoming: (fulljid, sessionid, content_types)
......
......@@ -87,11 +87,10 @@ class GroupchatControl(ChatControlBase):
# will be processed with this command host.
COMMAND_HOST = GroupChatCommands
def __init__(self, parent_win, contact, muc_data, acct, is_continued=False):
def __init__(self, parent_win, contact, muc_data, acct):
ChatControlBase.__init__(self, self.TYPE_ID, parent_win,
'groupchat_control', contact, acct)
'groupchat_control', contact, acct)
self.force_non_minimizable = False
self.is_continued = is_continued
self.is_anonymous = True
# Keep error dialog instance to be sure to have only once at a time
......@@ -760,12 +759,7 @@ class GroupchatControl(ChatControlBase):
and not self.attention_flag:
color = 'tab-muc-msg'
if self.is_continued:
# if this is a continued conversation
label_str = self.get_continued_conversation_name()
else:
label_str = self.room_name
label_str = GLib.markup_escape_text(label_str)
label_str = GLib.markup_escape_text(self.room_name)
# count waiting highlighted messages
unread = ''
......@@ -829,23 +823,6 @@ class GroupchatControl(ChatControlBase):
self.xml.gc_banner_status_image.set_from_surface(surface)
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 app.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 houses the
......
......@@ -603,7 +603,6 @@ class InvitationReceivedDialog(Gtk.ApplicationWindow):
self.room_jid = str(event.muc)
self.from_ = str(event.from_)
self.password = event.password
self.is_continued = event.continued
if event.from_.bareMatch(event.muc):
contact_text = event.from_.getResource()
......@@ -615,15 +614,10 @@ class InvitationReceivedDialog(Gtk.ApplicationWindow):
else:
contact_text = contact.get_shown_name()
# is_continued when invited from 1:1 chat
if self.is_continued:
invitation_label = _('<b>%s</b> has invited you to join '
'a discussion') % contact_text
else:
invitation_label = _('<b>%(contact)s</b> has invited you to the '
'group chat <b>%(room_jid)s</b>') % \
{'contact': contact_text,
'room_jid': self.room_jid}
invitation_label = _('<b>%(contact)s</b> has invited you to the '
'group chat <b>%(room_jid)s</b>') % \
{'contact': contact_text,
'room_jid': self.room_jid}
self._ui.invitation_label.set_markup(invitation_label)
if event.reason:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment