[Sugar-devel] [PATCH] Remove buddy-icon.jpg handling
Bernie Innocenti
bernie at codewiz.org
Tue Aug 10 18:35:25 EDT 2010
All this code from 2006 was supposed to create a bitmap version of the
buddy icon for use by the presence service. However, JPEG avatars were
disabled very early in Sugar's history due to performance
considerations, rendering all this code useless a long time ago.
I noticed this cleanup opportunity just because a laptop was no longer
booting due to a corrupted buddy-icon.jpg. (How did it get corrupt since
it's read-only after the first boot? This is still a mystery of JFFS2
and flash ECC).
This patch depends on a corresponding cleanup in sugar-presence-service.
Signed-off-by: Bernie Innocenti <bernie at codewiz.org>
---
src/jarabe/intro/Makefile.am | 4 ----
src/jarabe/intro/default-picture.png | Bin 10442 -> 0 bytes
src/jarabe/intro/window.py | 9 +--------
src/jarabe/model/owner.py | 19 +------------------
4 files changed, 2 insertions(+), 30 deletions(-)
delete mode 100644 src/jarabe/intro/default-picture.png
diff --git a/src/jarabe/intro/Makefile.am b/src/jarabe/intro/Makefile.am
index a9fb96b..2ea7cea 100644
--- a/src/jarabe/intro/Makefile.am
+++ b/src/jarabe/intro/Makefile.am
@@ -1,7 +1,3 @@
-imagedir = $(pythondir)/jarabe/intro
-image_DATA = default-picture.png
-
-EXTRA_DIST = $(conf_DATA) $(image_DATA)
sugardir = $(pythondir)/jarabe/intro
sugar_PYTHON = \
__init__.py \
diff --git a/src/jarabe/intro/default-picture.png b/src/jarabe/intro/default-picture.png
deleted file mode 100644
index e26b9b0114e992c22509da03a4e9d0e0847928e4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 10442
zcmbt)cRbbM`+nmnqo_m~QDo)VTQah at hJ%Ap_TJg*6tYuBj!i_i<4|TuR<?tzNOlpj
z*Y7 at kzMucT|9oFRub0GmkNbI^`?>Dxy6z`bM@#uEIX(HYW5>>_swmt&cI@~|_(qbR
zfWJH>xW>T`GG`S7H~4&r_<j5~XOb8E at wB_DrsC<LlcdMaG6e8H$~$)K>M>OXx%*xt
zzsDaNQEyGRtg at 12mC;ymY6UYiWQsT3ojw+uVSVS0LPM>rL$2vn{rVe}j4v<`uM8ZP
zKQxphRr>UlTuVpp^V5N_d__3~Vr}o)O4Ftx&5AVR_3JBhCjJB6Y%SxfKVJWIea8}~
z#&zsT{F7&z$BvQG9y^91`R|V>rpJlD5r16O|L+gthw$5fulb)l{tuV_-|zU}AD-6O
z#D45yu}OVbM at L6@cfH%3mYiI}c=cnGS|8m94<4Y=Bky&&H8nLI931Z5yQi+MPC*gQ
zbjwFyU*COs%s^3*B#E*$S0($dJxTfs+-75Alb4qV|B5+|<>u!<D)*}P{Qc|qZ{>)~
zQ$Kz at eE1Oan~aoJI5asq`NM|~O(9e=zMBQB(O+g<uUxrOTU&ceN@`$Wpv3!l!wFBL
z8ZVdMBlytJP)(O|_g}*TSFe5=8rllytNWC53PC|1cOygR4Hi2xplxn$UhX>6{taiv
zY6#<eq at 5~dQ0KQ3Eps at WtUdD4ZLYOd#mdUcK2WygNzweg^;6kDyBl_iQq?%zdXaH;
zL_|ah>#+t*aBO^h7gmJ(+BLa~d^2-%_sLIBi|cmDeG!Lb98rzm$;rv>9ULqkaEE28
zsi`SN(&NpVPW`(0=?sN5%gvjk&CN4A>vOJnRQM&ni4QKUT_Pk1io^Jr7y-wz4{K|#
z5=LT9PAkL1`n(C@<A`lrN*y{nx~{G+8XB6lk3M at _EAKdMyHjs5Qcg7Jc#5Bh9gpMI
z8yg$@S%F$f!aGmh{)POcemfhbuP^RC-=kFL)I8(b+1cs)cfL16K4f=A%Ff#QzMh^Q
ziuffRc(}hjUM=P{VZX0>;d|iGL3<o`>Cic(juO1i)6=ukah%1_NLQCII5;>lQRno%
zF74JW;~R0bG&B~LmX_w`QvSQKe at u1nNCfPQYjG=<$kOfX?k<m3Mw`l=Jb6-2ZwO}Q
zy>32ABOy*L8=j`7qVmCYhP>e({C{_CrXxktqj6cjL^hQ1rl<Xn&!HL#KUTepii%QG
zQzPr^ZaX?ILww=k;fcKBe%pWg-)T=PoJLT at Dtdc+!z3`v1bns5(@K#fIduw)#g^ge
zMMOkaS69i%$TX-LYkjx0(xk8Koo_giUE;U1rkNxvfPUUR*Nqj)=i)W;fUMy$tf=wX
z2s>nP7_I2+?jGvzZz at tKk!`r;^EcObYgt!U*PZG-O`HMFQbIyPWc)^4Z0z&kU}^8Q
z=Z7pOo?exbV)UhMI6)%zczF!cy1$r^sTi&lak+QEP8W^7agKCe4EDm(M6K_sQ>TVA
z)JQm at ZX`g0E2W)*pz(CJig#jDQzsS)`3v>!+<biB%Pc57IWZ(*NEVjNsw(WP>CKxr
zA3xr*G!$cH&9dl-?>#!yynp|`jSbf(7hINCUhWRlAbgsEo}Sm}LrG#c)BI><@w;~%
zoejkgYQrKUn;l_I1g=Q9{`@^!>8|uXHy3I2LFe8*+>Tyfe?QJ{s7UzqP#_;YEV=Ay
zO2%{v*X=)3Fmdsn=i8>X_xAdezl~RUEJ1|BI8s_p?5kI=zJAq^Wc8Lxt*op(qetlL
za~&=*6F$v+)AP*DOARL!U&qAAtzV?|_1zP77-{u%Fg7-}iPF&4Zs~$ZdXuI7v9qnS
z644oE#<1u6vMEwxzJ2>vR#i=PRlnzcSy|cq83 at W4qW@_YbcK;|{!D&e-bc^h^qYJz
z;H-*@iuCj+U9ED at PPMfKoeMrgciYW8AVAtv06v}W%~Fnwi*r{(8yK{;Nitl%e3^lP
zRsV at 8*A;AipAm1RRd?zdZp43YGh66aSIW)dW*8DBw)pf-_xbdUjB7Ia4wja|rpGba
z?$!^6?@jOq$h!HH@*0wp(zX_tl?h5VN&E7JS}M6!=@}Yw&sB1rL{MB#_g1&UB&i8=
z?JlvVZ506IsPyc=(3x;7{5rild~p1D1BO=C(6E~AaHPMc0-<=Ps;X+Z171wZ!&4Z4
z8M(V8k86EmDn}u^J}v6)%kg5?ibPUUa&7Y=?K$LCD at R8ytKpUUBVN6HO*ele5?K;{
z9;s7h8W$hmu8VUVuL}AXFOrAHChBWvXWVO#qP)Dej*cv$GDzV6j1ZQ9nwnaYb!INC
zsnY3tj(4Trt^@>%K84l$Smm>EBdhw0SW0=hFqYNAW5-*zBt36<bhMuiWoYQTJSLG?
z>|kLr6GU-oK0;Vfu<;B9tg`%3V+$7-mvHgnggYdXP3rTR$;qo6dW;AJh5q_Xf=Pwr
zIJT=*IhrX&Ch$RUKHAt=^XP%NpEUEoBx#ynW!J<ixH%gcF&-2*mn_fsW<erD(0~<=
zj*i10VS>{0?!D_{+yRt$cABc)oDE=r`oaZkN+vPK<ftghO(cedytS(<>X2>p^{ZE9
zI9!tV+5GqK2a8RPmd9^mrw<MeN)2JM^yTE_gq78@`vBjue4WD=u3XVPS_3qsydv!<
zPTWZ39pmFEhu%{&Gc$IB1vVA^WdVmfR=aZ#1j6_rEd{s4LZ}%TH3I$a+=)@Sp6N|^
z{$=}j<@d|Ac9vFFVzvXEzjQ3JSk{Fc(-R2<!nfgJ{@pH9csvG!u at 3kck~cCkauRlz
zOh9t)-G`;ay}jp&u+f~5ntHe~WFj=OQHaK4g{&x-R_JQ|c3k^&G=+=X|D@*UFLlct
zMI5|<?DzxIFk0z!=_2uKe`hWYVuehCU0qrJ at 2jLF-EBR|raz~-rA5ep at jR>2_V#v(
zEBn*?H*UGjegzCltW(a(&W=k;8ZCX)(k*?Mr5p{lYHfX;f`S5I%FfQt!^7j|<7Im@
zGuTMcQ1bffEv2sNfBFh*Pst?ZwK$O1*w}a~c-2eF(9rPGrAvH#eE074YoGPq{hJpV
zsi~?;)=%i^>swn}qnB`f`~Lln)o$07iCU=PNn%bHkkuYbgHZbd7frs``aWL!*#;5*
z{rh*WJ5B75IN-N@@R>w at v&PS%)GmUTFeC-4>gv?wK^pb13vzNq{dfPSr>ARcD)sgC
zK~dE;G*mB9D>STR5_tIh*)#c*n)^Bjdf0xzBUjf}(I6OQ46CyA?o0#m!6B5P3Yn*=
znD~7({QVEu)Z>u`WzT2hR$y~R0}P>cbYAKs*#i(~&qjK$&ypc9(E%|!*DsI-HGU~D
z12`%yEZqCM(4VDD<>9dr9mU1V+XY3nt?gsLfzP95H#1Ai__(- at UWT9hYaM*~sKP4$
zJ<-)?06>V-r}uVtfb2|tk}r9Z_;_UkN)A#|vI=V4YIM%KcbBeQx#jZXbKpT>-u)`m
z1`O~H+NkR^aR8q4^YebI&6kXL6Ebtd!ou3y+b{7wC~*~Hdh}@e?_YNzAsm&-sE at aI
z_PckuvTqO%6|?kMv55 at hQ&%<ewK<q+N=iybl*`AlmoHyJt_0rF)6|SiN at 7s1TUc6}
z`}x!FLq?I&$G*IK9G+?FhK75sF|6XGGt?Ni$M8A;lcagE at 8jbKok?OxK3`xpfi`#-
z>7r1BAq<PKVbN%`=4ylyub80Vg%B1DN!lGFqcK<!_Jf1R?(X~6ICkw+WC&hRShxnN
zFWmF#>B;x+-)rs;SjRIq`s%yB&CF~BRzc@@(#**z5UM|_5Ph&7I7lGy7+1OPZT?=v
z$yK>8yo!zeJ7ru087S^Ht5Mc1wlMAbQRZkL7amR#rLpsL<wARJQmC}Fbf;TCHX`DT
zmDL=?e<X2HJh`>C6{>z)TZ=hN1?1UL2?`jLQ!x6 at MM$8f- at kcewr-uQS>RQsgt_}#
zT*1i5DDCIK8K;H=IN7zZX}YhgD}Vd8t*x!JQ6+Q0c1E5F*<l9^L}vf(i9by7cL8t&
zg at o)5g~i3iV-perKS*0xSUi3D6z=G(SA%kuz-zoaj|vM9x0^*1Zu)KWQ{Dl-M at vV?
zmA?>CTYI3K#1^OK=H{jxNl&o11MXYqHrF*Wg8ulPCZtI~Osu%5=*yijvGJ+;6?{@+
z;w>Oty>}NE7lESi3kwhQ^mwh$b{_0)F-v*LR)~e1W$=WF)b<yc+22{8nwpA~7)|X`
z%{YGiIDo*;z);2Xk01N{`>kCWfK<P~;ojBNNhfshaB~B*e^iyn6$V83U0ND*ly0JY
ziMdlpJP+LZw`FN*3Fz{-iHQgD^3!QYM+^P$>JK&zVXtXwp6&OzEa`3yp`SF#sfMK<
z!P`N-Suk-<p at byOR!``9BQR|uL&1%QsY;UaE{lvj8?r9L%u7Q{3o7C7kLK{d%<u2L
z(}L|$DD#Z at 95UO|!9nw=<I}<J2E~~(_UT9<SO!2D(*h4wdkUyIw5;vy#Q0}{%7;MG
z12dfINMKl(NXf{^0MIPA>HqcX7k%B?ML at lS{e9A?yJBLM0F4LSx<|m?fxRl$*SEE`
zu_{M>o(ePN!oyQMmj)weO##=Q%JzKXGpmKYR`8&9cXhf&L(j7H<uwo(XT|a-Oac!)
zX1^xlthy&^ym9I2lK_=xnN^@-ZzL?y^P4^aECTW}UjXIIcmLoZktvgrvZcG*2?%)F
zmBiPtscC7I+-^%cP1FGAoO+>H5<3E=sHV1dAwpP0B=W_J?E#we(r17ulOEjc*~b}h
zXeFEa_~%05o&b%~@a#0-gBnggzQDarp6HhT-rnB6K0y%?d`StvsHkNXdueGYtn{^9
zLSqmG=qWijKUf$IjWa1RK=?b|;u){%uW at s7S_7?fR|-?el=k243H%A5Iyq^Iu{;Z#
zOhDjH#ZY;8XlUZi$By at g!ZJDY?$cks>;*{P9R=EfkDI$`RKF}pXxswH#~0mI0#r)q
zJ&ocWA0Ho<m>0byn~NY0B!MuGj at L?;`))awp?T2dFYXj_hTXk$$Hmh#N2u)m`>=&<
zAV+tFVbQaN>_0s at j-V<6JY-^;D8u4`0|F4o5ZW6Wo=(z%tYiq7KB|S{H2H7Fm;?9a
ztn>kx+n7xB^u(m3_HmW=+dWXHzC>La{n{B86_qLzC at oh=%lAM71xgG`<Vb~sy4BCu
z9NNyGS at hL@Z!8VD2aC)`Q2{bS)aeGW;EY0+8aNTVxvmrnTIALIxY}C(N2%B@|6tBA
zADHeaeS~^muSCd`OiqlOoQyr{omR>lUay6|Y)Aqzd0b{@CM~a#icUVHyl5HfqN1*z
zUO!!MM=h&<dlBG}d+@>G-b$n&i?Q)IEEmQSpdyl9<h^PV{!vSmVmNIK!4}ALq~9jM
zWUv$IW@=2#`F}6<SeZ!aD&f{E5<dL6m_*1{zm!7()MI^TpWSwF^Y<vkuA!3;0zsq>
zUTa(*kTQ$dY%(-GhRHSpYPfI)cDL{LpKIKm7s!JUomGB2f@$4+JUkX#E#E5~Mqjb1
zx7v!h&+DKDuW at mOcJVVsZ%q*pusXcAd^g_;Y21hd8I}-d7_hLo7#tjY!S7eA4-P0E
zpz~b}ngoF;(arylo_*HU3V#-v&7zVmx%f0C<w|D^NGF;7KPS1h-)Cj9UL+^Odd#%b
zNT(eQnFNXiTw!5lP2e&7QjUT`!q4vvJFUPz1ZENnNgtz>*B?{HBGUM>B|`qC1F^=y
zotXrfs!{^7%$t_Glch*kR`!_T6ekxK85PyhP|$A%e#@_y;SO3IAW>N|UPp%qEz!(Y
zGv0VSz76ZKv8XGZrtM6U<O77{L4`eCf3|)x0R*abfVj$?`%8m`HUZC0pF@&VLMc8~
z<g}3iVxe>txjR&8<A)P<nqa(qnUf0dv-*SNKrx=jP-$I~uIKHC+ZpE!<tkwNa^JYo
zm3m7(FlK3}c*un1<7zk5d1<ddlgY`9ImK(>2Y~LInVMQH-eV9oo&FNpk-%qF6)eTX
z$Iq`5jJF*s8h?5c-v6~^vi`)$lV{JIxy-ZHL?v_m`t=g=ZWi&jdB9db=_7zUVLSZ8
zX7YcNe}-Q8MO at n7w$~gQc8Yff{tf5aasH;e<n;9PP%40^N5ogTOb0^^@1$m>&&kO_
z$#g&5y;1!3?R6264cvOcSq9MpqmQrb9h*^whuhQ9FJGR^A)@st&Wein85 at W5aT)JB
z#>T%VC!H7i*m5Yel0-Y3nx4gZ5UUTUL!gj}yw(;LY_#DrBC2C0W=)mf1JqI6yYKw{
zDo_m#4Z<AHj*L#1>W^)&+&J;z!VOUB#H9C_?|Hg_0d6er^Ouu*DLpSwb#vs;mq-Q}
zWEOK(p-Fve0g4+{V49DLW|m>k1(Y$Yu$L=5hujtiN&NgdVt2)?{_&s52Eg(XLIG?m
zsHG?@-f>*=sjMuDyUdQZOg~=&ATj0Ur4Y6U7jDaIrAjR<FKex1IF5b-i(Xi0YnKF3
zO&ZjQ!JNpU*j(u6fZz^&ypDFd1MBvdZ(`7eK$8Xs<D1dvlLMw^XE*z`Wu^+b5fsvV
zTwHBUO<6&r`2b at 82OznP@wRba?eMmQ8<^K?<KyF0S0tb3n_SbE)pK<%tFHFd)urht
zso$ARQhm){N+{^*>9MSSDG}X5O^SdrZZ*>zaCEQ*U_3zHaKhVZ at Fy&*cIsCY4yZS9
z^|-evCMG7(7LB at epbukSz521d`~dW>djmYrf4x(TC))t>iIcPS%a`CdWo}+xN-{Fy
zgvsKD-$4SLBQ<}JPe#qoDCz#9WqRtRd`bG9&kswht8X^&7)sr`Ra;XtY#UEhIiq??
zcn}C>6&05G#3e)|TvmYRybQP0Ocr-(kL4;TXaY&n)YzzR9}g^B_UcRTLUyfWulb&9
z$qnGJCEdMu4<-PJz;arD2&lO-0y0Jgh at FFXJ^>U4=Gikc$JbK}3*LVw<%q+Tu#FE1
zIi1yk5KRZUjYJm2blxsJ)^L~nLg;4#L3g(ELZ|}Kk}A^G(b1_7IM6pp1f+mm#h^7)
zrMzLY=h9$EG?##?Pq##KSjSgaSA$JqpOjrx#CwiZhg-HJRt3z;4=&TB*qPZ`5EbqQ
zBI?G*w_v*3+tn)YAYDc(otSNdOy$;9wY49+xLmW22TBn^C!}u>0<a7ThV8tor+2hm
zy|TOcyQBS{jMpDo&Wo9-_EQN7HhDlGwUWi<oO!Si!3r2*aUME)dQ at a&3t$kb=Me_-
z?%m=3S|V#HC at 7eml0r6X0M~7;uA14UvRw#uoT&LGTL?6m at J^c<mAZU*uy;G-50okd
zex&*_AB6Q3nIhr#<=eL%VC7{FC@(KB at W_<yXh5D?(GI at FV?`b4c{`&_<vJYWK`<8=
zJN1i%Z=eew)K(P~L at Zz?CMJL(5T|MF$FFZVFcx78AUd%UZaHCL<lLQToTa9gR+JIJ
zcK7dsfPlciD`&<&x at l=?Av#?>JvTQtEGi8ESRf;6eKuY>6k2|LQwl}?-vT<s<8VR^
ze4^EzBf!F7o`>HPz)pI8`<g)^@DOoEzl%|(PirIt4{Lx5H56|Rmp%elrc({4?+*Ne
zkgrFr!Qk)b=eaTwiRQZeOG{D6y!GYh&kA7t=1{P+u{D4G+)7|BX>7dx18wFQL`PeG
zIWaMj7##CaG at a0w?rv?SS%VEc%l3T#(9mO`2y3Fc2*A_Vr>K~c- at F04xx>8yw$$=O
zt>J9o7ai_TXVe#rJ~%hDwS`V{BOxs}x3&@p#r|eyX28K37WQzKL_VQZ$lrvawdqNh
zQ&m+(tQY+J`4b$hwx7`ka&pHF3N5=+BhhBTBs>p5AAvZ6h4qsTTps(_nfL@?B|}F=
zhg(LbJ~x+hfLsV^y?W}*<(J9H8vNZC!kdYjyF$k1Gk$GrOBr5sBFJ at T%>oJ)e>dpp
zpEcg=Sjp4CfXU9DWy>WbOSn}yeUBo(jC`hpul{0qGY~J0OB$M*<E4+3Umu!*MbD8>
zfHnJ<X=cVBU4y#ksK;u$dwX3PV1L8}g90ED5Huu_6BNB%8cY53lHIKpKHBh&jg3TJ
z&KMPVN7rte*bj7PnhY}@T%TBrR1wop(4}aJy0SDk*D`2(k%op0aRP$|4s%05;5_l7
zi)r_7M23c5(+5I;0?maiQUx8?Rum7m1Nc$KztkZ2SM6q2R_d*~nK0;};9zW060TYr
zj9aLg-R<oxFUA2Wh(?z-csIl7ot>TEz&#c)fG|Ms!FARwMZwkQ&z}d at V_uaW8rnv@
zfrqEm3T_Yv4<jHTz{SPIRX1Nrv;&NEmY8&d_LD1S8K|?sm2DS6{54OnLU}!Xmj1JQ
z1E8z8q~z?}+ at nj6U`jJ9Dh9i|qbFzcHt>ssg@(97D+Ptmz%1YJTAQ0+k5Q?5yb|Rf
z35mCj?o7Rvl#T*-r_%s9<_9B3Q`5=GhG&Vq`giaCn4f=>kPtFXyz&>i6Dwi|@MMl(
z9Kq*n40=Q9hqTqWBrGf(t8yJQ(5HZwGZbj^LO*|hLsa47oB_x#$g+3ZX&@~o>iik1
znILVv at vu>6K?5Z6=Kdp77P|RcP~llvSV(6Lz|ejT5A)spEC7aLcpd>z>&Nu8p>^Se
zm>uvT;I*vQgD_dcRopCB^{+<b`v?RY@*oh~F==T*9}GZ|#Hn1jj{ni%s~?8qc5-qm
zBd!pba-f=r2!v8+cUN(cgbbqgm-|W5WCE9AkV#45 at +TTjd@LeNHHDDbf~Fh%=w^jN
zP48|jop@>r at 3j}P1CDIo3CVmN8<g<;>N`AE(qr-H;QLVwfvEfJ3APYBxa}7ei2{V5
z|7F}LAG}XdNeOxk=W0YXR8>pM${NpOOrJ6mY at zfhM=@T at g;*DdOIf+|i47o-3 at AOl
z`Xd=I3n at uSCtW`Z+Q)+s*GDShplDG*%G}G*kN}z?SJ>Fp1kI|XT$E;S0q{()VW@?<
z+1Rp8>I1~l=aAMhc<?l-LlrcQ^K+~RfgpoCdc!-MqsdUJA7P1i_v)`Dfox7mNJvNq
zeU$t4>(>`AUVvz)jnbpEnraMURf;gJngnvU<97&wIS-o#lL+P$z;}DYn_FDWOiTL(
zRagX=?D=~Hh=af9&vdzGCr+I3l49asF91_74Sezi48%qo-VD7L at c@WQ8WcMW;aWa%
z+&vlcLPPIUQ&NmgO|Keuj+8zMQDC`djZ#ws3UW4z1wnz$LqTf}S|MeH1n3bB78x7f
zyVqpRMN2dsKuv1(ApQOQi37T(-@}OColSCzVwTb3$DIpRfCv)I3K!2ZiaUe<D(D1{
zRfF_(QGiRI<FUdveZ}>MH%8GGR#wG^l~Dz#4ZyP!;G^F})wQ*?k+fL`JQUJw_xI6w
zn|`Gt=yTi$ScHUN*tvRi at H#)U4EQzpbArYt<>j&6b0&3ubRo2s`kw;+5r`k3$;!})
zZ{C!Y(IbO{GdT?nM_~kIBHiHYsA+0iRHXy0)<+(K+2#@fI4D>Y2P-``7*^OevgbVr
zfVu4_-A at AD$>zCrvgM!TZ_FB6?0|R2#KtP1xF0=w1nCK`17HYpaIqGuECu33#jF7U
zF`(&x!2S5iQ<Gjqa)ft%{8+|&?fSp8iHwN&Swl=4z<xFk4oDjyfL&db%2zNX*MT04
zjgONBYz-F at 05C)y$A;bU at 2ws^qP}?X`nn|>JNt#PZW`>_iKe^dXgqATW&$KnzFskr
z@%`1tI?YFygoV}DAH5NH^oDnPk-*Kt!GXDH0xE9c1~>Qk*cec^T|OS_0o%j<9fTgj
zywU)$j;I|W#jT^z*>B(S8<#+6VElkggKY&kgGkVa<Q%T@$R{SqAf#j6(c#`H-u+Lx
z24G{bTMq*8rX(kKrO8Cg-=Unkh1|Id-WZ6KQKx#?pYS-ypd8I4(9%Xn-@$KjcXtQN
z<y!yg(uxXNQUq9Ckw<cG at 7mbg+dq8B(ocdfF9%Ct2q+BWYnXWsV9#YigKCP3Gimrt
z&iCMNT?l<XIYFCN`-wIS56DO)4gDmbQBzV<)Ya6SH68|&Fhhz;o0yp7sMFEYhbgdB
z*m^)O0>dydFl5`CsmOeI56t+itZCTpZ;Dib41(D{jI{zwD`fKPD5$7ZX at 9i5{K?br
zk|)W7ZrhW1J3}RMnf at Y>GSsSC2wHBx7b*dmr(yy7+a?Ab2G-DNHzuA12t0rh#P&AD
z$HtC<Q4J+OQf5d_QL%Ysqzd>ZG at yDhphf}?c10RaM?Im7$1unQNcD3)iHU*sfbD1n
z*lEt2zrI0rr5?B;DCi2Sb(RWRu*7(Q<0lqDmkKB>n6i at GGSgrby{Y>#yXpl(IX*sK
zTw&(;MAIt at phdcq5Fwz3a;QQd-cB!v+Y{DP#BOll`+UhNR0@!`-PSQ!Ed5j2C-N7C
zklUkwrkd#dqa4l6FETMfHTu+!vobeVP*S=u0AV at 6%xBlDxVV%;9Kg!n6q$Xm^REYm
z1Gx_svwnY#B1;ieALy|cCuxL`=|JG)GQd$t#A4O1zXD+|VB7{x`9FW0;SO+IVH-x!
zHW=2D((dcszkl(dft{TlIe6pNt&{@PP0wGZ==`ltN&nsQ#6-G&5)fvJEawe7u>y}y
zWm#tD<j~U6{?G>l%-Fzy?x1+G95fr0!)CO at cvV~h>hSRJbN6V5{OM4IhmMY2?hU|I
z%0P<GS*d3Cf!dpNCf;gk$=)e+9gtD45Zydj{R<8inB&32w0dOArbnc;><4yL)MJj&
z;Z$@x*!94&g1{k_w%8k3nE+r1+rxL$9yLhR`5-bH8!_nyK>T2Rkc<b6U0{rWs$V!$
z=Q4eYQV*g24ajmYT~1-4=AT;=(XUjl!@KZymkjZ?=EPncFnE2Ncrbl|+or^TPv-?j
z!GByMsVyHkCjbahFklM=${YylNRJg at oXYhJn0`S6`$5pm)=^)(yIanOn{tU at IoLK9
z3E^>QhwpVM=_p|0ns>M*Y~rDn0KKo27{vD%2!wh at Y+PI~ozlA4A`bu1CzU^>32aJe
zfZOy%n%dig*aEVm)dQ-y1a_0CD~Y>@hryTuG(?d!G;x+*@dE?*KNjk;CV7A+i%}V9
zwd@@e?8M=YHM}wrKB_o^HdADtE-Y+68oCH?-n^j`vJ at W8;TIHyp#y2TY7OTM^x=4i
zOQH1x)!W+IRLV%eD(lqsl-IB2H at 6>_z9~R~+~_m_DhB;+?dum}M3w+<VH(|)E*M3e
zJBJLqz1}(d>z6&|yHcrs4V)|~Lwo!Bc9=iAOivFv2b<%9aJYSH9JH0)uFI){C&elJ
z9iLZFAm#b%a+WeMfA)L=_`JY`;2knDX*ReAb$+Vr0nA^%eDP9!Vaj!rfq?<b8hz!a
z(oy;Le`q at xZP3gT{Eqw&WkPVc{hXT%2 at bCFUJve?1f~g{s^0xfZGaW$4=noaj(`Es
zqstU3D=KmXQyN65t(X46kb72E7MU#`kjgukIE}!toWK{yS!Kfk3nc}Go_gywu(=|e
zbZ5aq`IaQ=fcEo~Iw<%G2>)xi)QEShDUgSUCo(ef*5hTyevjPZIN%gD4$07~h-Q=!
z6cYpDySuwfafx?-08s(z0jB<tElGm03vf@;ef~)kO~YMJqID@~PTK!11mb~*m6i&G
zG<gHvHZz+d+V9B{^3Jnj2_570fk)sc%((5H6ARDGg}H^cM-80n00F^B`L3o$N=D}B
zYoZWz<RhZ?!6exK+pjH-I*&}}40CmHQB_lW)poDL8|Y*>2#U1P-r+4x at nk3;xV7J$
z*1zgLvA;YG4b&-T^Af%fM$5ocXKDaFpwyv|w1!|(EQ;K;1<kfk#mt-rKqwYi2#$kc
zJ3G-(OY3%;UAk*yZ4FD2gvI_i*L(*0B;b~>+ez9JZb(blkwCfRgkvS(B7J>#34uVQ
zqoBMfzkT}_I*k0aJ3_~qq94!qWI*8Mp9}x4&8UNhI*Kj-av5?J2+M9SmHBZYqy=<r
zb3s#!ZQyd>zyH$GQrSa<*?;T~PVS5kXb(V5-rn{CMT^l!mzk?NJ3IH^s;jE<@$;(*
z2~iH8P}}It3_Kz|0pWpsu<yFG at Wd3aay!ErTy at RW46_3(hvnsE@{%}orDIBb{Os)P
z;6*A&2M3-Q6|fhgv(7hQx}mY5p`y|=IB2;lP*_mFYg{D^4s6gjHAp|8w?N#?wyJ!f
z*CFLL8xa~x7A23Mm<Ivg)!v at zEuRqV54}Nf#)v&JFrF^jbLZveLdODp_r$pMw-J$%
zS(%vu`>V>>@5>0fml(f})>dfKaE82q!%(37!5p9o;D&=eUz(de7W#th<)JAU5)zUS
z7dPeg+D*JL!$L(>^;?OVypqzXPTvV at 8yjyQALtjpnx)aCkq4Ot-9A82>xthnnVit?
zfhC1pTU=V2=C?cUW{b!t@!sEF1+ at VuQ^2lynUJsruiZNOJmX3fyf!x9svoaF>qAmp
zyr(9k^mcn&n*=m@!2(!^mNYr}p?4(%yalQT944#t-y0bnrJ at r=aPSh3#QkbYTK?}b
zIpUeM|2Zc2|8-jKe?9y5#MF%X-$A|q_0#{$3B9zxM^iuOqxRf4P;d_Mn5v?dLeXtg
G%>M(oi&U%t
diff --git a/src/jarabe/intro/window.py b/src/jarabe/intro/window.py
index 35c0cda..a66524c 100644
--- a/src/jarabe/intro/window.py
+++ b/src/jarabe/intro/window.py
@@ -34,17 +34,10 @@ from jarabe.intro import colorpicker
_BACKGROUND_COLOR = style.COLOR_WHITE
-def create_profile(name, color=None, pixbuf=None):
- if not pixbuf:
- path = os.path.join(os.path.dirname(__file__), 'default-picture.png')
- pixbuf = gtk.gdk.pixbuf_new_from_file(path)
-
+def create_profile(name, color=None):
if not color:
color = XoColor()
- icon_path = os.path.join(env.get_profile_path(), "buddy-icon.jpg")
- pixbuf.save(icon_path, "jpeg", {"quality":"85"})
-
client = gconf.client_get_default()
client.set_string("/desktop/sugar/user/nick", name)
client.set_string("/desktop/sugar/user/color", color.to_string())
diff --git a/src/jarabe/model/owner.py b/src/jarabe/model/owner.py
index 17996e6..e3453db 100644
--- a/src/jarabe/model/owner.py
+++ b/src/jarabe/model/owner.py
@@ -29,7 +29,7 @@ from jarabe.model.invites import Invites
class Owner(gobject.GObject):
"""Class representing the owner of this machine/instance. This class
- runs in the shell and serves up the buddy icon and other stuff. It's the
+ runs in the shell and serves up some user-related information. It's the
server portion of the Owner, paired with the client portion in Buddy.py.
"""
__gtype_name__ = "ShellOwner"
@@ -49,23 +49,6 @@ class Owner(gobject.GObject):
client = gconf.client_get_default()
self._nick = client.get_string("/desktop/sugar/user/nick")
- self._icon = None
- self._icon_hash = ""
- icon = os.path.join(env.get_profile_path(), "buddy-icon.jpg")
- if not os.path.exists(icon):
- raise RuntimeError("missing buddy icon")
-
- fd = open(icon, "r")
- self._icon = fd.read()
- fd.close()
- if not self._icon:
- raise RuntimeError("invalid buddy icon")
-
- # Get the icon's hash
- import hashlib
- digest = hashlib.md5(self._icon).digest()
- self._icon_hash = util.printable_hash(digest)
-
self._pservice = presenceservice.get_instance()
self._pservice.connect('activity-invitation',
self._activity_invitation_cb)
--
1.7.2.1
More information about the Sugar-devel
mailing list