changeset 0a8585330cca in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=0a8585330cca
description: request ad-hoc commands to muc occupant real JID if room is not
anonymous. Fixes #2820
diffstat:
src/groupchat_control.py | 3 ++-
src/gui_menu_builder.py | 12 +++++++++---
2 files changed, 11 insertions(+), 4 deletions(-)
diffs (42 lines):
diff -r 6763cf2504e6 -r 0a8585330cca src/groupchat_control.py
--- a/src/groupchat_control.py Sun Apr 15 23:42:53 2012 +0200
+++ b/src/groupchat_control.py Mon Apr 16 23:03:30 2012 +0200
@@ -272,7 +272,8 @@
use_multiple_contacts=False, show_start_chat=False,
show_encryption=True, control=self,
show_buttonbar_items=not hide_buttonbar_items,
- gc_contact=self.gc_contact)
+ gc_contact=self.gc_contact,
+ is_anonymous=self.room_ctrl.is_anonymous)
return menu
class GroupchatControl(ChatControlBase):
diff -r 6763cf2504e6 -r 0a8585330cca src/gui_menu_builder.py
--- a/src/gui_menu_builder.py Sun Apr 15 23:42:53 2012 +0200
+++ b/src/gui_menu_builder.py Mon Apr 16 23:03:30 2012 +0200
@@ -153,7 +153,7 @@
def get_contact_menu(contact, account, use_multiple_contacts=True,
show_start_chat=True, show_encryption=False, show_buttonbar_items=True,
-control=None, gc_contact=None):
+control=None, gc_contact=None, is_anonymous=True):
"""
Build contact popup menu for roster and chat window. If control is not set,
we hide invite_contacts_menuitem
@@ -236,8 +236,14 @@
if contact.supports(NS_COMMANDS):
execute_command_menuitem.set_sensitive(True)
- execute_command_menuitem.connect('activate',
roster.on_execute_command,
- contact, account, contact.resource)
+ if gc_contact and gc_contact.jid and not is_anonymous:
+ execute_command_menuitem.connect('activate',
+ roster.on_execute_command, gc_contact, account,
+ gc_contact.resource)
+ else:
+ execute_command_menuitem.connect('activate',
+ roster.on_execute_command, contact, account,
+ contact.resource)
else:
execute_command_menuitem.set_sensitive(False)
_______________________________________________
Commits mailing list
[email protected]
http://lists.gajim.org/cgi-bin/listinfo/commits
