summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorFlorent Le Coz <louiz@louiz.org>2011-11-14 20:52:12 +0100
committerFlorent Le Coz <louiz@louiz.org>2011-11-14 20:52:12 +0100
commit4e201be745521ace9701623d684dde316cb43af4 (patch)
tree555991eb637ef82e810960bc5956c010341650f2 /src
parentf0f9f670b9084761023ba9c594b97a0ad37581ed (diff)
parent07d7189ab6eb7795ddfa4864ed2d00c34c64486c (diff)
downloadpoezio-4e201be745521ace9701623d684dde316cb43af4.tar.gz
poezio-4e201be745521ace9701623d684dde316cb43af4.tar.bz2
poezio-4e201be745521ace9701623d684dde316cb43af4.tar.xz
poezio-4e201be745521ace9701623d684dde316cb43af4.zip
Merge branch 'master' of http://git.louiz.org/poezio
Diffstat (limited to 'src')
-rw-r--r--src/plugin.py5
-rw-r--r--src/tabs.py16
2 files changed, 17 insertions, 4 deletions
diff --git a/src/plugin.py b/src/plugin.py
index 137f704f..7d1aeb4b 100644
--- a/src/plugin.py
+++ b/src/plugin.py
@@ -16,6 +16,11 @@ class PluginConfig(config.Config):
section = self.module_name
return config.Config.get(self, option, default, section)
+ def set(self, option, default, section=None):
+ if not section:
+ section = self.module_name
+ return config.Config.set(self, option, default, section)
+
def read(self):
"""Read the config file"""
RawConfigParser.read(self, self.file_name)
diff --git a/src/tabs.py b/src/tabs.py
index fd9755f6..430ee7f8 100644
--- a/src/tabs.py
+++ b/src/tabs.py
@@ -152,10 +152,10 @@ class Tab(object):
if len(txt.split()) > 1 or\
(txt.endswith(' ') and not the_input.last_completion):
command_name = txt.split()[0][1:]
- if command_name in self.core.commands:
- command = self.core.commands[command_name]
- elif command_name in self.commands:
+ if command_name in self.commands:
command = self.commands[command_name]
+ elif command_name in self.core.commands:
+ command = self.core.commands[command_name]
else: # Unknown command, cannot complete
return False
if command[2] is None:
@@ -494,12 +494,20 @@ class MucTab(ChatTab):
self.commands['cycle'] = (self.command_cycle, _('Usage: /cycle [message]\nCycle: Leave the current room and rejoin it immediately.'), None)
self.commands['info'] = (self.command_info, _('Usage: /info <nickname>\nInfo: Display some information about the user in the MUC: its/his/her role, affiliation, status and status message.'), self.completion_ignore)
self.commands['configure'] = (self.command_configure, _('Usage: /configure\nConfigure: Configure the current room, through a form.'), None)
- self.commands['version'] = (self.command_version, _('Usage: /version <jid or nick>\nVersion: Get the software version of the given JID or nick in room (usually its XMPP client and Operating System).'), None)
+ self.commands['version'] = (self.command_version, _('Usage: /version <jid or nick>\nVersion: Get the software version of the given JID or nick in room (usually its XMPP client and Operating System).'), self.completion_version)
self.commands['names'] = (self.command_names, _('Usage: /names\nNames: Get the list of the users in the room, and the list of the people assuming the different roles.'), None)
self.resize()
self.update_commands()
self.update_keys()
+ def completion_version(self, the_input):
+ """Completion for /version"""
+ userlist = [user.nick for user in self.users]
+ userlist.remove(self.own_nick)
+ contact_list = [contact.bare_jid for contact in roster.get_contacts()]
+ userlist.extend(contact_list)
+ return the_input.auto_completion(userlist, '')
+
def completion_nick(self, the_input):
"""Completion for /nick"""
nicks = [os.environ.get('USER'), config.get('default_nick', ''), self.core.get_bookmark_nickname(self.get_name())]