Merge lp:~vhata/ibid/conflate-config into lp:~ibid-core/ibid/old-trunk-1.6

[Jonathan Hitchcock]

[Jonathan Hitchcock (vhata)]

There seems to be some angst about what to call the 'conflate' parameter now. Will check when I get back...

[Michael Gorven (mgorven)]

 review approve

review: Approve

[Stefano Rivera (stefanor)]

Fair enough

review: Approve

=== modified file 'ibid/plugins/core.py'
--- ibid/plugins/core.py	2009-12-30 22:18:47 +0000
+++ ibid/plugins/core.py	2010-01-02 12:28:15 +0000
@@ -186,10 +186,12 @@
                 for line in response['reply'].split('\n'):
                     r = {'reply': line}
                     for k in response.iterkeys():
-                        if k not in ('reply', 'conflate'):
+                        if k not in ('reply'):
                             r[k] = response[k]
                     filtered.append(r)
             else:
+                if 'multiline' not in supports:
+                    response['reply'] = response['reply'].expandtabs(1).replace('\n', conflate == True and u' ' or conflate or u'')
                 filtered.append(response)
 
         event.responses = filtered

=== modified file 'ibid/source/irc.py'
--- ibid/source/irc.py	2009-12-30 22:18:47 +0000
+++ ibid/source/irc.py	2010-01-02 12:28:15 +0000
@@ -167,7 +167,7 @@
             self.send(response)
 
     def send(self, response):
-        message = response['reply'].expandtabs(1).replace('\n', ' ')[:490]
+        message = response['reply']
         raw_message = message.encode('utf-8')
 
         # Target may be a connection or a plain nick

=== modified file 'ibid/source/silc.py'
--- ibid/source/silc.py	2009-12-30 22:18:47 +0000
+++ ibid/source/silc.py	2010-01-02 12:28:15 +0000
@@ -69,8 +69,7 @@
             self.send(response)
 
     def send(self, response):
-        message = response['reply'].expandtabs(1).replace('\n', ' ') \
-                  .encode('utf-8')
+        message = response['reply'].encode('utf-8')
         flags=0
         if response.get('action', False):
             flags=4