Philipp Hörist pushed to branch mainwindow at gajim / gajim
Commits:
-
8c9a34b8
by lovetox at 2021-03-13T13:34:33+01:00
2 changed files:
Changes:
| ... | ... | @@ -308,10 +308,8 @@ def _on_roster_button_press_event(self, treeview, event): |
| 308 | 308 |
self.emit('row-activated', nick)
|
| 309 | 309 |
|
| 310 | 310 |
def _show_contact_menu(self, nick):
|
| 311 |
- self_contact = app.contacts.get_gc_contact(
|
|
| 312 |
- self._account, self.room_jid, self._control.nick)
|
|
| 313 |
- contact = app.contacts.get_gc_contact(
|
|
| 314 |
- self._account, self.room_jid, nick)
|
|
| 311 |
+ self_contact = self._group_chat_contact.get_resource(self._control.nick)
|
|
| 312 |
+ contact = self._group_chat_contact.get_resource(nick)
|
|
| 315 | 313 |
menu = get_groupchat_roster_menu(self._account,
|
| 316 | 314 |
self._control_id,
|
| 317 | 315 |
self_contact,
|
| ... | ... | @@ -883,15 +883,6 @@ def get_groupchat_roster_menu(account, control_id, self_contact, contact): |
| 883 | 883 |
item.set_detailed_action_name(action)
|
| 884 | 884 |
menu.append(item)
|
| 885 | 885 |
|
| 886 |
- item = Gtk.MenuItem(label=_('Invite'))
|
|
| 887 |
- if contact.jid is not None:
|
|
| 888 |
- build_invite_submenu(item,
|
|
| 889 |
- ((contact, account),),
|
|
| 890 |
- show_bookmarked=True)
|
|
| 891 |
- else:
|
|
| 892 |
- item.set_sensitive(False)
|
|
| 893 |
- menu.append(item)
|
|
| 894 |
- |
|
| 895 | 886 |
item = Gtk.MenuItem(label=_('Execute Command…'))
|
| 896 | 887 |
action = 'win.execute-command-%s::%s' % (control_id, contact.name)
|
| 897 | 888 |
item.set_detailed_action_name(action)
|