From f6a2ba4c1daa519aa8042e16aaa7ae32870da027 Mon Sep 17 00:00:00 2001
From: Stephen Dranger <dranger@gmail.com>
Date: Mon, 14 Feb 2011 11:39:26 -0600
Subject: [PATCH] fds

---
 dataobjs.pyc      | Bin 14106 -> 14331 bytes
 irc.py            |   2 +-
 irc.pyc           | Bin 13728 -> 13758 bytes
 oyoyo/client.py   |  10 +++++++++-
 oyoyo/client.pyc  | Bin 9728 -> 10033 bytes
 oyoyo/helpers.py  |   2 +-
 oyoyo/helpers.pyc | Bin 5013 -> 5020 bytes
 pesterchum.py     |   3 +++
 8 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/dataobjs.pyc b/dataobjs.pyc
index c548bdb9b1c0874f5fa41abbd8f32b5db0fb948d..847eb5778fffa7a363198c5af1ce721b6858945f 100644
GIT binary patch
delta 479
zcmX|)O-Phc6o$`x9cRX$PidM4zF|l!(g~gXNo!FyDIv7U;VUeI7S$wuQBFFuFz{b0
zF>2wFkZ~orXcHlasD+Sg6Ujgc!H6Jm)52LuFcjT8ix%(0dG0+w*}i<rw~@0-JJGY`
zyKjva5s^pdpicUtMux}*O@UlRNsv7W8U{Th>IEegJtZ1elqn+DLqm#&K$FTeOzE-W
zf`YC@&DP7AQq6%|eaY0r2W~oZ2U<<cXW?9gh{NTvYUiwean2dEX+%wvbN+u7=l;l<
z0~fSk(n%`~Le$I4mK|=_wbNl>b`<V9aig95yF9^l6;_#FD<OnR6_9wvRlqB=mE#IG
zI24#eOx_0W0xlm4uHcbu1v@+#VB7wMSL_Q9;+~9!>lNnZP2>}>$d3=dhVap<ZM@?@
zRX^~7zgI6|S!RypfsgX?*a)yH*757W8u!-hVqLmwy})Pbj?M#LBzNK_@Kq9ZDPV_J
z>KE`+ZpRY9F3ZUcWaUXi7m$<9MnAC6-<tOEmp7Z=!^1C5J%^9&mJyWjT+1HHc)E20
Pdt#mTqqsfP9J=-o96xz5

delta 389
zcmW-ZPbkB27{<TPHrrY;`Li0y3>o>iVGfEy+|Vde4vWeB*{^Jh4B?`b)T@ZoZjN}f
zr4&xmT9RBGB&A$TC~CX-{v4i9@8_-ONh|vS!`)Y=DX}<oY?#bk(Fh^5GPyFrQi+fd
zeuxc8jTnQlu0t$Agr#dm7(!~lLoM}$Op>$Sz?d>K?GJ_=I;oycbwMvNI-&SSeIA$k
zY?1iyc-mC$QWfe|Cdg@b({s6w4CX9@x*%X-n|T1x@?7?+27~mQvxh3)&h-J~^pkgq
z8II+*>!47|`VOMEf_eDZTUf2Z9&Z)Jfd~y3AL59#wnv=MlkEkkbX9VUGY;C*z&R^r
z%fK}!%ZGp)>aKW0oa-HWAi>R*2f!`gSB(G<?5tLRM~c)$@WLIneZVX2)ZJm1$Lo86
v4~{yGz&BmEevqbULkyrm<0f>JYFvh%7Mea`q$&3rlALrKk<n^#SqA?A-34-g

diff --git a/irc.py b/irc.py
index 7a540a8..2d6d6a7 100644
--- a/irc.py
+++ b/irc.py
@@ -19,7 +19,7 @@ class PesterIRC(QtCore.QObject):
     def IRCConnect(self):
         server = self.config.server()
         port = self.config.port()
-        self.cli = IRCClient(PesterHandler, host=server, port=int(port), nick=self.mainwindow.profile().handle, blocking=True)
+        self.cli = IRCClient(PesterHandler, host=server, port=int(port), nick=self.mainwindow.profile().handle, real_name='pcc30', blocking=True)
         self.cli.command_handler.parent = self
         self.cli.command_handler.mainwindow = self.mainwindow
         self.conn = self.cli.connect()
diff --git a/irc.pyc b/irc.pyc
index 53fdab18f9a9e179982d6be0b4a478708916551c..eacd58a242c33ce406045b741ca58afaac15f131 100644
GIT binary patch
delta 2433
zcmbVOTTEP46rEE$Gr;gFwG0f80-a%I8r}oa%BvJBMOu+dYD;Q0^SHq6JTA<=R52P<
zv}zM;?T%Cfm^RUB)31i0e;Pl0#YEGje|{K0`&$$J@W-?EZDvM5WBPGd&e>=0wI65i
zGjlcmW!!oDUQxjp)04NHn!TXVX0r{+&sd|ci+9sI_MXC+-4=7$%zWFDu+vZWVd125
zN1Z!gYNge1;<;2fshW1Vn~g?8ZPews?I@Q!Wf$$O=%yiOjToS?^ASfCgblRjTy<1q
zSwjPPCxwr$<PCc)0i-?&fgM;C0~$fH-kR^+AzG>1HBbdj(;>moqjA+_$7(vQrxh=~
z=W+`V-EeuO?k#6C{pGrMstqhV0qp>Ggd~+p31*&zsGiW%(PT{NfH(y3N(itK2jP)h
znZM1Zr8H9un`%ty;^bZ`x)IvW!6v4Mz?osXZ~JcXbuVI2z-~oYh80JcLqL-yUYQkY
zxl!^%DVyZvLl;Zko*Z>akyE~Y`l_^B^wFQCKOW<RQMss|I;R^ZNaE^(vAH@25yd9P
zYzF-}MfN>3Qg;0Tv+toZyFY$F+ir?Ke94=sIyV4X(AZkJy?gGKZYk%QbC4#>sXNPn
zLY&pL)D{9M4`eexip)ni^Jm=`HrdaH)8_xRzcctx-*GJ(-_{mGmD4v?0FYVT7q9$o
z987$ZPwFX^Z<2ROJ*I9;>C8|v+X<LM7S)r<a4IJATk?D&>L^(CwzdztUVwlaW@UC^
z&YVc-rh-1=Syh<P4+X5oC(N{#npO@#fWk&}J)!i-h0+Tc0Q3PK0~`T7PIc84E(Oa;
z!0Gk=>WC2T^=mcxJ4KLg*83ML<bhcr;puQ<UOmDCUkl|34&X>lYNnEzY-_3xL1PdA
z4SoUm?T98cHDxN(5Kc+pCNgFdl0oilN)!+Ss1gE&HX3gzcku(l(|Tw<-SECx<N)GO
zn+LFu<5-;o{A(=Wv0k2;`Q$OpFqKB=`y>Ron*3Do8(M|~_Pc=9ivTDG<Yyy)MJsK1
zziDB29L!lLAeaDOP?qQv4lFkM%y;Kt68i}WT)Vk>&E)ITr=}8GO0}%#pu@BYtT@LA
zZ8Ywa&k>%L^R&w!cI7D0%l=9S_mziM{rzH`e(|r0B)t%*IsB%i_zzk*utNo4^*l$*
zY;Qqk`5dE?;If0GKTbD;-q5x|X4v>jxC&V|CUWDR{*a%MC&4DlMWrYb$^<>N|8OuT
zC3%(;(gnFyI3x_t{g6)3@B6=>LP%C`$xDqz6y$3l8K3c}&)`yX{be&rOOBeah_@FZ
zW3OmutI}KuF8nKySuH~KO&;<3dT&#q5CIx#?yG+uhiQNT2uk3aoCzCY(@ZOu>C<N4
zo@_H^Qy8Y-n!i188CKkN?0*JZZlLWtkyGb(T&7=JJ{P03+!}H*InRZ`KU1!@OO7@0
zjMBBX%F>);2#<2_tk913nU+xq*sqrHn{9xsA-ntl<m*4T_lqak8B)#8wKa1cknvAA
zvwGz==lW2?%-~HY<|FdCI~f|1|3Owl9plfy_6%SV@G9U9z<IzpU<`oHQTYD3r><c8
oA>bpx3g9ZhN41^3!cC_;mt1^7uR+>DcRR<Vw6?Q{%&w-t0cV7l>i_@%

delta 2370
zcmbVO-A^1<6rWpR7FeLtc3D0fJ{ESduz(B2mXC&3LE2JeP+O}eEV~O#_hVpZkXEA@
zX;l&*NRDlTC8j3Y#0O){Y7;fFPqY$WH1r?v(FY&Y#KZ@q_jjf;3q@o4Fu$C0?)kpw
z+}&^D*W<1qel05Kf9uR=E<LxPKv9%q@-wf}%ekjiD_>a@IdnI7P~=jTT0>8(->duN
zxmH5`-YyEes>LB%a2-_3A*`XVU8`yZ$Vz%K@3g3=FY*Q}YyqV85(2wG6$5;5k{Ql-
z?Gi2YjQdC>G%ZzvX++{N%gU8xES)yeS{;4r_KGsP<Mv5i;cuq0!r#sW;Ux#q3gAG6
zpu7^SJP8paVWcC;sMZE?JD^TNfQ>kbGRew16-7_!mL9fZQ7y#9y;t;cXr}<%JUs-T
zo1X63eo}nHha5C`w=>)WiZje|K=ZqOvMTg)WA}PLn{2Je0-H39C^zG!aAGdDy%wjT
zJ=EXPCA!H|@}2O~k0sSXr!QTIpA}lN0Vnq!oTBb-n%Z;Y0qgFjSN4ARfVN$<v~StB
z*>A2k6;8&?`+L^w`N^HtNV@47p!rhja*WZlbB3O}&vt9k11Ne>7QMF3b|##*{;zE}
zoiAJI-x@ovN8&r$W1zE!#ZCY+d*qhN?}#9cR#bLo)rVuAS=Xj9+l@)qf-GVrli^fU
zR`Nl`M`Aw>RxT~n{$r&Hs9_amF3ehE3B%H`V7!VNdu)ILsL?Sit*556gAkyF6NZt{
z4oN~g4Cn=P1C9dlPH2w<o&+2RoCKUwlp;lY3gl_PbD0;aCWP>0ZdK>!2tTdY`b8=I
zQoA=+h2wDv94?mBEp2ms?bYdn#t{G#;x*?7B9hQ!DNBn%7?r^DV$LL_2gxZ~7%%~d
zkX~2i<~`tL?8_|IT^0)*T8DxOVDBeDS%81d0)Fg=WqK}oQa3Hl2Yr6nocrM?k{6!i
z&O_xq0LlURDKzA5r48R&ki&5@(@;P%0luJOu<YnrP_{R^-EdcpgCC{qjr%<YNVYx)
zic1-%jmCOBD)K3~NUi>`J4=DC`O8%vpECN&-zP@s5C7^oJn|JJVw0BXmR$Wz%(P<Z
zh^$h(BzZfh9m63o<~jhdhnth-C~rb$=Q2z!O;_yXPtbakFZAEu_(r%1jyHDX#Wnpd
zKNC}}h*D85iiB)P>XD;OS*6Oetd!oCti~x}Z|<cuMkNQno#g6ODMhu>39i>fF%9P7
z22&e_K5_`~RB+bNwuj^$P#kp}6yE?hf-mGX$m|KBBh3}!jm+8RLLnMys-?Gf4u>;<
zS%6;x@8NXV3|m%OTc)*^29GmKP6<!YUoE#ETZR=69mk&p%k#6-Aad!gP<faB4Biw&
z^m%K@&CYo(X8A{`scl)k2Bjgo)mHv+)-i+wJX0%F(>@&>f`H>rf#SH%062ym@(P@1
zes1p*$2k~Ebr#xQIp?Q|z4D9aI7AOO_iidNHz8lUxzI8B597<wqoZfx?|HzhfCa!J
z;38lIFbu%tXng-XQ<uSB1*`&A0Ph3psi&hyc<4gMqMI-1bx7OD)j6ViBpFb+Thw{r
EZ++W}ZvX%Q

diff --git a/oyoyo/client.py b/oyoyo/client.py
index 0cb2b4e..c45c39c 100644
--- a/oyoyo/client.py
+++ b/oyoyo/client.py
@@ -88,6 +88,7 @@ class IRCClient:
         self.port = None
         self.connect_cb = None
         self.blocking = False
+        self.timeout = None
 
         self.__dict__.update(kwargs)
         self.command_handler = cmd_handler(self)
@@ -136,12 +137,16 @@ class IRCClient:
         ...     g.next()
 
         """
+        from datetime import *
+        #logfile = open('irctest.log', 'a')
+
         try:
             logging.info('connecting to %s:%s' % (self.host, self.port))
             self.socket.connect(("%s" % self.host, self.port))
             if not self.blocking:
                 self.socket.setblocking(0)
-            
+            #if self.timeout:
+            #    self.socket.settimeout(self.timeout)
             helpers.nick(self, self.nick)
             helpers.user(self, self.nick, self.real_name)
 
@@ -151,7 +156,10 @@ class IRCClient:
             buffer = bytes()
             while not self._end:
                 try:
+                    #logfile.write("recv at %s\n" % datetime.now().strftime("%Y-%m-%d.%H.%M %S"))
                     buffer += self.socket.recv(1024)
+                    #logfile.write("recvd %s at %s\n" % (buffer, datetime.now().strftime("%Y-%m-%d.%H.%M %S")))
+                    #logfile.flush()
                 except socket.error, e:
                     try:  # a little dance of compatibility to get the errno
                         errno = e.errno
diff --git a/oyoyo/client.pyc b/oyoyo/client.pyc
index 9115adc5cacf5adb23fb132f67c3c301bbd75af2..a7799b285a744e706be72d0db79f11fcb8ee83c3 100644
GIT binary patch
delta 1582
zcmY*Z&2Jl35T9AEzt)Z&C$SU9apJhU#iB{5ppXNH_Rtj6meRhMI1y>1#QU6XaO}jp
zp#<3qY9vlbNIWD2e*v6O<ugJ;aEXMV;smWYapZvb1Av+5q!MfGPxEGe^S#d>+<bH^
z`uOi5tI}9|6uoZZhf0{$i>?7(fQ<yBmjrJJx&|C0U>8|M5}Q-t4uo|7M>7$@VfCwZ
zoQMKI;O)xxL7?7Fd>PNt8SDba`&M!?j3wn{?uQphx1~PGTsX2wO7n?c|E>WXlhVHf
zP?aQwz%}96fF8p8V}>-qBTZP>WoisV!+@NwjcSd67X>$RYR_@`ns8>1!QL2kF<{2Q
zjUMT?TGX1fz|#%0HNiQxD#@`1D#jr=4h;gNpq)9B$if+Pm^2&%^bB}!OXnGey&B@-
z4$$bl47f3n6lR1;-YB?7arPY4uZPYpjDc&hdXd7Mx>04u|2?(iv)(CqmSbYAwGF1E
zAUW8vpuGx+J*xPSRu}?r9C{|yT1BEvX!{ZMKo8m6DCEi5qP|zT(-<UmgC@91*fF4O
z0`8X$ranYyb(u!%$b(FSI|OcuM@B{WXggu>CeOyO%*U&DZ$K{svH;x(lh#Afi$X63
zN4+>4PU-<qfmeiX47yS1#^EEXqqhGGnsQnf8r5}@0#^xYat2m#|AaU-H?7?x(4MB1
z4Ze_JPI9*Ak{%2%XO+0il?;DsX#^;Ft^QA=Np!q_>8X$g1ij!V2)s@`kbbbxY;Ol_
z*;G%)?3>!uk@a^=n?cF(EuVuqYxB<TyyGr7uP-=nl$>P`Oin>2rn*EtrPGH+1`cNl
zTV=8nv$G@zF#>lpkbG|fa)tJuY>7D%#JswcU3q1iSz&?)9gk=sl3MKt+RqO<jc0zG
zPV*Yg1OLAIEL+8*`ZH@+_?iiQH5sU<hS!uqgygM*MniUVi&9)sbGZxnf=Y+3Tv{aK
zLwfz&1YlX1HbPj$5?VMG8pXU}VaAAK2rLYdHizdirM}B8CAcNQH(V^L4SPw|#z*kQ
z{?7Q<m@Tk&il9O_eNd1naW<QsexTRqngHYUt8klwCnk~%vm7mahs5vI)BMvgyPWjD
znT!~PWfE^ycygyxV~Lrfs(zo!<1*#AtQLzY{JDRv_yrCRX3K=P7@kvqO?U7~zdmzl
z%wJ>83d00Ll^}={(ByggyT0JBM2s*js(85&(a|oe=gYGZu0)(ycgnfSJc)Xne$d_%
z>ueY#V?8g^Z%Vl*YU<;1xwy(o-cr5k$yVS>zb>xRQM^i^9+#)^9?vPfM8`kWOXof}
zxk9x+`C53Jgp``HXY4mg8nmr<pvzxl-39}@ifuhaUg@{$EBhkOso(5#xUT-O^H^6C
Y&b?v&Cl*5tDTdqRa8;c+FXN~G0ecN3HUIzs

delta 1297
zcmYLJ&2Jl35TDu4WH(M?*NGjwNnGrhl(c*(s>*@zA*Gb2NkA_p35cdjvzvB9YA5#N
zBh{`_@R1&n-T}dZYt<8q3_?h70S;Ud5~@&7`~@vSTq+@E-X>+GH=g&K-<$cpnI|7C
z-kNuR{VU_$`+EMsowG1e!n*Wi3=sJc^+9Yv2LWRQg2*F#B?Cd~^ml)^d<O^ApI%4p
z`ghzs&{r#WPxO^+99J)7uiK{ySyy+nQ~SN-_0!s*)&3g+ZvKpt>fm9z$l&ae37ZBC
z>!P%?AhIDyBLqJt9K{{j$&<X4=|W&?xebymdm!rNj2!HR&c2ai-v1a!eCU{If<9<w
zk35QS1)V1Y9e@Pk!<??u4?8a6UJ25ku)+ZdEasmj)=J|VSdzd&*z%yc3Wy0+-plNB
zFQY6ZCUHiIlhXt$Ngsts`Uu4uL|$cK4)kd~CImKY8PK!<cfZrrj}aO%(-5L#AZZ>B
z1TJ*+tP%@iDxW`6y~Nwu%NO?{u|W<&Y_rsNOh_C^Tu6F=??MHKAu2%ZLhL}?1Gh=X
z%I+3gvZ!^sS|<UxN@hilz%uS05N9Rm(Z?-lj!}mx5e=03&98<wB&Ebs(C22Z5_xIT
z>(1s2sBR6_auHZW^7%>7ivUkl)q|m;UnXBnu{otq4lid$$)%<Ow8D+|)i=YJ@VN2{
zwd4Gzgv&vP%+>ccH^Y|XM4@<IEf=QnX*FQJ{M0ldAJJ;RN(MX=N3nt)=8a=GVtAM}
zdeH<AO)RN@3g`R^kpw?nF|9tGIHx`-=J2`hm&LDesKh9%n>5(t(qf!z*cEbrP<KjW
zSm8tVYqbAf4VLfg$dBEJWyd%(N8sWlU*zz1>@ibZBr|EU_xL&++fmq%Vvf?kq~0Ct
z$6vZP$G*V9v@cAZXH!?TN(+DMepcBtPQS>=0-GWm&MLV{kqle3ZnVV(#&c|@)l9YQ
z=xk@zTJ^*%s}mDsBnyceQrh&px!qis;uOOyye*qMVu_r?>Wnk3y&Z--Vp086ePZTy
z20b$A6@sw6AzopO^ER3v=xNF5M%ZdgpYiq9wNPGRM7*iHIYa1u71Tb*1@&)j&R(Ov
zqZTH{YdpfVWfk`HHQ!)wnGK&4YkC0Z$^BOSG4U);DZgIDCG|{w1m9K{>T82<F)hP}
R|B=LbIxwpq)z9GV{{ZWu?fL)!

diff --git a/oyoyo/helpers.py b/oyoyo/helpers.py
index 104f023..c58f3a0 100644
--- a/oyoyo/helpers.py
+++ b/oyoyo/helpers.py
@@ -76,7 +76,7 @@ def quit(cli, msg='gone'):
     cli._end = 1
 
 def user(cli, username, realname=None):
-    cli.send("USER", username, cli.host, cli.host, 
+    cli.send("USER", realname or username, cli.host, cli.host, 
         realname or username)
 
 _simple = (
diff --git a/oyoyo/helpers.pyc b/oyoyo/helpers.pyc
index e5b17da6abb110ba3d8dc2bd4f39e243966dd719..86b2799a375587654e1957f8e29edc24df6a2aad 100644
GIT binary patch
delta 48
zcmbQLK1ZGX;wN6NqKwFm>=ryCh71f0H4F@y3=AoZ3^hy)1uP7VlYMx$Fv@Rc<ekC>
E05YNrEC2ui

delta 41
xcmbQEK2@Fl;wN4%2Mhm=>=rz{S_}*fH4F@y3=AoZ43mR-wlGR;=HQ*e1_0u}3B~{b

diff --git a/pesterchum.py b/pesterchum.py
index 32a41fa..a3aaf09 100644
--- a/pesterchum.py
+++ b/pesterchum.py
@@ -1841,6 +1841,9 @@ class MainProgram(QtCore.QObject):
         self.connect(self.ircapp, QtCore.SIGNAL('finished()'),
                      self, QtCore.SLOT('restartIRC()'))
         self.ircapp.start()
+        self.widget.loadingscreen = LoadingScreen(self.widget)
+        self.connect(self.widget.loadingscreen, QtCore.SIGNAL('rejected()'),
+                     self.widget, QtCore.SLOT('close()'))
         status = self.widget.loadingscreen.exec_()
         if status == QtGui.QDialog.Rejected:
             sys.exit(0)