summaryrefslogtreecommitdiff
path: root/src/core.py
diff options
context:
space:
mode:
authorFlorent Le Coz <louiz@louiz.org>2011-09-29 00:25:01 +0200
committerFlorent Le Coz <louiz@louiz.org>2011-09-29 00:25:01 +0200
commitdeea31d9b7bf265aba4af6e66b21530ae43c3a0a (patch)
treeebb11e10f91e73411eaabc9bf034f951df0d5a9c /src/core.py
parent5dea3dcf800d2588732d0d217429e1d7402208fc (diff)
parent25b11e128d31676486f9037f997f0f035ca85dff (diff)
downloadpoezio-deea31d9b7bf265aba4af6e66b21530ae43c3a0a.tar.gz
poezio-deea31d9b7bf265aba4af6e66b21530ae43c3a0a.tar.bz2
poezio-deea31d9b7bf265aba4af6e66b21530ae43c3a0a.tar.xz
poezio-deea31d9b7bf265aba4af6e66b21530ae43c3a0a.zip
merge missing changeset from default into plugin, so both branches are up to date
Diffstat (limited to 'src/core.py')
-rw-r--r--src/core.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/core.py b/src/core.py
index 1a4d1f2d..0e09cf04 100644
--- a/src/core.py
+++ b/src/core.py
@@ -128,7 +128,6 @@ class Core(object):
'connect': (self.command_reconnect, _('Usage: /connect\nConnect: disconnect from the remote server if you are currently connected and then connect to it again'), None),
'server_cycle': (self.command_server_cycle, _('Usage: /server_cycle [domain] [message]\nServer Cycle: disconnect and reconnects in all the rooms in domain.'), None),
'bind': (self.command_bind, _('Usage: /bind <key> <equ>\nBind: bind a key to an other key or to a “command”. For example "/bind ^H KEY_UP" makes Control + h do the same same than the Up key.'), None),
- 'pubsub': (self.command_pubsub, _('Usage: /pubsub <domain>\nPubsub: Open a pubsub browser on the given domain'), None),
'load': (self.command_load, _('Usage: /load <plugin>\nLoad: Load the specified plugin'), self.plugin_manager.completion_load),
'unload': (self.command_unload, _('Usage: /unload <plugin>\nUnload: Unload the specified plugin'), self.plugin_manager.completion_unload),
}
@@ -1308,7 +1307,7 @@ class Core(object):
t = self.current_tab()
if not isinstance(t, tabs.MucTab) and not isinstance(t, tabs.PrivateTab):
return
- room = t.get_name()
+ room = JID(t.get_name()).bare
nick = t.get_room().own_nick
else:
info = JID(args[0])