Merge lp:~stefanor/ibid/expose-irc-username into lp:ibid

Proposed by Stefano Rivera
Status: Merged
Approved by: Stefano Rivera
Approved revision: 1057
Merged at revision: 1059
Proposed branch: lp:~stefanor/ibid/expose-irc-username
Merge into: lp:ibid
Diff against target: 20 lines (+3/-0)
1 file modified
ibid/source/irc.py (+3/-0)
To merge this branch: bzr merge lp:~stefanor/ibid/expose-irc-username
Reviewer Review Type Date Requested Status
Jonathan Hitchcock Approve
Review via email: mp+142909@code.launchpad.net

Commit message

Allow users to configure the IRC local username

To post a comment you must log in.
Revision history for this message
Alexander Huemer (alexander-huemer) wrote :

This patch was created because of a request I made on IRC.
I tested the patch, it does what it should.
During my short test no regressions showed up.
I have no objections against merging that patch to mainline.

Revision history for this message
Jonathan Hitchcock (vhata) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'ibid/source/irc.py'
--- ibid/source/irc.py 2012-12-05 21:05:42 +0000
+++ ibid/source/irc.py 2013-01-11 14:55:41 +0000
@@ -30,6 +30,8 @@
30 self.realname = self.factory.realname.encode('utf-8')30 self.realname = self.factory.realname.encode('utf-8')
31 if self.factory.password is not None:31 if self.factory.password is not None:
32 self.password = self.factory.password.encode('utf-8')32 self.password = self.factory.password.encode('utf-8')
33 if self.factory.username is not None:
34 self.username = self.factory.username.encode('utf-8')
3335
34 irc.IRCClient.connectionMade(self)36 irc.IRCClient.connectionMade(self)
3537
@@ -316,6 +318,7 @@
316 nick = Option('nick', 'IRC nick', ibid.config['botname'])318 nick = Option('nick', 'IRC nick', ibid.config['botname'])
317 realname = Option('realname', 'Full Name', ibid.config['botname'])319 realname = Option('realname', 'Full Name', ibid.config['botname'])
318 password = Option('password', 'Connection password', None)320 password = Option('password', 'Connection password', None)
321 username = Option('username', 'Local username', None)
319 modes = Option('modes', 'User modes to set')322 modes = Option('modes', 'User modes to set')
320 channels = ListOption('channels', 'Channels to autojoin', [])323 channels = ListOption('channels', 'Channels to autojoin', [])
321 ping_interval = FloatOption('ping_interval', 'Seconds idle before sending a PING', 60)324 ping_interval = FloatOption('ping_interval', 'Seconds idle before sending a PING', 60)

Subscribers

People subscribed via source and target branches

to all changes: