Rename /connect to /reconnect and make it rostertab-only

2 files changed, 7 insertions, 8 deletions

diff --git a/src/core.py b/src/core.py
index 7b152549..87a1ca8b 100644
--- a/src/core.py
+++ b/src/core.py
@@ -169,7 +169,6 @@ class Core(object):
             'list': (self.command_list, _('Usage: /list\nList: Get the list of public chatrooms on the specified server.'), self.completion_list),
             'message': (self.command_message, _('Usage: /message <jid> [optional message]\nMessage: Open a conversation with the specified JID (even if it is not in our roster), and send a message to it, if the message is specified.'), self.completion_version),
             'version': (self.command_version, _('Usage: /version <jid>\nVersion: Get the software version of the given JID (usually its XMPP client and Operating System).'), self.completion_version),
-            '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 reconnect in all the rooms in domain.'), self.completion_server_cycle),
             '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 as the Up key.'), None),
             'load': (self.command_load, _('Usage: /load <plugin>\nLoad: Load the specified plugin'), self.plugin_manager.completion_load),
@@ -226,7 +225,6 @@ class Core(object):
             '_close_tab': self.close_tab,
             '_disconnect': self.disconnect,
             '_quit': self.command_quit,
-            '_reconnect': self.command_reconnect,
             '_redraw_screen': self.full_screen_redraw,
             '_reload_theme': self.command_theme,
             '_remove_bookmark': self.command_remove_bookmark,
@@ -2256,12 +2254,6 @@ class Core(object):
         if len(args) > 1:
             tab.command_say(args[1])
 
-    def command_reconnect(self, args=None):
-        """
-        /reconnect
-        """
-        self.disconnect(reconnect=True)
-
     def command_xml_tab(self, arg=''):
         """/xml_tab"""
         self.xml_tab = True
diff --git a/src/tabs.py b/src/tabs.py
index aacbb4c9..1c58f0c9 100644
--- a/src/tabs.py
+++ b/src/tabs.py
@@ -1907,6 +1907,7 @@ class RosterInfoTab(Tab):
         self.commands['groupmove'] = (self.command_groupmove, _("Usage: /groupchange <jid> <old group> <new group>\nMoves the given JID from the old group to the new group."), self.completion_groupmove)
         self.commands['groupremove'] = (self.command_groupremove, _("Usage: /groupremove <jid> <group>\nRemove the given JID from the given group."), self.completion_groupremove)
         self.commands['remove'] = (self.command_remove, _("Usage: /remove [jid]\nRemove: 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['reconnect'] = (self.command_reconnect, _('Usage: /reconnect\nConnect: Disconnect from the remote server if you are currently connected and then connect to it again.'), None)
         self.commands['export'] = (self.command_export, _("Usage: /export [/path/to/file]\nExport: Export your contacts into /path/to/file if specified, or $HOME/poezio_contacts if not."), self.completion_file)
         self.commands['import'] = (self.command_import, _("Usage: /import [/path/to/file]\nImport: Import your contacts from /path/to/file if specified, or $HOME/poezio_contacts if not."), self.completion_file)
         self.commands['clear_infos'] = (self.command_clear_infos, _("Usage: /clear_infos\nClear Infos: Use this command to clear the info buffer."), None)
@@ -2022,6 +2023,12 @@ class RosterInfoTab(Tab):
 
         self.core.xmpp.plugin['xep_0191'].get_blocked(block=False, callback=callback)
 
+    def command_reconnect(self, args=None):
+        """
+        /reconnect
+        """
+        self.core.disconnect(reconnect=True)
+
     def command_activity(self, arg=None):
         """
         /activity [jid]