Do not duplicate accounts with pep support in Edit->Profile menu.
Fix some strange encoding error.
This commit is contained in:
parent
2acc696716
commit
ea5db436e1
|
@ -2240,7 +2240,7 @@ class GroupchatControl(ChatControlBase):
|
||||||
gajim.interface.instances[self.account]['infos'][c2.jid].window.\
|
gajim.interface.instances[self.account]['infos'][c2.jid].window.\
|
||||||
present()
|
present()
|
||||||
else:
|
else:
|
||||||
gajim.interface.instances[self.account]['infos'][c2.jid] = \
|
gajim.interface.instances[self.account]['infos'][c2.jid] = \
|
||||||
vcard.VcardWindow(c2, self.account, c)
|
vcard.VcardWindow(c2, self.account, c)
|
||||||
|
|
||||||
def on_history(self, widget, nick):
|
def on_history(self, widget, nick):
|
||||||
|
|
|
@ -1145,12 +1145,6 @@ class RosterWindow:
|
||||||
pep_services_sub_menu = gtk.Menu()
|
pep_services_sub_menu = gtk.Menu()
|
||||||
for account in connected_accounts_with_vcard:
|
for account in connected_accounts_with_vcard:
|
||||||
if gajim.connections[account].pep_supported:
|
if gajim.connections[account].pep_supported:
|
||||||
# profile, avatar
|
|
||||||
profile_avatar_item = gtk.MenuItem(_('of account %s') % account,
|
|
||||||
False)
|
|
||||||
profile_avatar_sub_menu.append(profile_avatar_item)
|
|
||||||
profile_avatar_item.connect('activate',
|
|
||||||
self.on_profile_avatar_menuitem_activate, account)
|
|
||||||
# PEP services
|
# PEP services
|
||||||
pep_services_item = gtk.MenuItem(_('of account %s') % account,
|
pep_services_item = gtk.MenuItem(_('of account %s') % account,
|
||||||
False)
|
False)
|
||||||
|
|
Loading…
Reference in New Issue