don't show an empty line in groupchat banner if there is no subject. Fixes #1688
This commit is contained in:
parent
ea50611b8f
commit
2f3fe1b158
|
@ -541,8 +541,11 @@ class GroupchatControl(ChatControlBase):
|
||||||
self.name_label.set_ellipsize(pango.ELLIPSIZE_END)
|
self.name_label.set_ellipsize(pango.ELLIPSIZE_END)
|
||||||
subject = gtkgui_helpers.reduce_chars_newlines(subject, 0, 2)
|
subject = gtkgui_helpers.reduce_chars_newlines(subject, 0, 2)
|
||||||
subject = gtkgui_helpers.escape_for_pango_markup(subject)
|
subject = gtkgui_helpers.escape_for_pango_markup(subject)
|
||||||
self.name_label.set_markup(
|
text = '<span weight="heavy" size="x-large">%s</span>' % \
|
||||||
'<span weight="heavy" size="x-large">%s</span>\n%s' % (self.room_jid, subject))
|
self.room_jid
|
||||||
|
if subject:
|
||||||
|
text += '\n%s' % subject
|
||||||
|
self.name_label.set_markup(text)
|
||||||
event_box = self.name_label.get_parent()
|
event_box = self.name_label.get_parent()
|
||||||
if subject == '':
|
if subject == '':
|
||||||
self.subject = _('This room has no subject')
|
self.subject = _('This room has no subject')
|
||||||
|
|
Loading…
Reference in New Issue