summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorFlorent Le Coz <louiz@louiz.org>2011-08-01 00:45:50 +0200
committerFlorent Le Coz <louiz@louiz.org>2011-08-01 00:45:50 +0200
commit8da125bbc51480fcfa664bd409924192479c5912 (patch)
treed229531f7636a9f54950ce79cca4bfa668dac4e5 /src
parenta93069e3a0d91e0065b056eb8383d7b91edee0ff (diff)
parent04f67c1b4e08930ebb230d5f197714031a16ddc1 (diff)
downloadpoezio-8da125bbc51480fcfa664bd409924192479c5912.tar.gz
poezio-8da125bbc51480fcfa664bd409924192479c5912.tar.bz2
poezio-8da125bbc51480fcfa664bd409924192479c5912.tar.xz
poezio-8da125bbc51480fcfa664bd409924192479c5912.zip
Merge
Diffstat (limited to 'src')
-rw-r--r--src/tabs.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/tabs.py b/src/tabs.py
index ea4bd082..92cdc094 100644
--- a/src/tabs.py
+++ b/src/tabs.py
@@ -981,6 +981,7 @@ class PrivateTab(ChatTab):
# keys
self.key_func['^I'] = self.completion
# commands
+ #self.commands['info'] = (self.command_info, _('Usage: /info\nInfo: Display some information about the user in the MUC: '), None)
self.commands['unquery'] = (self.command_unquery, _("Usage: /unquery\nUnquery: close the tab"), None)
self.commands['part'] = (self.command_unquery, _("Usage: /part\Part: close the tab"), None)
self.resize()
@@ -1137,8 +1138,8 @@ class RosterInfoTab(Tab):
self.key_func["S"] = self.start_search_slow
self.commands['deny'] = (self.command_deny, _("Usage: /deny [jid]\nDeny: Use this command to remove and deny your presence to the provided JID (or the selected contact in your roster), who is asking you to be in his/here roster"), self.completion_deny)
self.commands['accept'] = (self.command_accept, _("Usage: /accept [jid]\nAccept: Use this command to authorize the provided JID (or the selected contact in your roster), to see your presence, and to ask to subscribe to it (mutual presence subscription)."), self.completion_deny)
- self.commands['add'] = (self.command_add, _("Usage: /add <jid>\Add: Use this command to add the specified JID to your roster. The reverse authorization will automatically be accepted if the remote JID accepts your subscription, leading to a mutual presence subscription."), None)
- self.commands['remove'] = (self.command_remove, _("Usage: /remove [jid]\Remove: Use this command to remove the specified JID from your roster. This wil unsubscribe you from its presence, cancel its subscription to yours, and remove the item from your roster"), self.completion_remove)
+ self.commands['add'] = (self.command_add, _("Usage: /add <jid>\nAdd: Use this command to add the specified JID to your roster. The reverse authorization will automatically be accepted if the remote JID accepts your subscription, leading to a mutual presence subscription."), None)
+ self.commands['remove'] = (self.command_remove, _("Usage: /remove [jid]\nRemove: Use this command to remove the specified JID from your roster. This wil unsubscribe you from its presence, cancel its subscription to yours, and remove the item from your roster"), self.completion_remove)
self.commands['export'] = (self.command_export, _("Usage: /export [/path/to/file]\nExport: Use this command to export your contacts into /path/to/file if specified, or $HOME/poezio_contacts if not."), None)
self.commands['import'] = (self.command_import, _("Usage: /import [/path/to/file]\nImport: Use this command to import your contacts from /path/to/file if specified, or $HOME/poezio_contacts if not."), None)
self.resize()