Merge lp:~max-rabkin/ibid/ibid-setup-725330 into lp:~ibid-core/ibid/old-trunk-1.6

[Max Rabkin]

Set source type for Jabber

[marcog (marco-gallotta)]

Haven't setup a jabber source, so I'll abstain for now.

review: Abstain

[Max Rabkin (max-rabkin)]

Marco: you can register a Jabber account at jabber.org -- the process is trivial. But, I have tested it. If you do test, make sure you use a source name other than "jabber" (since that would work without this).

[Stefano Rivera (stefanor)]

It's also worth testing with google talk every now and then. They have a different jabber implementation, which we've run into issues with, before

[Stefano Rivera (stefanor)]

review: Approve

[Jonathan Hitchcock (vhata)]

review: Approve

=== modified file 'scripts/ibid-setup'
--- scripts/ibid-setup	2010-09-26 15:38:02 +0000
+++ scripts/ibid-setup	2011-02-25 23:56:47 +0000
@@ -104,6 +104,7 @@
             source['channels'] = [c.strip() for c in channels.split(u',')]
         source['auth'] = ['hostmask', 'nickserv']
     elif type_ == u'jabber':
+        source['type'] = u'jabber'
         source['jid'] = prompt(u'JID (Jabber address): ')
         source['password'] = prompt(u'Password: ', secret=True)
         rooms = prompt(