From d52f5ba40f4f894dfa43162c4e1785ec7345d780 Mon Sep 17 00:00:00 2001
From: mathieui <mathieui@mathieui.net>
Date: Wed, 18 Apr 2012 00:35:24 +0200
Subject: Do not quotify completions where it is not allowed

---
 src/core.py | 10 +++++-----
 src/tabs.py | 14 +++++++-------
 2 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'src')

diff --git a/src/core.py b/src/core.py
index 13eea3e1..627f7f5c 100644
--- a/src/core.py
+++ b/src/core.py
@@ -1393,7 +1393,7 @@ class Core(object):
 
     def completion_help(self, the_input):
         commands = list(self.commands.keys()) + list(self.current_tab().commands.keys())
-        return the_input.auto_completion(commands, ' ')
+        return the_input.auto_completion(commands, ' ', quotify=False)
 
     def command_status(self, arg):
         """
@@ -1615,7 +1615,7 @@ class Core(object):
         theme_files = [name[:-3] for name in names if name.endswith('.py')]
         if not 'default' in theme_files:
             theme_files.append('default')
-        return the_input.auto_completion(theme_files, '')
+        return the_input.auto_completion(theme_files, '', quotify=False)
 
     def command_win(self, arg):
         """
@@ -1651,7 +1651,7 @@ class Core(object):
     def completion_win(self, the_input):
         l = [JID(tab.get_name()).user for tab in self.tabs]
         l.remove('')
-        return the_input.auto_completion(l, ' ')
+        return the_input.auto_completion(l, ' ', quotify=False)
 
     def completion_join(self, the_input):
         """
@@ -1761,7 +1761,7 @@ class Core(object):
         n = len(the_input.get_text().split())
         if n > 2 or (n == 2 and the_input.get_text().endswith(' ')):
             return
-        return the_input.auto_completion([contact.bare_jid for contact in roster.get_contacts()], '')
+        return the_input.auto_completion([contact.bare_jid for contact in roster.get_contacts()], '', quotify=False)
 
     def completion_list(self, the_input):
         muc_serv_list = []
@@ -1770,7 +1770,7 @@ class Core(object):
                     tab.get_name() not in muc_serv_list:
                 muc_serv_list.append(JID(tab.get_name()).server)
         if muc_serv_list:
-            return the_input.auto_completion(muc_serv_list, ' ')
+            return the_input.auto_completion(muc_serv_list, ' ', quotify=False)
 
     def command_join(self, arg, histo_length=None):
         """
diff --git a/src/tabs.py b/src/tabs.py
index a87aed23..fce2bade 100644
--- a/src/tabs.py
+++ b/src/tabs.py
@@ -415,7 +415,7 @@ class ChatTab(Tab):
             for word in txt.split():
                 if len(word) >= 4 and word not in words:
                     words.append(word)
-        self.input.auto_completion(words, ' ')
+        self.input.auto_completion(words, ' ', quotify=False)
 
     def on_enter(self):
         txt = self.input.key_enter()
@@ -629,23 +629,23 @@ class MucTab(ChatTab):
                          if user.nick != self.own_nick]
         contact_list = [contact.bare_jid for contact in roster.get_contacts()]
         userlist.extend(contact_list)
-        return the_input.auto_completion(userlist, '')
+        return the_input.auto_completion(userlist, '', quotify=False)
 
     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())]
         while nicks.count(''):
             nicks.remove('')
-        return the_input.auto_completion(nicks, '')
+        return the_input.auto_completion(nicks, '', quotify=False)
 
     def completion_recolor(self, the_input):
-        return the_input.auto_completion(['random'], '')
+        return the_input.auto_completion(['random'], '', quotify=False)
 
     def completion_ignore(self, the_input):
         """Completion for /ignore"""
         userlist = [user.nick for user in self.users]
         userlist.remove(self.own_nick)
-        return the_input.auto_completion(userlist, '')
+        return the_input.auto_completion(userlist, '', quotify=False)
 
     def completion_role(self, the_input):
         """Completion for /role"""
@@ -1015,7 +1015,7 @@ class MucTab(ChatTab):
             self.core.information(_('%s is now unignored') % nick)
 
     def completion_unignore(self, the_input):
-        return the_input.auto_completion([user.nick for user in self.ignores], ' ')
+        return the_input.auto_completion([user.nick for user in self.ignores], ' ', quotify=False)
 
     def resize(self):
         """
@@ -2013,7 +2013,7 @@ class RosterInfoTab(Tab):
         """
         jids = [contact.bare_jid for contact in roster.get_contacts()\
              if contact.ask == 'asked']
-        return the_input.auto_completion(jids, '')
+        return the_input.auto_completion(jids, '', quotify=False)
 
     def command_accept(self, arg):
         """
-- 
cgit v1.2.3