pidgin-commits Mailing List for Pidgin IM (Page 776)

A universal instant messaging (IM) program

Brought to you by: amc_grim, bigbrownchunx, qulogic, rekkanoryo, rlaager

pidgin-commits — DO NOT USE. See https://pidgin.im/cgi-bin/mailman/listinfo/commits

You can subscribe to this list here.

2001	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep (106)	Oct (334)	Nov (246)	Dec (145)
2002	Jan (42)	Feb (53)	Mar (232)	Apr (109)	May (137)	Jun (63)	Jul (26)	Aug (263)	Sep (193)	Oct (507)	Nov (440)	Dec (241)
2003	Jan (567)	Feb (195)	Mar (504)	Apr (481)	May (524)	Jun (522)	Jul (594)	Aug (502)	Sep (643)	Oct (508)	Nov (430)	Dec (377)
2004	Jan (361)	Feb (251)	Mar (219)	Apr (499)	May (461)	Jun (419)	Jul (314)	Aug (519)	Sep (416)	Oct (247)	Nov (305)	Dec (382)
2005	Jan (267)	Feb (282)	Mar (327)	Apr (338)	May (189)	Jun (400)	Jul (462)	Aug (530)	Sep (316)	Oct (523)	Nov (481)	Dec (650)
2006	Jan (536)	Feb (361)	Mar (287)	Apr (146)	May (101)	Jun (169)	Jul (221)	Aug (498)	Sep (300)	Oct (236)	Nov (209)	Dec (205)
2007	Jan (30)	Feb (23)	Mar (26)	Apr (15)	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec

Flat | Threaded

<< < 1 .. 774 775 776 777 778 .. 860 > >> (Page 776 of 860)

[Gaim-commits] CVS: web/htdocs/win32 index.php,1.3,1.4

From: Christian H. <ch...@us...> - 2002-10-12 05:55:02

Update of /cvsroot/gaim/web/htdocs/win32
In directory usw-pr-cvs1:/tmp/cvs-serv5748/htdocs/win32

Modified Files:
	index.php 
Log Message:
Added a new style backend. It sucks. It works. Yay!


Index: index.php
===================================================================
RCS file: /cvsroot/gaim/web/htdocs/win32/index.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- index.php	9 Oct 2002 18:04:07 -0000	1.3
+++ index.php	12 Oct 2002 05:54:59 -0000	1.4
@@ -1,5 +1,5 @@
 <?php
-	require "html.inc.php";
+	require "base.inc.php";
 
 	start_html("Gaim - Windows Development");

[Gaim-commits] CVS: web/htdocs/images/halloween/navbar bugs_b.gif,NONE,1.1 bugs_bh.gif,NONE,1.1 bugs_t.gif,NONE,1.1 faq_b.gif,NONE,1.1 faq_bh.gif,NONE,1.1 faq_t.gif,NONE,1.1 plugins_b.gif,NONE,1.1 plugins_bh.gif,NONE,1.1 plugins_t.gif,NONE,1.1 contactinfo_b.gif,1.1.1.1,1.2 contactinfo_bh.gif,1.1.1.1,1.2 contactinfo_t.gif,1.1.1.1,1.2

From: Christian H. <ch...@us...> - 2002-10-12 05:55:02

Update of /cvsroot/gaim/web/htdocs/images/halloween/navbar
In directory usw-pr-cvs1:/tmp/cvs-serv5748/htdocs/images/halloween/navbar

Modified Files:
	contactinfo_b.gif contactinfo_bh.gif contactinfo_t.gif 
Added Files:
	bugs_b.gif bugs_bh.gif bugs_t.gif faq_b.gif faq_bh.gif 
	faq_t.gif plugins_b.gif plugins_bh.gif plugins_t.gif 
Log Message:
Added a new style backend. It sucks. It works. Yay!


--- NEW FILE: bugs_b.gif ---
GIF89a
N:b2ªB¶F¢z>66*ÖRN>"*&">>6ÆN22&B6Ú¢V**&6:22.""nV2*&6.âªV2&:>*r:~b:F6ÂJzZ.^F&vV.NRF22.&&>>.fJ&J6rB&&ÎR.*&662fR2B6&jN*R:ÒR^2""âªZÆN..*¢v>ZB"R>"BB2B2"26.>2^J*NNF.2*rV2&>B2.*":>.26*n>b6r>66.2&6:.ºJ"""ª~F²JbJ*&&"BF2ZF&jR.¦~FVB&>>:22*B6"2.&F6vBBB.*"6*JNFFFB6.">2^J.ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ!þ:Copyright (C) 2002 Portal Web Design. All Rights reserved.


´È«+(ìx  P1¶L¥°ldlñrÔ(4¬@@±
cpÐS ¢pãÊ-êJ0	Tx
¦W#?M8dóDÔ
Y©*ü!TbB_¢¥¨Ée¦,@¦^
õEA|QÐ`C¼qAlÙVØREGT¥B@,°_	é¢\ÙéBsÂE|\äg
*§j&
H,a	
xTÊ¡¤QI´`²Dà0½×¬ñ±ª*§Y¹*B¸Ð%²*kß
LB-DÖ«P¸(woÆ-[ðvËâ%c<2§'×[]
FÕ>ÌIvÀªQ@`¡Êd$@
ZÀ Ñ"^{õÊ)±ª¦²¸abÊøâ¶Ó®.ÆÝÅç×u¨>pÁò`n'Ìk80Æ¢Å¤Py;ÄVÒ	Ùw²`ÄW·,ÐØQßÛxé¿oæûòF6~=ûlrÿSÎÍf$1ID!ÒýØ4¶¸TL?Æùó@¢´Çänå¼¹\(ÊpÂºð\!O"@>Úð@YK[fh)úð
ÙÛ
--- NEW FILE: bugs_bh.gif ---
GIF89a

ýYÄ
3D(jEN¥D¹²°!ÌÉJK¸ÄÄ8&¦8ásA	:y0´Û·@IuBr¡,®À
I©P÷!$bB[jbe	Xe@¦Z
5#B|ñI)|'ml-[`@äè¡G+lü¡Á$BdP
ñ}M$äå+¦¥½EìA&U
ª

µðQ+¡âÓ©% 
--- NEW FILE: bugs_t.gif ---
GIF89a
R.nBNÆÊ¦]¦ªªb²¶¶n:.>N¦f
h>ª®ÂrvZ
jN2:
ÆvÊv:n^
)ajHÎzJ²¢R>F2¾ªnÒznzZVlDY^@Ö~@&¾NZÖÚ¾vJR8/.*ª®^"ÚrUU6L0ºº¢xnr.}Z¶2ÊÖ²2:&CF<&&!b[^VRV>&F>"rD¾Æ²vn:bV¾~_:Þ¡¦zA3rP$YcEJ\D @B/Ê¶5!nrZnvJN6VVBNSHÐÒ»ºzjrMhl\zV*"NNÀÂ¢N.®jz~V^X:fN.vf^s82®""7:.FJ2fnJH*n42-Z^Q¢¢6*wF¦¦RÊÎµ¤r.&ZnrN[^NZB^bHÎÆ¶»ÂzÒ~ÒÖ¾"ª¢nnJdD½rÞg?B:Z6:&;>7¢^ªjFJ6²²VZBNN.¾n"~J¢ª~76-jz~fÊzffjV¶¾¢zjÂv;>/zJGJAZ"nvOMV9uzV¶¶6*Zf:KNC^fF^bW:"¢n"b¬²¢Zr>¢rRZ:xZ.vÚÚÇÂÆ®UZ>FN2VjÎÎ®WZO®fnF
^¢bv~V~RJJ0¾¾£»¾ÞÞÊDF0~ÆÊ°9;%^:NB&¦®rvQSVLNR8R2"H2jnB²¶hP&rvfÎÎ¸jnMf@
ÂÂ©763:>
e¦¦zvvZb²nÊÊ±ªfbnF2*T2ºn²j¦ªbfFÆÆ«¦bB*^bRÖÖÂFB.ÿÿÿ!þ:Copyright (C) 2002 Portal Web Design. All Rights reserved.

8ßð!Q¢{WÅ;H8P	ðT£ÅÒiÅ³ó
Mð7®ð(Â($øzx^=à
--- NEW FILE: faq_b.gif ---
GIF89a
`2ç¬YäªXÜ¤UÌOv=bI&j
Å2Ö3Ô0ÕBÔEÏ'Í$Ì!ËÊ
É	È	ÇÇÇÈÊ'Ð<Õc*Ò>Ï.·)k
ÍO©~AkP)n
¿0Õ2Ó.Ô?Ó>Î&ÊÉ
ÈÒJ×i-Ñ:Ï'µ(m&cI&Ý¤UÏP®Cc32´-Ò-Ó@Ò?Ì#
É	ÈÈ	ÓN ×j.Ð6#q,Ý¥VÑQ¶Fm9*$Ô/Ñ+Ò=Ò:Ë!Ë&
ÒK×m/Ð5½%
GrU,g5¨}AÓRÂK¡x>C2kÑ*Ó=Ñ9Ê
Ì(ÔX%Øk/Ñ5Ä&,!wX.f5«BÁKåªXà§WÖ SÈM¥{@R= CÒ,Ð*Ð8Ì"
Ë Ï5Öa*Ùm1Ð1°%eD2{\0o9¬CÃKâ¨WÚ¢ToS+W"Ð*ÔBÑ9Î'Ò>Øf.Ùe.Ñ1³'_G%²EÆLæ«Yã©XÛ£U°D_1_&Ô.Ñ.ÕDÕF Ù\+Ùa.Ò1£&dJ&d4v=ÉNÞ¦VÓQ}]0_'Õ1Ô3ØK$ØK##£z?¼IØ¡Tß¦V±Dc3F	×5×4º/lP*¤z?½IÐPá¨Wt!Ú98fL'¾IC©0w"`G%a2¢y?ÒQu=k:mF$ÊNkA!yZ/t<´=Ç6Ò!ÖÛÜz[/q;ã¥Mà#ºHËOÝÝÝÝÝÝÝÝÝÝÝÝÝÝÝÝÝ!þ:Copyright (C) 2002 Portal Web Design. All Rights reserved.

,Z¶péâ&&D8ù&1dÊ9ÚJÏ.+Ô,0
lYã¤bÊ§ *«°Ò+¯À,³ÐR¶øqK)BdÐ=p@<Ð+. _&*.¢ä¢Ë.¼ôâK¿ÈCÀÃ@ZÂEtÐðªP3"Ð@BÌÈâ*ÊÇ-þiS1Ç L2Ê,s3Í8z%.`#Ø% ª*´
--- NEW FILE: faq_bh.gif ---
GIF89a
É	È	ÇÇÇÈÊ'Ð<Õc*Ò>Ï.·)l ×½±~pcPn
¿0Õ2Ó.Ô?Ó>Î&ÊÉ
ÈÒJ×i-Ñ:Ï'µ(n)g[JçË¥Ù¿¶¡{d2´-Ò-Ó@Ò?Ì#
É	ÈÈ	ÓN ×j.Ð6#r1èÌ¦ÛÁ¿¨n,' $Ô/Ñ+Ò=Ò:Ë!Ë&
ÒK×m/Ð5½%
H#xiUg°~ÞÃË³¨xF>2kÑ*Ó=Ñ9Ê
Ì(ÔX%Øk/Ñ5Ä&.)!|mY~g³Ê²ðÓ«ëÏ¨àÆ¡Ñ¸|VL>CÒ,Ð*Ð8Ì"
Ë Ï5Öa*Ùm1Ð1°%eG>3r\oµÌ´íÐ©äÉ£ugSY&Ð*ÔBÑ9Î'Ò>Øf.Ùe.Ñ1³'dXGº¤Ï¶ñÔ¬îÑªåÊ¤¸¢v``+Ô.Ñ.ÕDÕF Ù\+Ùa.Ò1£&
h\K|d¦wÓºéÍ§ÝÂs^a,Õ1Ô3ØK$ØK##«zÅâÇ¢êÎ§¹£zcF	×5×4º/qcQ¬{Æ®ÚÀìÐ©¾§t!Ú99k^MÇ¯¶ ©0w"eXHxaªzÜÁ¤vnD2qVCÔ»nO<p[£t¼ zÏ§oÖGÖÛÜq\ ríÊå¦LÃ¬Õ»ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ!þ:Copyright (C) 2002 Portal Web Design. All Rights reserved.

,Z¶péâ&&D8ù&1dÊ9¦ÚJÏ.+Ô,0
lYã¤bÊ§ *«°Ò+¯À,³ÐR¶øqK)BdÐ=p@<Ð+. _&*.¢ä¢Ë.¼ôâK¿ÈCÀÃ@ZÂEtÐðªP3"Ð@BÌÈâ*ÊÇ-þiS1Ç L2Ê,s3Í8z%.`#Ø% ª*´
--- NEW FILE: faq_t.gif ---
GIF89a
þ¦ZZ¶nb:úNV"nBúF²jz6
V*Ö~ö~B>
ZÆöv:¶j.¶6Úr6®.º6Ú^**ÖJ"²2Ò>ÖV&Ê&ÂrÎ.î^*þNÚÎ*R>ÖN"þª^Î6Ê"ÆvÚR&6"îb.þRf&òn6êV&Ún2þ²bÚ>Ö6ÊvÞNúFz"¢^Ê
FþRÒ~J*ÞBÚFÚ:òj2ú~>ÎzæN"Î2þ®^:"âF¦bÚb.úJ>
öBF*òr6æR&âJ"þ¢V.Þîf2ªfÊ
âBN.Ö2Ú6êZ*â>R.ÊzÚf.Ò.öz:Þ:îR&Ò&V
&ºnöf2úJêN"Ö*Ú2V2ÒzÖ.¾rúB~JÎ:æFör6Î
~&Új.æJ6úB¢.òb.êR&òf.®fön6þ®bþNV&ò^*Ò"Þ>Þ6ÆÖBzJ&Þ>úFZÒ2Âv2îZ*þ²fÖ>ªbÚZ*ÖR&ú>R2úv6®júv:îV&Ú6úz:þF&N®2¢b2ú~Bþ¢ZÆ
Î&Ò*Ò6Î"
¾nîN&Ö2J.ÚJ"¢2^6þVöj2rBÒ:þVÒ*ÚV&î^.þJâF"þRæN&òf2~6
"êV*úJÚ:òj6Þ:Î&Î"Ö6êN&æF"æJ"Ö>öz>Ú2òb22ÖN&Új2Ò>f&
F
ò^.úz>þJÒ6ÚV*ÝÝÝÝÝÝÝÝÝÝÝÝÝÝÝÝÝÝÝÝ!ù

	ôÈãApRË8<S
¡pÁC`ÂºØ
tÜp`
QØwß]ña~è7aNà L0JÚ<Á
7ÔPÓjªE)eF?H ±åta$Ó40¢8$(¢Õ<£+wpÈh1F%Ô
	$¯pH« ©4Ý:ó\p1¥»~Ãq4ÉÌà5$(à
{
:©8R"¡,òDÁS0ÃÌÁI`jFx0L	6»`K.â´X¬ZÆGÄ±!P+«2¸ZJÚ&Ô´R¹àÍ \AÎ ¬ãYDDý²
B
7ÃÈ$¬ô²
¥Xó+þ2ÏLØx-¸×: /B ÐÉh«MQ¨a°ç9OGw¯,Ñ«¾´Ö^!ºÃÆ(=!À
ziÃÎÇPõ¸[£0Ètßçc8ñ·oü
:lÐ/æcöÒo,@¸m¥oÌG÷ü®uÄCùÌG(°am@@Ö5.~ÉÉ0 P£Ôà÷ü/t¼ÁxÂs@B&*E
	Há´¢_µ6>òÝÂ<$9
a
u´AYð* CùÉ`dH}
Løï¡à%DXÂºhÃÈ 
--- NEW FILE: plugins_b.gif ---
GIF89a

ÂÂªâ&.22^¦ÂÊÒ6J`nbN.BZ
Þ¦VÆNªDf^Rz¶æªN:*nnbj¦¦~BFbzÂJòòîjjfæ®Zâ6."¶ÊRrr¶æ>îîäªÂvB:.Z~¢¢z>n®Nn~&,ºJBBB*:FVv¶º¢ââÖvZ.BZrv®¦¾ºÊNjâ¦VRnn´zZ.ÊÚâVv".6¢">VvZB"v>ÖR®ÆÒF6VvÒÞæræªZ¶Fª²¶"*ê®Z~^2¶F.:BFVbj6>VjÖÖÖ~¢ºJ6&6JnR->Zz®¶ÚâêZzr:Ú¢Vv¶b¦ªÂbF&vbFr¦B^~r²j:âªVÖ¢RFbÊÖÞB2Jfb2.&^~F^xr:Z^JJJFÖâêÚÞÞN:jª®B:Rn&b2VzÒRÊN²ÆÆN&&"j¦Jjn:*2>¶ÂÊ~J^nbª¦z>FbâªZ*..>Nf6FZ~¸ÂJr²"""ÒÚÞZz.>Lz¶".:Vr¦Âv>f®&"ZzªN*:Nª~BbJ&ºJZz¢ÎRNj":Nb2FZ®Â^~¢"&)Fb¾J2&j®n®RB*ÆÎÒöööææÚz^2ÞæîÎÚÞ&2>*>RÂN²FvºZvZvj².:J>VrB^>RrZ~¦:NlªÂ²ÆÒ*f¬Ö¢V~¢¾2BZZv&.2*6Ff¦>Rj®FzºRr¢zBn²r>B^r¶b6r¶Rn¦zB^~¦Nn¦Âr>Nj""ÿÿÿ!ù

<8±¨Ñ£HvñDVFå<Y¯*¼dç5£AQ üÙaOÞ@Æ(ùñÀ¥EB@&p´®Ý»?2âÔ	L:ô})£jIxðÆ9óX«uEÙËÂ7AâëÅÖBBéâMÚh[8å	2!´+çP=-2À¥H²2¼«¯%9}x.-°BéçÐr°¿^):ÐNvázLþWWÕµX±|ÿæÅ+<tØYò£DùÂ¸D2Ú¿Â.þ5HÑáÕ½TA=è®ÌaX=!ó=¾ðÃÏ)Fã
>ë±'<Ú à
9Ù§		8ç
&¸!LU{ Í¸t°!E8àxS¥°ÑM?³'(å×2Òhc§8~jã1iª©Ý#¨` ¦¬qÁEø"WÐO6Ø|S
Ì	0È;¡'<ÅrÉ
Ã9Ü jÀBÌ+¿¼.Mq(Ò
ÍOD/dt·c1HþÚ4Æev«·àR/ÔhÏ'Y<C>ùð!Å}@Ài¤@eh²O<UÌ
lC?ÕPc2c½tÀëL#ÇÄèwá
QÂ OÄòø6¦A$¼#NVô
¹Üs
 °C@»¨àÀZ**µ
¾f]ì×Þ0b®ê&ËÈº¼/$Ç[´bi¢Ë3|¨B.v¡[Q»H 1¨AP¢Nºµè9êWBV?»ô¡&b´ÏÍâ¹è5z!ÁxMÂè@&Ë\JÓTo^¼Kh5	jt¹È#®çKôb-}WäÐBDÑ]mqs" zO>5AFXâ EÁF,¶¥iÈRð}ñõ\è)<úQV>Ñá@
--- NEW FILE: plugins_bh.gif ---
GIF89a

Nn.>LfZJªÂòÒªv¶&6J.*#Ú¾".<B^~:RvRF:®zFb2FZÎÖÚ>VjrvrJfr^^~&*.¾¦ªzF^xn´rvbjªÞæî:RnæÊ¢.BZ~¢ºVzn®²ÆJjj*2:Öº¶ÂÊâÆ¢ÞÂ&"!¾¦RnFbÒ¶²~j¦&&&zvjZzVJ>6J`.6:z¶^¦Vr¦Â6Njf®Zz>Vtr¦Zz¢*:NæÊ¦NjrfTFB:ÊÚâ""®ÂÎÚÞ^~¢Fbv®êÎ¦²~Î²jj®öööºÊêÎªº¢vºÚâêZvZvj²n¢v*>RÚ¾B^&*2*6BZ~¦ªÂf¬"&*²ÆÒ>Rj:Nl²~¢¾Î¶ÂªZv.:FÊÖÞf¦*6F>Rr6FZ***.26.:NÒÚÞr¶n²zºr¶RrÊ²B^Rn^~¦º¢zfr¦Âÿÿÿ!þ:Copyright (C) 2002 Portal Web Design. All Rights reserved.

£"
DI11b¨¬±e'g¢+è¥8¤²
Öüa"{ôgÎl1Ä=¡°ÉÃ` \ÃK°É+°XØ[y¾Qâ))xaqT¢B{
OdDJ2Y1~@
$i`þÑiü
¸xé
´êBÀé* Û<ÔL#NUá?¨a!.öò>ø3;YÖ²E@§_º8¥Â;<í©ª9®CvpÐ¿ÌJ+5Þ2(YSMu\Òo¿}Ì²Á6ßäBûã	ÁmEºÐ´¯ %ÂgÛpÂ	'`âÅÃSC2]ØÏ;G±/ÚANÐ¡&
  0Ng2C¨Õù
?5«PÞaæ§È|{¸MÁÝ¹·^âP·+»B ñÃ®bBÐqH2c'°ÊÉ=æ8ÀRp&BCøÄ¦6H4à»V,¶>ºp`0øB5¬áZnãÅ=°1	cìÂ^
±ñ		ôoSõòÐ(T[íÂ]xGTã0Å1r°ç1aÒÓ.&1]LÀ1,D:îð¡'Àx±TàØ±rËlò
--- NEW FILE: plugins_t.gif ---
GIF89a
¢½¾Â¢2::rrb.2&®ªv~VRj~Àº¦"ÒÐÈpÆÎÐ®²ææØJVZª®NV7¶ºrJozTfNª¯¡^9~¢½ÆÆ²NJ:®ÃªÂÒZ2BN^nFÏÒ¶xD²nÞFZfîîæ^ÆÆª~²>VrZbR\xlx~ÊzÂvrvzzÂÂ£^nzµn¦ªz[~^¸º¶¶nBV¢ª:*
fj:fuÖÞævfjVO.f¦bv:ÒzÊÊ°Z:"*²®¦À.*pÖ×ÂÐÐÂÝæí~NÎÎµÎÂ®Âr²¶®¯RX@ÿÿÿ!þ:Copyright (C) 2002 Portal Web Design. All Rights reserved.

5ùÇã<Ò6VOë.ÈJäE¥nW->äÂ´ªÙ(ÐècsÉ«×aqòT
Ð6Ö¤]ëìâmLzàûô´4ð$2àå*Î[Eà¤v<JG!aL±x½ø
¦``^qÞFH[$5«Ú`@"¸pÆ¨þp°ÄÉ¸åâá¡ÜêÂyÂ±$	Ý¿ëåÁF¯^HÌ)l`@0*¯¨#$êèá}ì1
	(x§Y(t@:·DàÖ"IT-9ôòHHRÎ%¤³d8Õfñ¸	<À!^#	=/ãÅ9n]$`³G;âXÕ4~(Bf¶q6Ã¤Ydá J \cTi¥PÅM3l³:q éÅefÉ,Ù¤Î7Áq8<y×)=@ôáÆ(ôhC¬pH:Ë,¯TÑM?`°KtÜ¢FbþÀA*ÒJ
ØËÑd´ÂÏ,zúiÙd3j©ÝÔÂµè°îè0hq&kGÓÅ¶.¸°I¼ :tzY<¯¼ÂO²L(25Ë,ãÎ	ù¸CÛåwG¡Â/	&`ÁH î,I&±¤òó®²òÒk/¾tÐ1Å2	¤Ç>(üë5¨Pð±C!0LR1jl?îÖÂÍ²óÖ{o>ÄÐQO=TÇ<p'rG\aÎÉ¢P£8ºàÁ+êkêÍ·°Ì îð¬1Ð|ñ1CòñÑË=3s

¯
±¤ªì¼Ö´pBþÆ¯ÔòE,_-ö4$ãÏ*806ZvÐ
¼òjí¨c
'
Ô¡/>!R8
ºAÀì|äãk£0EvÁ?<8à¾èA

Index: contactinfo_b.gif
===================================================================
RCS file: /cvsroot/gaim/web/htdocs/images/halloween/navbar/contactinfo_b.gif,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
Binary files /tmp/cvsa0bKcJ and /tmp/cvs4k7xgi differ

Index: contactinfo_bh.gif
===================================================================
RCS file: /cvsroot/gaim/web/htdocs/images/halloween/navbar/contactinfo_bh.gif,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
Binary files /tmp/cvsxumawI and /tmp/cvsAUUhKg differ

Index: contactinfo_t.gif
===================================================================
RCS file: /cvsroot/gaim/web/htdocs/images/halloween/navbar/contactinfo_t.gif,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
Binary files /tmp/cvssY6B2J and /tmp/cvsEhrLNj differ

[Gaim-commits] CVS: web/htdocs/rob index.php,1.1.1.1,1.2

From: Christian H. <ch...@us...> - 2002-10-12 05:55:02

Update of /cvsroot/gaim/web/htdocs/rob
In directory usw-pr-cvs1:/tmp/cvs-serv5748/htdocs/rob

Modified Files:
	index.php 
Log Message:
Added a new style backend. It sucks. It works. Yay!


Index: index.php
===================================================================
RCS file: /cvsroot/gaim/web/htdocs/rob/index.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- index.php	26 Sep 2002 10:23:06 -0000	1.1.1.1
+++ index.php	12 Oct 2002 05:54:59 -0000	1.2
@@ -1,5 +1,5 @@
 <?php
-	require "html.inc.php";
+	require "base.inc.php";
 
 	start_html("Rob's Page");

[Gaim-commits] CVS: web/htdocs/eric gtk2.php,1.1.1.1,1.2 index.php,1.1.1.1,1.2 pixbuf.php,1.1.1.1,1.2 tricks.php,1.1.1.1,1.2

From: Christian H. <ch...@us...> - 2002-10-12 05:55:02

Update of /cvsroot/gaim/web/htdocs/eric
In directory usw-pr-cvs1:/tmp/cvs-serv5748/htdocs/eric

Modified Files:
	gtk2.php index.php pixbuf.php tricks.php 
Log Message:
Added a new style backend. It sucks. It works. Yay!


Index: gtk2.php
===================================================================
RCS file: /cvsroot/gaim/web/htdocs/eric/gtk2.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- gtk2.php	26 Sep 2002 10:23:05 -0000	1.1.1.1
+++ gtk2.php	12 Oct 2002 05:54:59 -0000	1.2
@@ -1,5 +1,5 @@
 <?php
-	require "html.inc.php";
+	require "base.inc.php";
 
 	start_html("Gtk 2.0");
 

Index: index.php
===================================================================
RCS file: /cvsroot/gaim/web/htdocs/eric/index.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- index.php	26 Sep 2002 10:23:05 -0000	1.1.1.1
+++ index.php	12 Oct 2002 05:54:59 -0000	1.2
@@ -1,5 +1,5 @@
 <?php
-	require "html.inc.php";
+	require "base.inc.php";
 
 	start_html("Eric's Page");
 

Index: pixbuf.php
===================================================================
RCS file: /cvsroot/gaim/web/htdocs/eric/pixbuf.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- pixbuf.php	26 Sep 2002 10:23:05 -0000	1.1.1.1
+++ pixbuf.php	12 Oct 2002 05:54:59 -0000	1.2
@@ -1,5 +1,5 @@
 <?php
-	require "html.inc.php";
+	require "base.inc.php";
 
 	start_html("GdkPixbuf Tests");
 

Index: tricks.php
===================================================================
RCS file: /cvsroot/gaim/web/htdocs/eric/tricks.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- tricks.php	26 Sep 2002 10:23:06 -0000	1.1.1.1
+++ tricks.php	12 Oct 2002 05:54:59 -0000	1.2
@@ -1,5 +1,5 @@
 <?php
-	require "html.inc.php";
+	require "base.inc.php";
 
 	start_html("Cool Gaim Tricks");

[Gaim-commits] CVS: web/htdocs contactinfo.php,1.1.1.1,1.2 cvs.php,1.1.1.1,1.2 documentation.php,1.1.1.1,1.2 downloads.php,1.1.1.1,1.2 faq.php,1.1.1.1,1.2 gdb.php,1.1.1.1,1.2 index.php,1.1.1.1,1.2 plugins.php,1.1.1.1,1.2 protocol.php,1.1.1.1,1.2 screenshots.php,1.2,1.3 shortcuts.php,1.2,1.3 statusicons.php,1.1.1.1,1.2

From: Christian H. <ch...@us...> - 2002-10-12 05:55:02

Update of /cvsroot/gaim/web/htdocs
In directory usw-pr-cvs1:/tmp/cvs-serv5748/htdocs

Modified Files:
	contactinfo.php cvs.php documentation.php downloads.php 
	faq.php gdb.php index.php plugins.php protocol.php 
	screenshots.php shortcuts.php statusicons.php 
Log Message:
Added a new style backend. It sucks. It works. Yay!


Index: contactinfo.php
===================================================================
RCS file: /cvsroot/gaim/web/htdocs/contactinfo.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- contactinfo.php	26 Sep 2002 10:21:58 -0000	1.1.1.1
+++ contactinfo.php	12 Oct 2002 05:54:59 -0000	1.2
@@ -1,5 +1,5 @@
 <?php
-	require "html.inc.php";
+	require "base.inc.php";
 
 	start_html("Contact Information");
 

Index: cvs.php
===================================================================
RCS file: /cvsroot/gaim/web/htdocs/cvs.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- cvs.php	26 Sep 2002 10:21:58 -0000	1.1.1.1
+++ cvs.php	12 Oct 2002 05:54:59 -0000	1.2
@@ -1,5 +1,5 @@
 <?php
-	require "html.inc.php";
+	require "base.inc.php";
 
 	start_html("CVS Information");
 

Index: documentation.php
===================================================================
RCS file: /cvsroot/gaim/web/htdocs/documentation.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- documentation.php	26 Sep 2002 10:21:58 -0000	1.1.1.1
+++ documentation.php	12 Oct 2002 05:54:59 -0000	1.2
@@ -1,5 +1,5 @@
 <?php
-	require "html.inc.php";
+	require "base.inc.php";
 
 	start_html("Documentation");
 

Index: downloads.php
===================================================================
RCS file: /cvsroot/gaim/web/htdocs/downloads.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- downloads.php	26 Sep 2002 10:21:58 -0000	1.1.1.1
+++ downloads.php	12 Oct 2002 05:54:59 -0000	1.2
@@ -1,5 +1,5 @@
 <?php
-	require "html.inc.php";
+	require "base.inc.php";
 
 	start_html("Downloads");
 

Index: faq.php
===================================================================
RCS file: /cvsroot/gaim/web/htdocs/faq.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- faq.php	26 Sep 2002 10:21:58 -0000	1.1.1.1
+++ faq.php	12 Oct 2002 05:54:59 -0000	1.2
@@ -1,5 +1,5 @@
 <?php
-	require "html.inc.php";
+	require "base.inc.php";
 
 	function build_section_name($section)
 	{

Index: gdb.php
===================================================================
RCS file: /cvsroot/gaim/web/htdocs/gdb.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- gdb.php	26 Sep 2002 10:21:59 -0000	1.1.1.1
+++ gdb.php	12 Oct 2002 05:54:59 -0000	1.2
@@ -1,5 +1,5 @@
 <?php
-	require "html.inc.php";
+	require "base.inc.php";
 
 	start_html("GDB Help");
 

Index: index.php
===================================================================
RCS file: /cvsroot/gaim/web/htdocs/index.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- index.php	26 Sep 2002 10:21:59 -0000	1.1.1.1
+++ index.php	12 Oct 2002 05:54:59 -0000	1.2
@@ -1,5 +1,5 @@
 <?php
-	require "html.inc.php";
+	require "base.inc.php";
 
 	start_html("News");
 

Index: plugins.php
===================================================================
RCS file: /cvsroot/gaim/web/htdocs/plugins.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- plugins.php	26 Sep 2002 10:22:03 -0000	1.1.1.1
+++ plugins.php	12 Oct 2002 05:54:59 -0000	1.2
@@ -1,5 +1,5 @@
 <?php
-	require "html.inc.php";
+	require "base.inc.php";
 
 	start_html("Plugins");
 

Index: protocol.php
===================================================================
RCS file: /cvsroot/gaim/web/htdocs/protocol.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- protocol.php	26 Sep 2002 10:22:03 -0000	1.1.1.1
+++ protocol.php	12 Oct 2002 05:54:59 -0000	1.2
@@ -1,5 +1,5 @@
 <?php
-	require "html.inc.php";
+	require "base.inc.php";
 
 	start_html("Protocols");
 

Index: screenshots.php
===================================================================
RCS file: /cvsroot/gaim/web/htdocs/screenshots.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- screenshots.php	26 Sep 2002 14:06:49 -0000	1.2
+++ screenshots.php	12 Oct 2002 05:54:59 -0000	1.3
@@ -1,5 +1,5 @@
 <?php
-	require "html.inc.php";
+	require "base.inc.php";
 
 	start_html("Screen Shots");
 

Index: shortcuts.php
===================================================================
RCS file: /cvsroot/gaim/web/htdocs/shortcuts.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- shortcuts.php	26 Sep 2002 13:05:11 -0000	1.2
+++ shortcuts.php	12 Oct 2002 05:54:59 -0000	1.3
@@ -1,5 +1,5 @@
 <?php
-	require "html.inc.php";
+	require "base.inc.php";
 
 	start_html("Shortcuts");
 

Index: statusicons.php
===================================================================
RCS file: /cvsroot/gaim/web/htdocs/statusicons.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- statusicons.php	26 Sep 2002 10:22:05 -0000	1.1.1.1
+++ statusicons.php	12 Oct 2002 05:54:59 -0000	1.2
@@ -1,5 +1,5 @@
 <?php
-	require "html.inc.php";
+	require "base.inc.php";
 
 	$statusicons = array(
 		"AIM" => array(

[Gaim-commits] CVS: web/htdocs/images/navbar bugs_b.gif,1.1.1.1,1.2 bugs_bh.gif,1.1.1.1,1.2 bugs_t.gif,1.1.1.1,1.2 contactinfo_b.gif,1.1.1.1,1.2 contactinfo_bh.gif,1.1.1.1,1.2 contactinfo_t.gif,1.1.1.1,1.2 plugins_b.gif,1.1.1.1,1.2 plugins_bh.gif,1.1.1.1,1.2 plugins_t.gif,1.1.1.1,1.2

From: Christian H. <ch...@us...> - 2002-10-12 05:47:00

Update of /cvsroot/gaim/web/htdocs/images/navbar
In directory usw-pr-cvs1:/tmp/cvs-serv3811

Modified Files:
	bugs_b.gif bugs_bh.gif bugs_t.gif contactinfo_b.gif 
	contactinfo_bh.gif contactinfo_t.gif plugins_b.gif 
	plugins_bh.gif plugins_t.gif 
Log Message:
Some new icons!


Index: bugs_b.gif
===================================================================
RCS file: /cvsroot/gaim/web/htdocs/images/navbar/bugs_b.gif,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
Binary files /tmp/cvsI0qG3U and /tmp/cvsuSoKYF differ

Index: bugs_bh.gif
===================================================================
RCS file: /cvsroot/gaim/web/htdocs/images/navbar/bugs_bh.gif,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
Binary files /tmp/cvsWM92GW and /tmp/cvsOiku7I differ

Index: bugs_t.gif
===================================================================
RCS file: /cvsroot/gaim/web/htdocs/images/navbar/bugs_t.gif,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
Binary files /tmp/cvsb04gkY and /tmp/cvsiH7EnM differ

Index: contactinfo_b.gif
===================================================================
RCS file: /cvsroot/gaim/web/htdocs/images/navbar/contactinfo_b.gif,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
Binary files /tmp/cvsMKAbzX and /tmp/cvsm4Ex0K differ

Index: contactinfo_bh.gif
===================================================================
RCS file: /cvsroot/gaim/web/htdocs/images/navbar/contactinfo_bh.gif,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
Binary files /tmp/cvsrLkQdZ and /tmp/cvsEwlIjO differ

Index: contactinfo_t.gif
===================================================================
RCS file: /cvsroot/gaim/web/htdocs/images/navbar/contactinfo_t.gif,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
Binary files /tmp/cvsuyyJCY and /tmp/cvskXWGjP differ

Index: plugins_b.gif
===================================================================
RCS file: /cvsroot/gaim/web/htdocs/images/navbar/plugins_b.gif,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
Binary files /tmp/cvsxhNxi0 and /tmp/cvsQ0abkQ differ

Index: plugins_bh.gif
===================================================================
RCS file: /cvsroot/gaim/web/htdocs/images/navbar/plugins_bh.gif,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
Binary files /tmp/cvso47xY1 and /tmp/cvsOWZWFT differ

Index: plugins_t.gif
===================================================================
RCS file: /cvsroot/gaim/web/htdocs/images/navbar/plugins_t.gif,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
Binary files /tmp/cvsjXvVd1 and /tmp/cvsS7iOjS differ

[Gaim-commits] CVS: gaim/src aim.c,1.203,1.204

From: Rob F. <rob...@us...> - 2002-10-12 04:54:35

Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv26215

Modified Files:
	aim.c 
Log Message:
This looks better.



Index: aim.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/aim.c,v
retrieving revision 1.203
retrieving revision 1.204
diff -u -d -r1.203 -r1.204
--- aim.c	12 Oct 2002 01:30:44 -0000	1.203
+++ aim.c	12 Oct 2002 04:54:31 -0000	1.204
@@ -232,6 +232,7 @@
 	GtkWidget *button;
 	GtkWidget *hbox;
 	GtkWidget *label;
+	GtkWidget *vbox2;
 	GList *tmp;
 
 	/* Do we already have a main window opened? If so, bring it back, baby... ribs... yeah */
@@ -264,9 +265,12 @@
 	image = gaim_pixmap(NULL, "logo.png");
 	gtk_box_pack_start(GTK_BOX(vbox), image, FALSE, FALSE, 0);
 
+	vbox2 = gtk_vbox_new(FALSE, 0);
+	gtk_container_set_border_width(GTK_CONTAINER(vbox2), 5);
+
 	label = gtk_label_new(_("Screen Name:"));
 	gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
-	gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
+	gtk_box_pack_start(GTK_BOX(vbox2), label, FALSE, FALSE, 0);
 
 	name = gtk_combo_new();
 	tmp = combo_user_names();
@@ -276,16 +280,21 @@
 			   GTK_SIGNAL_FUNC(doenter), mainwindow);
 	gtk_signal_connect(GTK_OBJECT(GTK_COMBO(name)->entry), "changed",
 			   GTK_SIGNAL_FUNC(combo_changed), name);
-	gtk_box_pack_start(GTK_BOX(vbox), name, FALSE, TRUE, 0);
+	gtk_box_pack_start(GTK_BOX(vbox2), name, FALSE, TRUE, 0);
+	gtk_box_pack_start(GTK_BOX(vbox), vbox2, FALSE, TRUE, 0);
+
+	vbox2 = gtk_vbox_new(FALSE, 0);
+	gtk_container_set_border_width(GTK_CONTAINER(vbox2), 5);
 
 	label = gtk_label_new(_("Password:"));
 	gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
-	gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
+	gtk_box_pack_start(GTK_BOX(vbox2), label, FALSE, FALSE, 0);
 
 	pass = gtk_entry_new();
 	gtk_entry_set_visibility(GTK_ENTRY(pass), FALSE);
 	gtk_signal_connect(GTK_OBJECT(pass), "activate", GTK_SIGNAL_FUNC(doenter), mainwindow);
-	gtk_box_pack_start(GTK_BOX(vbox), pass, FALSE, TRUE, 0);
+	gtk_box_pack_start(GTK_BOX(vbox2), pass, FALSE, TRUE, 0);
+	gtk_box_pack_start(GTK_BOX(vbox), vbox2, FALSE, TRUE, 0);
 
 	/* Now for the button box */
 	hbox = gtk_hbox_new(TRUE, 0);

[Gaim-commits] CVS: gaim ChangeLog,1.564,1.565

From: Rob F. <rob...@us...> - 2002-10-12 02:27:14

Update of /cvsroot/gaim/gaim
In directory usw-pr-cvs1:/tmp/cvs-serv693

Modified Files:
	ChangeLog 
Log Message:
hmm



Index: ChangeLog
===================================================================
RCS file: /cvsroot/gaim/gaim/ChangeLog,v
retrieving revision 1.564
retrieving revision 1.565
diff -u -d -r1.564 -r1.565
--- ChangeLog	11 Oct 2002 17:35:23 -0000	1.564
+++ ChangeLog	12 Oct 2002 02:27:10 -0000	1.565
@@ -27,6 +27,7 @@
 	* Updated desktop and window icons (Thanks Robert McQueen)
 	* GTK2 Goodness:
 		- Preferences dialog
+		- SignOn Screen
 		- GtkIMHtml (Ari Pollak, Christian Hammond)
 		- Buddy Icons
 		- IM Images

[Gaim-commits] CVS: gaim/pixmaps Makefile.am,1.81,1.82

From: Rob F. <rob...@us...> - 2002-10-12 01:33:13

Update of /cvsroot/gaim/gaim/pixmaps
In directory usw-pr-cvs1:/tmp/cvs-serv22502/pixmaps

Modified Files:
	Makefile.am 
Log Message:
Oops



Index: Makefile.am
===================================================================
RCS file: /cvsroot/gaim/gaim/pixmaps/Makefile.am,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -d -r1.81 -r1.82
--- Makefile.am	12 Oct 2002 01:30:43 -0000	1.81
+++ Makefile.am	12 Oct 2002 01:33:10 -0000	1.82
@@ -109,7 +109,7 @@
 gaimdialogpix_DATA = gaim_error.png gaim_info.png gaim_question.png gaim_warning.png 
 
 gaimdistpixdir = $(datadir)/pixmaps/gaim
-gaimdistpix_DATA = away.png connect.png msgpend.png offline.png online.png msgunread.png 
+gaimdistpix_DATA = away.png connect.png msgpend.png offline.png online.png msgunread.png logo.png
 
 distpixmapdir = $(datadir)/pixmaps
 distpixmap_DATA = gaim.png

[Gaim-commits] CVS: gaim/src aim.c,1.202,1.203 dialogs.c,1.345,1.346 gaim.h,1.342,1.343 prefs.c,1.258,1.259 ui.h,1.61,1.62 util.c,1.137,1.138

From: Rob F. <rob...@us...> - 2002-10-12 01:30:47

Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv22002/src

Modified Files:
	aim.c dialogs.c gaim.h prefs.c ui.h util.c 
Log Message:
Really, I think this is a lot prettier.



Index: aim.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/aim.c,v
retrieving revision 1.202
retrieving revision 1.203
diff -u -d -r1.202 -r1.203
--- aim.c	11 Oct 2002 03:13:57 -0000	1.202
+++ aim.c	12 Oct 2002 01:30:44 -0000	1.203
@@ -224,62 +224,49 @@
 	return tmp;
 }
 
-
 void show_login()
 {
-	GtkWidget *signon_all;
-	GtkWidget *options;
-	GtkWidget *plugs;
-#ifndef NO_MULTI
-	GtkWidget *accts;
-#endif
-	GtkWidget *signon;
-	GtkWidget *cancel;
-	GtkWidget *reg;
-	GtkWidget *bbox;
+	GdkPixbuf *icon;
+	GtkWidget *image;
+	GtkWidget *vbox;
+	GtkWidget *button;
 	GtkWidget *hbox;
-	GtkWidget *sbox;
 	GtkWidget *label;
-	GtkWidget *table;
-
-	GtkWidget *pmw;
-	GdkPixmap *pm;
-	GtkStyle *style;
-	GdkBitmap *mask;
-
 	GList *tmp;
 
+	/* Do we already have a main window opened? If so, bring it back, baby... ribs... yeah */
 	if (mainwindow) {
-		gtk_window_present(GTK_WINDOW(mainwindow));
-		return;
+			gtk_window_present(GTK_WINDOW(mainwindow));
+			return;
 	}
 
 	mainwindow = gtk_window_new(GTK_WINDOW_TOPLEVEL);
 
 	gtk_window_set_wmclass(GTK_WINDOW(mainwindow), "login", "Gaim");
 	gtk_window_set_policy(GTK_WINDOW(mainwindow), FALSE, FALSE, TRUE);
-	gtk_signal_connect(GTK_OBJECT(mainwindow), "delete_event",
-			   GTK_SIGNAL_FUNC(cancel_logon), mainwindow);
 	gtk_window_set_title(GTK_WINDOW(mainwindow), _("Gaim - Login"));
 	gtk_widget_realize(mainwindow);
 	gdk_window_set_group(mainwindow->window, mainwindow->window);
+	gtk_container_set_border_width(GTK_CONTAINER(mainwindow), 5);
+	gtk_signal_connect(GTK_OBJECT(mainwindow), "delete_event", 
+					GTK_SIGNAL_FUNC(cancel_logon), mainwindow);
 
-	table = gtk_table_new(8, 2, FALSE);
-	gtk_container_add(GTK_CONTAINER(mainwindow), table);
-	gtk_widget_show(table);
 
-	style = gtk_widget_get_style(mainwindow);
-	pm = gdk_pixmap_create_from_xpm_d(mainwindow->window, &mask,
-					  &style->bg[GTK_STATE_NORMAL], (gchar **)gaim_logo_xpm);
-	pmw = gtk_pixmap_new(pm, mask);
-	gtk_table_attach(GTK_TABLE(table), pmw, 0, 2, 0, 1, 0, 0, 5, 5);
-	gtk_widget_show(pmw);
-	gdk_pixmap_unref(pm);
-	gdk_bitmap_unref(mask);
+	icon = gaim_pixbuf(NULL, "gaim.png");
+	if (icon) {
+			gtk_window_set_icon(GTK_WINDOW(mainwindow), icon);
+			gdk_pixbuf_unref(icon);
+	}
 
-	label = gtk_label_new(_("Screen Name: "));
-	gtk_table_attach(GTK_TABLE(table), label, 0, 1, 2, 3, 0, 0, 5, 5);
-	gtk_widget_show(label);
+	vbox = gtk_vbox_new(FALSE, 0);
+	gtk_container_add(GTK_CONTAINER(mainwindow), vbox);
+
+	image = gaim_pixmap(NULL, "logo.png");
+	gtk_box_pack_start(GTK_BOX(vbox), image, FALSE, FALSE, 0);
+
+	label = gtk_label_new(_("Screen Name:"));
+	gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
+	gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
 
 	name = gtk_combo_new();
 	tmp = combo_user_names();
@@ -289,92 +276,47 @@
 			   GTK_SIGNAL_FUNC(doenter), mainwindow);
 	gtk_signal_connect(GTK_OBJECT(GTK_COMBO(name)->entry), "changed",
 			   GTK_SIGNAL_FUNC(combo_changed), name);
-	gtk_widget_set_usize(name, 100, 0);
-	gtk_table_attach(GTK_TABLE(table), name, 1, 2, 2, 3, 0, 0, 5, 5);
-	gtk_widget_show(name);
+	gtk_box_pack_start(GTK_BOX(vbox), name, FALSE, TRUE, 0);
 
-	label = gtk_label_new(_("Password: "));
-	gtk_table_attach(GTK_TABLE(table), label, 0, 1, 3, 4, 0, 0, 5, 5);
-	gtk_widget_show(label);
+	label = gtk_label_new(_("Password:"));
+	gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
+	gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
 
 	pass = gtk_entry_new();
-	gtk_widget_set_usize(pass, 100, 0);
 	gtk_entry_set_visibility(GTK_ENTRY(pass), FALSE);
 	gtk_signal_connect(GTK_OBJECT(pass), "activate", GTK_SIGNAL_FUNC(doenter), mainwindow);
-	gtk_table_attach(GTK_TABLE(table), pass, 1, 2, 3, 4, 0, 0, 5, 5);
-	gtk_widget_show(pass);
-
-	sbox = gtk_vbox_new(TRUE, 5);
-	gtk_container_border_width(GTK_CONTAINER(sbox), 10);
-	gtk_table_attach(GTK_TABLE(table), sbox, 0, 2, 7, 8, 0, 0, 5, 5);
-	gtk_widget_show(sbox);
-
-	bbox = gtk_hbox_new(TRUE, 10);
-	gtk_box_pack_start(GTK_BOX(sbox), bbox, TRUE, TRUE, 0);
-	gtk_widget_show(bbox);
-
-	cancel = gtk_button_new_with_label(_("Quit"));
-#ifndef NO_MULTI
-	accts = gtk_button_new_with_label(_("Accounts"));
-#endif
-	signon = gtk_button_new_with_label(_("Signon"));
-
-	if (misc_options & OPT_MISC_COOL_LOOK) {
-		gtk_button_set_relief(GTK_BUTTON(cancel), GTK_RELIEF_NONE);
-#ifndef NO_MULTI
-		gtk_button_set_relief(GTK_BUTTON(accts), GTK_RELIEF_NONE);
-#endif
-		gtk_button_set_relief(GTK_BUTTON(signon), GTK_RELIEF_NONE);
-	}
+	gtk_box_pack_start(GTK_BOX(vbox), pass, FALSE, TRUE, 0);
 
-	gtk_signal_connect(GTK_OBJECT(cancel), "clicked", GTK_SIGNAL_FUNC(cancel_logon), mainwindow);
-#ifndef NO_MULTI
-	gtk_signal_connect(GTK_OBJECT(accts), "clicked", GTK_SIGNAL_FUNC(account_editor), mainwindow);
-#endif
-	gtk_signal_connect(GTK_OBJECT(signon), "clicked", GTK_SIGNAL_FUNC(dologin), mainwindow);
+	/* Now for the button box */
+	hbox = gtk_hbox_new(TRUE, 0);
+	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 5);
 
-	gtk_box_pack_start(GTK_BOX(bbox), cancel, TRUE, TRUE, 0);
-#ifndef NO_MULTI
-	gtk_box_pack_start(GTK_BOX(bbox), accts, TRUE, TRUE, 0);
-#endif
-	gtk_box_pack_start(GTK_BOX(bbox), signon, TRUE, TRUE, 0);
+	/* And now for the buttons */
+	button = gaim_pixbuf_button("Accounts", "accounts.png", GAIM_BUTTON_VERTICAL);
+	gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
+	gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(account_editor), mainwindow);
+	gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
 
-	gtk_widget_show(cancel);
-#ifndef NO_MULTI
-	gtk_widget_show(accts);
+#ifdef NO_MULTI
+	gtk_widget_set_sensitive(GTK_WIDGET(button), FALSE);
 #endif
-	gtk_widget_show(signon);
-
-	hbox = gtk_hbox_new(TRUE, 10);
-	gtk_box_pack_start(GTK_BOX(sbox), hbox, TRUE, TRUE, 0);
-	gtk_widget_show(hbox);
-
-	reg = gtk_button_new_with_label(_("Auto-login"));
-	options = gtk_button_new_with_label(_("Options"));
-	plugs = gtk_button_new_with_label(_("About"));
-	if (misc_options & OPT_MISC_COOL_LOOK) {
-		gtk_button_set_relief(GTK_BUTTON(reg), GTK_RELIEF_NONE);
-		gtk_button_set_relief(GTK_BUTTON(options), GTK_RELIEF_NONE);
-		gtk_button_set_relief(GTK_BUTTON(plugs), GTK_RELIEF_NONE);
-	}
-
-	gtk_signal_connect(GTK_OBJECT(reg), "clicked", GTK_SIGNAL_FUNC(dologin_all), NULL);
-	gtk_signal_connect(GTK_OBJECT(options), "clicked", GTK_SIGNAL_FUNC(show_prefs), NULL);
-	gtk_signal_connect(GTK_OBJECT(plugs), "clicked", GTK_SIGNAL_FUNC(show_about), NULL);
-	gtk_box_pack_start(GTK_BOX(hbox), plugs, TRUE, TRUE, 0);
 
-	gtk_box_pack_start(GTK_BOX(hbox), options, TRUE, TRUE, 0);
-	gtk_box_pack_start(GTK_BOX(hbox), reg, TRUE, TRUE, 0);
+	button = gaim_pixbuf_button("Settings", "preferences.png", GAIM_BUTTON_VERTICAL);
+	gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
+	gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(show_prefs), mainwindow);
+	gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
 
-	gtk_widget_show(reg);
-	gtk_widget_show(options);
-	gtk_widget_show(plugs);
+	button = gaim_pixbuf_button("Sign On", "signon.png", GAIM_BUTTON_VERTICAL);
+	gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
+	gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(dologin), mainwindow);
+	gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
 
+	/* Now grab the focus that we need */
 	if (aim_users) {
 		struct aim_user *c = (struct aim_user *)aim_users->data;
 		if (c->options & OPT_USR_REM_PASS) {
 			combo_changed(NULL, name);
-			gtk_widget_grab_focus(signon);
+			gtk_widget_grab_focus(button);
 		} else {
 			gtk_widget_grab_focus(pass);
 		}
@@ -382,7 +324,9 @@
 		gtk_widget_grab_focus(name);
 	}
 
-	gtk_widget_show(mainwindow);
+	/* And raise the curtain! */
+	gtk_widget_show_all(mainwindow);
+
 }
 
 #if HAVE_SIGNAL_H

Index: dialogs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/dialogs.c,v
retrieving revision 1.345
retrieving revision 1.346
diff -u -d -r1.345 -r1.346
--- dialogs.c	11 Oct 2002 03:13:58 -0000	1.345
+++ dialogs.c	12 Oct 2002 01:30:44 -0000	1.346
@@ -106,6 +106,7 @@
 static GtkWidget *rename_dialog = NULL;
 static GtkWidget *rename_bud_dialog = NULL;
 
+
 struct confirm_del {
 	GtkWidget *window;
 	GtkWidget *label;
@@ -4582,12 +4583,18 @@
 
 #endif /* USE_PERL */
 
-GtkWidget *pixbuf_button(char *text, char *iconfile)
+GtkWidget *gaim_pixbuf_button(char *text, char *iconfile, GaimButtonStyle style)
 {
 	GtkWidget *button, *image, *label, *bbox;
 	button = gtk_button_new();
-	bbox = gtk_hbox_new(FALSE, 5);
+
+	if (style == GAIM_BUTTON_HORIZONTAL)
+			bbox = gtk_hbox_new(FALSE, 5);
+	else
+			bbox = gtk_vbox_new(FALSE, 0);
+
 	gtk_container_add (GTK_CONTAINER(button), bbox);
+
 	if (iconfile) {
 		char *filename;
 		filename = g_build_filename (DATADIR, "pixmaps", "gaim", "buttons", iconfile, NULL);
@@ -4596,6 +4603,7 @@
 		gtk_box_pack_start(GTK_BOX(bbox), image, FALSE, FALSE, 0);
 		g_free(filename);
 	}
+	
 	if (text) {
 		label = gtk_label_new(NULL);
 		gtk_label_set_text_with_mnemonic(GTK_LABEL(label), text);

Index: gaim.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gaim.h,v
retrieving revision 1.342
retrieving revision 1.343
diff -u -d -r1.342 -r1.343
--- gaim.h	11 Oct 2002 14:19:15 -0000	1.342
+++ gaim.h	12 Oct 2002 01:30:44 -0000	1.343
@@ -155,6 +155,8 @@
 
 #define DEFAULT_INFO "Visit the Gaim website at <A HREF=\"http://gaim.sourceforge.net/\">http://gaim.sourceforge.net/</A>."
 
+
+
 enum log_event {
 	log_signon = 0,
 	log_signoff,

Index: prefs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/prefs.c,v
retrieving revision 1.258
retrieving revision 1.259
diff -u -d -r1.258 -r1.259
--- prefs.c	11 Oct 2002 03:13:59 -0000	1.258
+++ prefs.c	12 Oct 2002 01:30:44 -0000	1.259
@@ -1432,7 +1432,7 @@
 
 	gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
 
-	button = pixbuf_button(_("_Edit"), "edit.png");
+	button = gaim_pixbuf_button(_("_Edit"), "edit.png", GAIM_BUTTON_HORIZONTAL);
 	gtk_size_group_add_widget(sg, button);
 	gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(create_away_mess), event_view);
 	gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);

Index: ui.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/ui.h,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- ui.h	6 Oct 2002 05:01:49 -0000	1.61
+++ ui.h	12 Oct 2002 01:30:44 -0000	1.62
@@ -67,6 +67,12 @@
 #define GAIM_WARNING 2
 #define GAIM_INFO 3
 
+typedef enum {
+		GAIM_BUTTON_HORIZONTAL,
+		GAIM_BUTTON_VERTICAL
+} GaimButtonStyle;
+
+
 struct debug_window {
 	GtkWidget *window;
 	GtkWidget *entry;
@@ -450,7 +456,7 @@
 extern void load_perl_script();
 extern GtkWidget *picture_button(GtkWidget *, char *, char **);
 extern GtkWidget *picture_button2(GtkWidget *, char *, char **, short);
-extern GtkWidget *pixbuf_button(char *, char *);
+extern GtkWidget *gaim_pixbuf_button(char *, char *, GaimButtonStyle);
 extern int file_is_dir(const char *, GtkWidget *);
 extern void update_privacy_connections();
 extern void show_privacy_options();
@@ -496,5 +502,9 @@
 /* Functions in sound.c */
 extern void play_sound(int);
 extern void play_file(char *);
+
+/* Fucnctions in util.c */
+extern GtkWidget *gaim_pixmap(char *, char *);
+extern GdkPixbuf *gaim_pixbuf(char *, char *);
 
 #endif /* _UI_H_ */

Index: util.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/util.c,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -d -r1.137 -r1.138
--- util.c	11 Oct 2002 14:19:17 -0000	1.137
+++ util.c	12 Oct 2002 01:30:44 -0000	1.138
@@ -1409,3 +1409,44 @@
 	
 	return NULL;
 }
+
+GtkWidget *gaim_pixmap(char *subdir, char *iconfile) {
+		char *filename;
+		GtkWidget *image;
+
+		if (subdir != NULL)
+				filename = g_build_filename (DATADIR, "pixmaps", "gaim", subdir, iconfile, NULL);
+		else
+				filename = g_build_filename (DATADIR, "pixmaps", "gaim", iconfile, NULL);
+
+		debug_printf("Loading: %s\n", filename);
+
+		image = gtk_image_new_from_file(filename);
+
+		g_free(filename);
+
+		return image;
+}
+
+GdkPixbuf *gaim_pixbuf(char *subdir, char *iconfile) {
+		char *filename;
+		GdkPixbuf *pixbuf;
+		GError *err = NULL;
+
+		if (subdir != NULL)
+				filename = g_build_filename (DATADIR, "pixmaps", "gaim", subdir, iconfile, NULL);
+		else
+				filename = g_build_filename (DATADIR, "pixmaps", "gaim", iconfile, NULL);
+
+		debug_printf("Loading: %s\n", filename);
+
+		pixbuf = gdk_pixbuf_new_from_file(filename, &err);
+		if (!pixbuf) {
+				/* FIXME: Maybe we should handle this error */
+				g_error_free(err);
+		}
+
+		g_free(filename);
+
+		return pixbuf;
+}

[Gaim-commits] CVS: gaim/pixmaps accounts.png,NONE,1.1 logo.png,NONE,1.1 preferences.png,NONE,1.1 signon.png,NONE,1.1 Makefile.am,1.80,1.81

From: Rob F. <rob...@us...> - 2002-10-12 01:30:46

Update of /cvsroot/gaim/gaim/pixmaps
In directory usw-pr-cvs1:/tmp/cvs-serv22002/pixmaps

Modified Files:
	Makefile.am 
Added Files:
	accounts.png logo.png preferences.png signon.png 
Log Message:
Really, I think this is a lot prettier.



--- NEW FILE: accounts.png ---
PNG


¨	!¤za¤)ÒÂvÿæïÌm)Q®ü7'Ì¼ïûó}ßøB6ç
4/ôl[·2éÞÁtH^ARö¹±Ë<³£7ðøÆM
åSÅýu¯rJÙÛäÇXßµÆLvtðÍ¯îeY÷î`ßÁ¨vÀ0Ìý+îÐTG¸Dõ ¥b1²fõ/ÄeºL;ô71U°È+³*æAî5MÅ¬äÉþÁÎÞ"zã
>ZZ´t:M2Äó|Z[[D"LdKõ0J@A×ÃèºN4äÌO?STøíÄ1[º/ ù¾ÇÍÉmqR©¥Zß
²°©ñîLùäS§Sô½²Ïò=÷eàOà`Õ
F¦ø[63@yÈ¿Ó¤ 2k>r
--- NEW FILE: logo.png ---
PNG


,+w¯?
*{È$d&ËìsÏïsïd&lùð×³Þ9ÏyÎ³í·Ã@rØ1¬ÿøyþ·BÎÆ-ÃØ¶0þÅQ	°gãñÌ.ýiÛÙÍñþ7pßÿF+GútA1 tôQTcõªÿÇòÇÎ¦¨0Í(w(½%¢ÿDX°÷ãÃ=Ã	è@dè
D)/MqñDÖ¬õQWgRvÝj*?ÍÍ£(BTÇ:ä>À@ãÿV*ÿBV;Ò§°pÌTÿiÂd
ÉgMuuõúÞåE?ÔÕè(9&øùÜB3mzëº¨^Û"þ\òBí9n
Ó_^dÓXSÝØÇ³0Û'½$åóÆR\ä4c~ßð£ ÏË¼ò|mñ&
F{ÞÀeU¦
@mËÅÔÕmåÅ·Îç¥d»·hä°{È0Dd. óÇSTä¢bá*Mg~yI5½uí,]¶¥ËÖ§«û¥Ê	Ì¢ £ÏË§bÑtÜxr¿#|àÁu,]¶ºú`R=Ç¿Ts(*Êd~ygP±h+¶±ø÷1³^S>¯PÕ[4ùå,¾ä*«6\,ì"æëãYt°tÙû,]¶ÑøKÜcpÿ½eÉ½wpo];UÛ¸ù¶·é&¨á)óä8dÜ¸|¾yé³7cÙã·¢¹Àâì]#íûòxS¿øÝy|¼e'
¾ë}ÌÃC $óhL@Ã¨ú£WV½OeÕ{@¢¢l*Èüò	)©ö²tÙZ
³_^ÂÜ/ùÝþpaÜtC9Kn<}@#öÖu°àÊ$b2Ç®Ú,*Lã{Ït*Û«~å-Æ8!W,DÅÂ©eõI /yÊª÷)*r°zÕMçìwªg@F `ùcQ±höAÌo8) ÀñSÞæÂ/~ËÎ¹·Ý+í#EH6þeÁX<OçÝ¹çÿáõµçãx@HæñÅÜ5C@¢";Ëû*óËË
Äh5^².ý^ïÞ^=-8åNêê¢IõFÏ1°PWçíE¸åsÇÐ
=m?aæ-p)Hùk$Cà8×ÊÆOdBÙqßáÇAR÷ã4tFµüJ%tÖ¯«kÒ
"È2Ül²P;«ÊÊçûèÉÄ]ì]ÇÔÞ)ÏâKaÉ/¢g0J½Dgôã´^}T,I`3éMôgbIõ@ª'\ª^té/ÈN"öãÚX¤²ò¹zUïô½Q`HWó«J_qq¦ªüP! §}Nû6N?N§lìêîCSn+ø_f÷þ§6À ²ÉªîÁî;).Ð£ár]}FÆNa,;È>2;\ÔÂv ¸Ð¤¡Üv¬ÔÕÅvÌièWLµ]ÔÕíégÆ8
1 K-lÙ?]O¼D9ÓèæL=ê	à6Æn©EÒ3P½v}j=¬Iõlª/UD.c@
vh¡'@è8v×ç²³ÂÑ)]ÿpcÉüMmÈ
"nh´þÓ	i$¸ª£×_Þù8BáÚ¹2é"ÁØ3
0 Ô£G ÒzÆ¡H÷»[~Hå·(>¬Ò6«Ê#Ù°[£DcÅGdà!(,¨EÂc¨ru R]½%7U
½s!$;ñGP)³R3Ï+¥rE=ÝD¨'ÕR±è4?ñóCæQèíÎ]õNÜþEâT%C$SqIýÛ}ªW¾Áÿw5»66ì£Gçpë·®ç3N£$[yÅ»rO¡v÷.Þþ`¦58ÄsO÷3 Ìý÷~#¥DÅ¢S]Ír£1C="kS¼õ^ß¯éá³äÆ(W@rÀÒ¹ÿÞ¯°ü³äæ»0þ^ýÕûyß&pý¨¿Áhw´6eÖdéç'´RV`ôà¢%*xêå<xJ°|Ãùè¹lSâ!"ûAúl9ÄâùÄâùì¨¿»},Kî[Ì«n''ãiN²^÷þòËré~ÍÄüp¦UãL«fâØïrÛÈµ	m£1öøãw)éè%;A¶÷
R[þøÕx½>ª×ÖÒ·Å| ^o+¶S½¶!©n{É5½ýÊÿãB.[KåÍ¤bá\nºáT@§¸ä,êêvðÀý?è1ô8äD$ñ/IQQ~J¢"Ó4pP¯0îP
Óý`úÊÑ÷"**tJ¾½-æh$Lg~ÐâkâµW%;kViå´³[ÜIóÄ Ãáâ:o5»u^~óÿXõÆ^¼^+662W|ãrÎ·ÜQùd8Wöê'«ÐÆEÏ3O>Ëî½$ä¨#Ø5äfõ ¨YÑÃgp¨\±%·¬¤®®Ø²Îè£ûï»%K®Üoý>ÇÍ·,Z@vôòl¨¬úÊÛP	DÚ©®®¡|^óËs¨óî¤¼¼EgR\<&µÝ« @AQQK|n8ººZ¥U\TÞK&ózý,]ö.uõA²Xºì]Êçe°?5ÎíÅ¨»uÄm5G-Èf¤¾9¥Þj/+¶QW¤|ÞXn¾m5S2iBÆ@n@ Þ¥nnx!\VpefòøFÎûìXôZüP»wûvàmo_+þ@'8}ÎN?ÝÃ¢/´åIVpôÜ8Ôÿ_[s-üù<ñÊ}ÆßF©Ã+3"!EmZH/È=¦±ü_1~ÿ¡×Åêzò*p°äa¸ÿþï±ä¦Ë{ÕñzÛ¸ùÖ'¨¬ZÒG7!}Üo?/YAeÕz*M`ùcû'ÐdTVmfñ%¡æ'¸°ý|+¶!÷57¹Gm04#ã½]´Rú´ÿÁyAtÃº
Õ¦Ýé!3]"ã~ÒÒ«È@ÊVÜ®BÖ	@m4ÅãË0ÎÁ)c5¦ÍOnÖnõ½ëM£Ýyb~×^zm(&6$$G2ì°ÁZ)*³ü±ë?:
½½ë³üà¯ðÈó?##Eö ç54!%©¼e
UH]æ.ÝsïË^l
Ap$ócídÉ0eÓÿ/B$ÃWN:(/RRYd£®c¤ãÚ_Äupøâk3*ÔÀñ?aRþsÊd1§äA$|õ¸Í2ÔYòÕ¼O>æ!¢_üW^0Äí!Ad·í«Où¶¨0nukrä¨Ú¾ß{WV}BïEÓ×Qëð»?Ï+õTOp»ÝÎ1Çh8â¤Y%iÖýKcø®pfHN8nì°µ?Pb¦UÅYª«?HXÔWÖõS}èºCÏ¿(µäÒ!ûo á0<@JMÝr#×v&êLXæT
þ/ñ;¬[()ÛË¤²TF÷Ãá{7HBJæ,JóµôÁÇßÎ//¦báDzÓ¦@nÚÌ|àAÜ¬~ë÷6_üG¿Z):b Uî
Oc&´¨ôHyÈ¸@êópÀôÓ½ýa+ÔWía¬\úàãÊ-ÇÀòÇ.¤baÝ*Þd±ÄDÙA*Ãê7Iqñh#üü7T®ØªÚ?zok/å»ÿ¶âHAÙâ÷Eºe'3&E=ÃKÿ8A8»ë³	ÄÓXzýdCML©Î3ç½Îì«oFþ|+4Yê ¯`eñEwðÀÒî\ÞË»Õ«*¨XXJQ¡niåó<ÜtÃljwþåß@qqkª?aÁ)wDa¨ÅïMtG"Fr¡Ù;RöôÓN%)""·ª[ÙQÛHÍ¦1Ãr(ÆºÇõ}ÝHaÉOÄ2å3\\âÜ|Ë©¬z%7]HÅ¢ÙÌ//d~yá~[¬¬ZÃKSA"å£æ¢Û}å¶ë(-ÐÄ¶u}oúDI%¯¢9UÆ ¿íD{}-yÉã9¦pvlÄÊÄ/:XåëAosz:¾<×ýrØáÞ|IHé¨$#Òe¤zíÇ,¾¸ØÄôý2ãp¢ll7}ÕrèöKæFG1RHÎ!õX"ç·EhMT¨êÇ5;yæ
ÁGÛïlÜÎÎ	öîò± Lä¹G%CÊCÓ?1¸2òq{zÆ\uç~nB^;3I~&ÛÊæìpKz%ÅYr§sÊ/ÉÉèÒP¡¯]¹çnJ±ÝÚ:àC°Ñ9]d	<×kåhºZl¼øz9o¾'Ä`ÕZ«^Ói©!4)yîâÃó{¦iïPR,ÈÈ [¹\ö¨CO)ÒPW¶xÊáQ\%%·ù2®C.UOdÌDq"Ó1ÓÔÏQ)(--åK_TAñF7Ê³Ou_)Óâkâ¹{§îéÑÄg¥ÁßuB©ÓaÁîPëg$Õà KÖÞ¥p\eTÒ+å*äF)%;0¸UG39éä:DöG1èÍ¥O2µuN{3ÈÊò¸åk
¤rðÖ¸ûéØÑ4 ^ÄÄÅÊ¢¼³¶PÝàê>ãÉdNtp!HBëM?N0mJôs3ÿ
7 ÙáU-mGÉeÌ§gr¤¹ÿÅHÂÔÖÂ6¸æ"3fO!x×Þlâ¡Ç^¡fûV`|J=¬Þ\Ã6íöK,âáÐe¥¾áñ@Þè\ÈúÆ!ÄÌor¥þ¡ñ;¡Hä®SÚº¼¬÷8aÎgpËþÖÅ?^D¯HÔÌAh»_|#à¤%`Ã¦
þÇÌìmh§Ñû áÏ M¥üBC40ré	,¤HK2°'ååÉoEíH)éAìv7³]OÀfU×Æ#§ÍpêD|Âþ_ùáYº6ñ¿O ÎH©r¤O!,Xøâ¹ùÍþQyÔìjæG%7[y@ÿêá÷xë]hyãsÒÉç¸muÑWw²óoASc5ÞÞ£ÎÖñybÝØ]5Ì¡î`¿øTÒpëÀá As¿ÃÒ;_ãÁW13oO?ÿ
I{ÙnÓ¡c·÷Ì%2|øTÒ;&MË¯¼/,'¬~gþQÂÁvKó6½W_þ[¢ü?LÍ®f,ùù\tñUX¹C8¾]0sq+¡½{¨7µP\
Ã¦D¡ðÈZ>Uv$ÄaW÷®0îÄ\2õ}ã$##5thQ¨	À ýe:{ë6³§ýuÀv¾bwÎ×7¶pØ5.;ý!¾}é1;!H0¼»ÿt1Ö¯ewË,
»vG2ëuÌÿÉê
§"¢ÂVVcV!ÀºaÃ
²°Ó4ïó0uB'ÇN
ÆôêûP E²àDÓºp ³Oúº8Â"ÉSQëòúÊyòOøýï¶²æíOÐCj½QÚ}v÷µÇ36v$päÊHzqåb#BÀ²ÃËÏÃë¾g)´°dÙKF[¤QVúKd¥Ã¯î\Íu×ýíû~D`¤f4 ¹kBîu{ÂñüáGëÉUÍîÆ¯òà}KùS¥`ü©LFº{4Í¾8B}f=ã²ÿÎKoÿv¶ö»Y×µý7|LþórÎýÒå<ûÀr®ÿÙs¼õÁo`fÃeÈÐØI"!ºbðæ®ëS§mí®WÉSô°¨]%Áéßg±ô¿åí÷3H·pg	¢zÎ&¦NÉó6så×/bBñèq{®êÙz²!ÍÀfë"ËùG(!ÅU³3ò=<>LÈmDCztåé2B-}[Ï§M/ã+fqÛ6ÂÁ(Rö×ñµËÏ ÃóMêYrËý¬['{ÅäyÔÍy5»÷ç±2yjºð°zíDNG77
ºûÌÈÈæÙWÖ3±¨¹gMàÆ¯Ïâ<ü>ØÝà
¤ÓÆ'#){I¨:ÉË¬¢¨0ÈíçÔã¨©!ê·`së°zÔK8%Ø%Ò4-£ÿ¤ôÎ;§??±®Î=*_ÄamBÌtZfçÊ/ýlçs¬Ú¸o\·µyüÉë±Dãn&Ö"EµÞKJ8û´
Ø¢
Í`r¾Îéùå·É#Zc?ÄM÷^ÈS/Æ¨Ù[BT1òxä!!2Rløº¢lÝ9= tâBrÜ=nÔb´ûü¥ò<AÃàd«÷isÕý¬®(®("l`jû±Û´¹ÛyÍaîÜéØl##sOÈïø"ÇW
Às/5rÝu Ô)9ñãå<nº(¤f÷²²ÒYxA
Üyõ£\yYi9qàc~xÿ\zøyÒ³fS6~5õÇaw¸\ø7fLDAV={ä¾üã&ÝÅÆm? ê¥'()1nd3|ð.Í]ç*BrÏ¯ÓMMmDÂqÞ;-sòúß¿Ä]?°ðÌÊÏàóµ}Ib%)Ó44-]°wOjèT²ËÃOÞÄ+¯>KkpNùN©±M{¢FñÿÍ; i_£²¸ôk×3:kYÊXFrá÷í&+b:"9BwjNëLe-Ô*6fw'îá±¬Ûews£¸L:a(Û/úSwë2«¯¾oü¿ãpädQ³©«¾³~Iò8aölÚ|j19l¬¬tJÊÎbæñ%Üñ%|þêúu¬§ußvîP·æd0å©½ú¨õ¶	Ç±Ùºðäæ°äæv;izyåö;ÞÁÂ¼Ùoå¶¤lto×ùYùòSâÉÝôn^ýÙ7}<ºBðá×ÐãÝ§5:ÙÙDbjmyãáHÝ¹ÿ7 e(erôV Ä¬
áLJø±3s¦¢hLÖ|è?
²¡t\÷©mmC~ÈÀéè^Ê¡´´t:;Ûðùã¬ßø13Ják~Fé¸5&	÷CýÈ6»ë½ìý§¡ÖÄÒ)ùGûâLajjjxàþ¿±gïñMe\XÄk]Fê|ivZ¢ïo?¯\¹1¥d\&T\8 WÚë¿^Nm]p,+ôçÔóÿf6xxë×=Åõß×øÑO¾Ã¨ôß³ó(7ß;æ&ÇI´·gáÎü
fNÎàø#+ß4ípq£>aÚýÏRÛÎ;	#ækw Cº7]Æå
ÑôÒÒìèÖx"Of1Ú¢×
Qqí×Ø²{"q=«Ï1
Öxg¶%dBèL.]AÉØdô%ºÚS ðuN#¿ÀGÎØó8cN-Û¶nDè® gÌwíî 3{Ùî!1Ý{²xë|¼£@mí.ÆæÕâtDF%RßK4æÆjÕÅ%p;\IVF;Oþé>?%±Køåý+ùã³w²kïÄe>Ã£cÆ'i@R¤#nÄâÿ&Ò@Ø
:óÚÕÔ-'6íè0Üf2¢´ÿï£ A}A=*M'
Ð,NNUHnnµõQ>XWCn¦3rul:u-'1¥¬¬vì¦]µ{Ø]ë¤±a+{$±h]:Å ¬ÁãICX§ÒÞ"uK¤ìDK²2Ú¹ýö[8wÁÓÈP#÷,{^ºÆ9
ºb.\V:}&·_caÆì)¤?®<2SÙy|4Úhìü?xþ§í;ëb2
Gq¹H\8 YtBáÏImÁÂ¢,ÔGç±°¯öÎ1tbHöcË$T)ÅjwÃÿlà[WpÆgN¡v÷.¶<ÓE0ä'QB5CVbbá(,¡°F8ègß>?9é>îøöuû¹V4éãÁû²þÃ8>_ê*Ñ£	8GJÜv`Üç£âà/?Ã¹3ñÔlDdv»ÅU`ÉØsW5MðÆ;¿ü]cg´»®(È´Ã
êøÚB#§:-µÉSf0¹ðU<9EYèòíâ]EìÚ±,§¨yözLeÿðäº;f·_ü;¯|gë×¿A[àFb®L±HH4;86Bá(þ
)åè¸Vâî(Í°)&lÂð|Ç¦òñ¦<ükyö¥×hÜH$ÀQ?:{
&Ã±ìÜ\Z÷eâÝE¦;ÒñÅÌ*{7ÞS:{Ñt©ÔîºCg{Vm~áÝÌ>¾ú]èüSikõâ^ Ê#ã´mÆa×¸ç¶?pÙâÉx[ÏgÉ
÷³~÷wS"\{ªÿÓ	ápüª8âôVY*®töY§¦dJueXÐm*CMZ8iV#'9âÁÆ%Õóxàë×} 
øGÈÌt*"ÊT°º]xk»Ãákw·Óìî)ã³Ë)ª½µÆ¦8>=m~ÐÛH³e±¶z5+þþ1¤K¾ù«I,#Öã¸yùWpÙb¥Æð¾¥ìóIê8¡ð(ÃÑÎ_ÊÆ2ÞÒÅÂS»éÝmË¨%=CÃ@sê ÉAx·$=Ô8È+8bXd
²³sME
ßý:â)®¾ZQ÷ÿ½Å´Sp9CÂ>vîvÓæQÙLw69	øèl/A¥h²²zÞX7G;:9@mþ¤nUÙ}BNAfV6wÿãZ6¯àoñW¹âå(Ñ±Øàñ_ü³Î[·õ|*.]JK×7ióµ!Å\BQÃød¯
ÒÑÈ0¨
ÀúKtéÂa!]LÓ>7vgî\Öi¬û7¡èxì42¬0y¼xpî,AWüJ¶Õ¤!Å|âza?s=ÃæH©þuÙõýµÈÀv Y	â!e;ÒLäøàCaÂá.nÿÁ=¼¿IÝÁö5¯|ýÈp©>¹DG ÷
j½>"»]cLAY¢LÏµÎD"{©+åÆûë6ðÑ¦Opgbú´ÑØ«ÒæóáL@cS3ÝÞëG5tG*_ým¦f22¨IÍ8¢^bôR8UòjîÞæçÞG{K¯kOÕï`¦r
;øÊã9åô¹ìÌFòK²ùü{9½ÌÂU?ª¦®!FGè\,¶NPêúX\-üº½[Ë¾,úæ2ÈH$%	5b(8ÀßÇN0ØEïêáä9}ü<IÌtÔÍOê¿LsÃ®$/îÃïpýcíH#ézÈXa[1ÖÌ}4?MXöxïñ¾çkN/Ð/¿ÃÎ+aãª'ÈÌÉcîÌ&Çßøÿxì6oS^×RvÝÚºÎ
e@ü¼@HJeWàõwªºSý}Þ:{Ïçî
¨×9döè¤õBceL+ÑÔ´öêz·G¼_ðÖø^_QÕ«°?¤Ô§#ÕÃµÕ
Û²ÚÖÍ±¸T$¯®
jh»üò	I"Q`húL¦§yÿÌ«|>7OÒ{ev5Û+Rm"¶±'®}k2ZbÍ~O½1{
WHþ÷áIãÕÒÌ)Q¶!iV°lÂ%a86¨ziÊx@Nµ-DÕ¢;e$U9ÂlÆ
g8¸ß;^³7µòJK
ß @)¹sq0ÍD0GT¶üæeÊZ*2~ÑàÈAë.9m1´þñÐª³uè!	QZÛöI¡iàúÛ¶ÃîÝSÓîjø*6"74ÏãkûýP}Uòùe¥Lv¥ÝÖZíD
VÓ°näHiN5©¯_É
òìZ!Chrùo0=o¬é.^Ü
64îCÕaÜLb[,`WîÆ®ÜCÈMP#ÍÖ¢kQ»(E:´P3ÆÐ÷Ú:ñÕ.v·Ujr~må|õ²íjSm¹ ¸½÷\±kF0cÄÍ$]í®Ù¹tah×úb*¸sE£vþÐNVEoÑFa`GN%ýûí#d_iï#Èà9nÖ"v>í`õF$P¥×ÛTCÞ>¢lõºB¨fsèÁ<MOÇX²Z;@µ`CÝ»×Ý{+E{çB[g×jþ%ª¸~ØVë[ºÞíEG
©éâ5u¹êý4¢È½W>ËW$h\[´º/ÔªØÉûç÷°â|óºç,½QX
!ð°Æ" RÀOô¼NGoxÄ½½(3uÏÐâº(f ÖoìÒætÖö}¥ÆÀnÂl[ôngÐ1GÀOIü¡Ý¹¬ ¿Lµ°/*ÏN$EkçbâVÈU¿¡\ý©*»ÞÀ ó#²d_"!Ãú55óÕ½ãÔåoHº6x²¿)rwaö=î<Úâþ÷,	ýJÞ|s_þ'i¹ÇG\zBòÐ×jjãVMDd¥>È1zïÓ^¡;TÑÆtcÑqC"¬ERsI}
2¤ÊCuþ®z.¹{(dxäGy^úë<tÇ÷:û¯oßt=³ÁµlLn®éó¤³ÀÛ¯_fìýwÂ¢:vû	°}-÷_ÌÏñË'¥X3à&Ùëd¶ïZ©vÝ	6d2(ª.vuÁ§ïß,-piàOüîåÇ°ì/!¢ÞX)¤W<ÑBYBj¢×§à~KWúyäÇ)þðûg}p=É9æò[#4jgÑuE
qõcç/UÎVyí³,e-DË3>óÔJ´V¨ÉOÆxüñ°Y¦Tl#Òì<ç:zk~VJyFý×ói~óû»Üvâ¥inòiµ½±zpÀß¯$ç-gY¯~6behÇAìÚbee-í35öéAöw½jI2p\Æ×ÊQ_$Ë&÷Z´®	¡¨U
--- NEW FILE: preferences.png ---
PNG


÷´
(Z§µÀ·ÛÎ¾RZº
ªk; "SaÍwïM§Ó©W[eÆåz@/ó3°(R%N¦àEàÑzd"´ÝhWlÓxëuñòÞÝ*ÉÖò]UÛ+ÚN§ÍFÓáÃè³ô¬ÍÍ&6åÏZTiöißÑn?ÕNEÙFÁ0ï½Z§î
--- NEW FILE: signon.png ---
PNG


½D Jéó½ÝF.ÃëõPÈ/ðnç	v È
ùü©±$
X¨Åì+vëþ.nMOÒ
Index: Makefile.am
===================================================================
RCS file: /cvsroot/gaim/gaim/pixmaps/Makefile.am,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -d -r1.80 -r1.81
--- Makefile.am	25 Sep 2002 06:02:11 -0000	1.80
+++ Makefile.am	12 Oct 2002 01:30:43 -0000	1.81
@@ -1,5 +1,6 @@
 SUBDIRS = protocols
 EXTRA_DIST =	about_small.xpm			\
+		accounts.png \
 		add.xpm				\
 		add_small.xpm			\
 		angel.xpm			\
@@ -47,6 +48,7 @@
 		kiss.xpm			\
 		link.xpm			\
 		login_icon.xpm			\
+		logo.png		\
 		logo.xpm			\
 		logout_icon.xpm			\
 		logout_menu.xpm			\
@@ -64,6 +66,7 @@
 		panic.xpm			\
 		plugins_small.xpm		\
 		pounce_small.xpm		\
+		preferences.png	\
 		prefs_small.xpm			\
 		refresh.xpm			\
 		sad.xpm				\
@@ -72,6 +75,7 @@
 		scream.xpm			\
 		search_small.xpm		\
 		send_small.xpm			\
+		signon.png \
 		small.xpm			\
 		smile.xpm			\
 		smile8.xpm			\
@@ -99,7 +103,7 @@
 
 
 gaimbuttonpixdir = $(datadir)/pixmaps/gaim/buttons
-gaimbuttonpix_DATA = edit.png
+gaimbuttonpix_DATA = edit.png accounts.png signon.png preferences.png
 
 gaimdialogpixdir = $(datadir)/pixmaps/gaim/dialogs
 gaimdialogpix_DATA = gaim_error.png gaim_info.png gaim_question.png gaim_warning.png

[Gaim-commits] CVS: gaim README.mingw,1.1,1.2

From: Herman B. <her...@us...> - 2002-10-11 21:25:51

Update of /cvsroot/gaim/gaim
In directory usw-pr-cvs1:/tmp/cvs-serv26142

Modified Files:
	README.mingw 
Log Message:
Correction made

Index: README.mingw
===================================================================
RCS file: /cvsroot/gaim/gaim/README.mingw,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- README.mingw	11 Oct 2002 03:13:56 -0000	1.1
+++ README.mingw	11 Oct 2002 21:25:48 -0000	1.2
@@ -90,7 +90,7 @@
   NSIS from http://www.nullsoft.com/free/nsis/ making sure to place its
   binary dir in your PATH. Then...
 
-  $ cd ~/gaim/win32-install-dir
+  $ cd ~/gaim
   $ make -f Makefile.mingw installer
 
 Debugging

[Gaim-commits] CVS: gaim VERSION,1.1,1.2

From: Herman B. <her...@us...> - 2002-10-11 21:10:53

Update of /cvsroot/gaim/gaim
In directory usw-pr-cvs1:/tmp/cvs-serv20838

Modified Files:
	VERSION 
Log Message:
Switched verison to 0.60cvs

Index: VERSION
===================================================================
RCS file: /cvsroot/gaim/gaim/VERSION,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- VERSION	11 Oct 2002 03:13:56 -0000	1.1
+++ VERSION	11 Oct 2002 21:10:51 -0000	1.2
@@ -1 +1 @@
-0.60a2
+0.60cvs

[Gaim-commits] CVS: gaim/src/protocols/oscar ft.c,1.17,1.18

From: Herman B. <her...@us...> - 2002-10-11 19:30:25

Update of /cvsroot/gaim/gaim/src/protocols/oscar
In directory usw-pr-cvs1:/tmp/cvs-serv17870

Modified Files:
	ft.c 
Log Message:
win32 fix

Index: ft.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/ft.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- ft.c	11 Oct 2002 03:14:00 -0000	1.17
+++ ft.c	11 Oct 2002 19:30:22 -0000	1.18
@@ -17,12 +17,15 @@
 #include <netinet/in.h>
 #include <sys/utsname.h> /* for aim_directim_initiate */
 #include <arpa/inet.h> /* for inet_ntoa */
-#else
-#include "win32dep.h"
 #endif
 
 #include "gaim.h"
 
+#ifdef _WIN32
+#include "win32dep.h"
+#endif
+
+
 /* TODO: 
    o look for memory leaks.. there's going to be shitloads, i'm sure. 
 */
@@ -965,6 +968,9 @@
 	int listenfd;
 	const int on = 1;
 	struct sockaddr_in sockin;
+#ifdef _WIN32
+	u_long imode;
+#endif
 
 	if ((listenfd = socket(AF_INET, SOCK_STREAM, 0)) < 0) {
 		perror("socket(listenfd)");
@@ -1003,7 +1009,12 @@
 #endif
 		return -1;
 	}
+#ifndef _WIN32
 	fcntl(listenfd, F_SETFL, O_NONBLOCK);
+#else
+	imode = 1;
+	ioctlsocket(listenfd, FIONBIO, &imode);
+#endif
 	return listenfd;
 #endif
 }

[Gaim-commits] CVS: gaim ChangeLog,1.563,1.564

From: Sean E. <sea...@us...> - 2002-10-11 17:35:29

Update of /cvsroot/gaim/gaim
In directory usw-pr-cvs1:/tmp/cvs-serv13795

Modified Files:
	ChangeLog 
Log Message:
pangonizificationalization


Index: ChangeLog
===================================================================
RCS file: /cvsroot/gaim/gaim/ChangeLog,v
retrieving revision 1.563
retrieving revision 1.564
diff -u -d -r1.563 -r1.564
--- ChangeLog	11 Oct 2002 14:19:13 -0000	1.563
+++ ChangeLog	11 Oct 2002 17:35:23 -0000	1.564
@@ -27,7 +27,7 @@
 	* Updated desktop and window icons (Thanks Robert McQueen)
 	* GTK2 Goodness:
 		- Preferences dialog
-		- GtkIMHtml, sorta (Ari Pollak, Christian Hammond)
+		- GtkIMHtml (Ari Pollak, Christian Hammond)
 		- Buddy Icons
 		- IM Images
 		- Alert Dialogs

[Gaim-commits] CVS: gaim/src/protocols/oscar .cvsignore,1.3,1.4

From: Rob F. <rob...@us...> - 2002-10-11 17:34:35

Update of /cvsroot/gaim/gaim/src/protocols/oscar
In directory usw-pr-cvs1:/tmp/cvs-serv13488/protocols/oscar

Modified Files:
	.cvsignore 
Log Message:
hmm



Index: .cvsignore
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- .cvsignore	10 Nov 2001 01:48:16 -0000	1.3
+++ .cvsignore	11 Oct 2002 17:34:32 -0000	1.4
@@ -34,3 +34,6 @@
 translate.lo
 icq.lo
 service.lo
+liboscar.def
+liboscar.lib
+liboscar.exp

[Gaim-commits] CVS: gaim/src .cvsignore,1.4,1.5

From: Rob F. <rob...@us...> - 2002-10-11 17:34:35

Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv13488

Modified Files:
	.cvsignore 
Log Message:
hmm



Index: .cvsignore
===================================================================
RCS file: /cvsroot/gaim/gaim/src/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- .cvsignore	1 Sep 2002 05:50:32 -0000	1.4
+++ .cvsignore	11 Oct 2002 17:34:31 -0000	1.5
@@ -4,3 +4,5 @@
 .libs
 gaim  
 gaim-remote
+gaim.def
+gaim.lib

[Gaim-commits] CVS: gaim/src/protocols/oscar oscar.c,1.159,1.160

From: Rob F. <rob...@us...> - 2002-10-11 17:31:14

Update of /cvsroot/gaim/gaim/src/protocols/oscar
In directory usw-pr-cvs1:/tmp/cvs-serv12492

Modified Files:
	oscar.c 
Log Message:
shame on you



Index: oscar.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/oscar.c,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -d -r1.159 -r1.160
--- oscar.c	11 Oct 2002 14:19:22 -0000	1.159
+++ oscar.c	11 Oct 2002 17:31:07 -0000	1.160
@@ -1771,8 +1771,7 @@
 	if (args->icbmflags & AIM_IMFLAGS_UNICODE) {
 		int i, j;
 		GError *err = NULL;
-		FILE *fp;
-		
+
 		tmp = g_convert(args->msg, args->msglen, "UTF-8", "UCS-2BE", &j, &i, &err);
 		if (err)
 		  debug_printf("Unicode IM conversion: %s\n", err->message);

[Gaim-commits] CVS: gaim/src/protocols/oscar oscar.c,1.158,1.159

From: Luke S. <lsc...@us...> - 2002-10-11 14:19:58

Update of /cvsroot/gaim/gaim/src/protocols/oscar
In directory usw-pr-cvs1:/tmp/cvs-serv4932/src/protocols/oscar

Modified Files:
	oscar.c 
Log Message:
(10:16:03) deryni: we're fully 'compliant'? (sorry if that betrays some underlying stupidity)
(10:16:55) Paco-Paco: yes
(10:17:24) Paco-Paco: provided the user has the font, on any of the services supporting unicode we should support every known language in the world :-)
(10:17:36) Paco-Paco: well, as soon as we have a proper utf-8 input widget


Index: oscar.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/oscar.c,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -d -r1.158 -r1.159
--- oscar.c	11 Oct 2002 04:44:57 -0000	1.158
+++ oscar.c	11 Oct 2002 14:19:22 -0000	1.159
@@ -1709,7 +1709,7 @@
 }
 
 static int incomingim_chan1(aim_session_t *sess, aim_conn_t *conn, aim_userinfo_t *userinfo, struct aim_incomingim_ch1_args *args) {
-	char *tmp = g_malloc(BUF_LONG);
+	char *tmp;
 	struct gaim_connection *gc = sess->aux_data;
 	struct oscar_data *od = gc->proto_data;
 	int flags = 0;
@@ -1769,23 +1769,40 @@
 	 * HTML entity.
 	 */
 	if (args->icbmflags & AIM_IMFLAGS_UNICODE) {
-		int i;
+		int i, j;
+		GError *err = NULL;
+		FILE *fp;
 		
-		for (i = 0, tmp[0] = '\0'; i < args->msglen; i += 2) {
-			unsigned short uni;
-			
-			uni = ((args->msg[i] & 0xff) << 8) | (args->msg[i+1] & 0xff);
-
-			if ((uni < 128) || ((uni >= 160) && (uni <= 255))) { /* ISO 8859-1 */
+		tmp = g_convert(args->msg, args->msglen, "UTF-8", "UCS-2BE", &j, &i, &err);
+		if (err)
+		  debug_printf("Unicode IM conversion: %s\n", err->message);
+		if (!tmp) {
+			/* Conversion to HTML entities isn't a bad fallback */
+			debug_printf ("AIM charset conversion failed!\n");
+			for (i = 0, tmp[0] = '\0'; i < args->msglen; i += 2) {
+				unsigned short uni;
 				
-				g_snprintf(tmp+strlen(tmp), BUF_LONG-strlen(tmp), "%c", uni);
+				uni = ((args->msg[i] & 0xff) << 8) | (args->msg[i+1] & 0xff);
+				
+				if ((uni < 128) || ((uni >= 160) && (uni <= 255))) { /* ISO 8859-1 */
+					
+					g_snprintf(tmp+strlen(tmp), BUF_LONG-strlen(tmp), "%c", uni);
+					
+				} else { /* something else, do UNICODE entity */
+					g_snprintf(tmp+strlen(tmp), BUF_LONG-strlen(tmp), "&#%04x;", uni);
+				}
 				
-			} else { /* something else, do UNICODE entity */
-				g_snprintf(tmp+strlen(tmp), BUF_LONG-strlen(tmp), "&#%04x;", uni);
 			}
 		}
-	} else
-		g_snprintf(tmp, BUF_LONG, "%s", args->msg);
+	} else if (args->icbmflags & AIM_IMFLAGS_ISO_8859_1) {
+		int i;
+		debug_printf("ISO-8859-1 IM");
+		tmp = g_convert(args->msg, args->msglen, "UTF-8", "ISO-8859-1", NULL, &i, NULL);
+	} else {
+		/* ASCII is valid UTF-8 */
+		debug_printf("ASCII IM\n");
+		tmp = g_strdup(args->msg);
+	}
 
 	if (args->icbmflags & AIM_IMFLAGS_TYPINGNOT) {
 		char *who = normalize(userinfo->sn);
@@ -1793,7 +1810,7 @@
 			g_hash_table_insert(od->supports_tn, who, who);
 	}
 
-	strip_linefeed(tmp);
+	//strip_linefeed(tmp);
 	serv_got_im(gc, userinfo->sn, tmp, flags, time(NULL), -1);
 	g_free(tmp);
 
@@ -3300,6 +3317,7 @@
 		struct icon_req *ir = NULL;
 		char *who = normalize(name);
 		struct stat st;
+		int i, len;
 		
 		args.flags = AIM_IMFLAGS_ACK | AIM_IMFLAGS_CUSTOMFEATURES;
 		if (odata->icq)
@@ -3339,11 +3357,48 @@
 		}
 		
 		args.destsn = name;
-		args.msg    = message;
-		args.msglen = strlen(message);
 		
-		ret = aim_send_im_ext(odata->sess, &args);
+		/* Determine how we can send this message.  Per the
+		 * warnings elsewhere in this file, these little
+		 * checks determine the simplest encoding we can use
+		 * for a given message send using it. */
+		len = strlen(message);
+		i = 0;
+		while (message[i]) {
+			if ((unsigned char)message[i] > 0x7f) {
+				/* not ASCII! */
+				args.flags |= AIM_IMFLAGS_ISO_8859_1;
+				break;
+			}
+			i++;
+		}
+		while (message[i]) {
+			/* ISO-8859-1 is 0x00-0xbf in the first byte
+			 * followed by 0xc0-0xc3 in the second */
+			if ((unsigned char)message[i] > 0x80 && ((unsigned char)message[i] > 0xbf || 
+						  ((unsigned char)message[i + 1] < 0xc0 || (unsigned char)message[i + 1] > 0xc3))) {
+				args.flags ^= AIM_IMFLAGS_ISO_8859_1;
+				args.flags |= AIM_IMFLAGS_UNICODE;
+				break;
+			}
+			i++;
+		}
+		if (args.flags & AIM_IMFLAGS_UNICODE) {
+			args.msg = g_convert(message, len, "UCS-2BE", "UTF-8", NULL, &len, NULL);
+		} else if (args.flags & AIM_IMFLAGS_UNICODE) {
+			args.msg = g_convert(message, len, "ISO-8859-1", "UTF-8", NULL, &len, NULL);
+			if (!args.msg) {
+				debug_printf("Someone tell Ethan his 8859-1 detection is wrong\n");
+				args.flags ^= AIM_IMFLAGS_ISO_8859_1 | AIM_IMFLAGS_UNICODE;
+				len = strlen(message);
+				args.msg = g_convert(message, len, "UCS-2BE", "UTF8", NULL, &len, NULL);
+			}
+		} else {
+			args.msg = message;
+		}
+		args.msglen = len;
 		
+		ret = aim_send_im_ext(odata->sess, &args);
 	}
 	if (ret >= 0)
 		return 1;

[Gaim-commits] CVS: gaim/src/protocols/msn msn.c,1.100,1.101

From: Luke S. <lsc...@us...> - 2002-10-11 14:19:55

Update of /cvsroot/gaim/gaim/src/protocols/msn
In directory usw-pr-cvs1:/tmp/cvs-serv4932/src/protocols/msn

Modified Files:
	msn.c 
Log Message:
(10:16:03) deryni: we're fully 'compliant'? (sorry if that betrays some underlying stupidity)
(10:16:55) Paco-Paco: yes
(10:17:24) Paco-Paco: provided the user has the font, on any of the services supporting unicode we should support every known language in the world :-)
(10:17:36) Paco-Paco: well, as soon as we have a proper utf-8 input widget


Index: msn.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/msn/msn.c,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -d -r1.100 -r1.101
--- msn.c	11 Oct 2002 03:14:00 -0000	1.100
+++ msn.c	11 Oct 2002 14:19:21 -0000	1.101
@@ -403,9 +403,7 @@
 			x = strstr(from, "\r\n"); *x = 0;
 			subject += strlen("Subject: ");
 			x = strstr(subject, "\r\n"); *x = 0;
-			from = utf8_to_str(from);
 			connection_has_mail(gc, -1, from, subject, login_url);
-			g_free(from);
 		}
 	}
 }
@@ -543,12 +541,9 @@
 		ms->total++;
 		while (ms->txqueue) {
 			char *send = add_cr(ms->txqueue->data);
-			char *utf8 = str_to_utf8(send);
-			g_free(send);
 			g_snprintf(sendbuf, sizeof(sendbuf), "MSG %d N %d\r\n%s%s", ++ms->trId,
-					strlen(MIME_HEADER) + strlen(utf8),
-					MIME_HEADER, utf8);
-			g_free(utf8);
+					strlen(MIME_HEADER) + strlen(send),
+					MIME_HEADER, send);
 			g_free(ms->txqueue->data);
 			ms->txqueue = g_slist_remove(ms->txqueue, ms->txqueue->data);
 			if (msn_write(ms->fd, sendbuf, strlen(sendbuf)) < 0) {
@@ -646,7 +641,7 @@
 	
 static void msn_process_switch_msg(struct msn_switchboard *ms, char *msg)
 {
-	char *content, *agent, *format, *utf;
+	char *content, *agent, *format;
 	char *message = NULL;
 	int flags = 0;
 
@@ -684,15 +679,12 @@
 			return;
 		}
 		skiphead += 4;
-		utf = utf8_to_str(skiphead);
-		strip_linefeed(utf);
+		strip_linefeed(skiphead);
 		
 		if (format) { 
-			int len = strlen(utf) + strlen(format) + 1;
-			message = g_malloc(len);
-			g_snprintf(message, len, "%s%s", format, utf);
+			message = g_strdup_printf("%s%s", format, skiphead);
 		} else {
-			message = utf;
+			message = g_strdup(skiphead);
 		}
 		
 		if (ms->chat)
@@ -701,9 +693,6 @@
 			serv_got_im(ms->gc, ms->msguser, message, flags, time(NULL), -1);
 
 		g_free(message);
-		if (format) {
-			g_free(utf);
-		}
 	}
 }
 
@@ -874,11 +863,8 @@
 {
 	struct msn_data *md = map->gc->proto_data;
 	char buf[MSN_BUF_LEN];
-	char *srvfriend;
 	
-	srvfriend = str_to_utf8(map->friend);
-	g_snprintf(buf, sizeof(buf), "ADD %d AL %s %s\r\n", ++md->trId, map->user, url_encode(srvfriend));
-	g_free(srvfriend);
+	g_snprintf(buf, sizeof(buf), "ADD %d AL %s %s\r\n", ++md->trId, map->user, url_encode(map->friend));
 	
 	if (msn_write(md->fd, buf, strlen(buf)) < 0) {
 		hide_login_progress(map->gc, "Write error");
@@ -895,10 +881,9 @@
 {
 	struct msn_data *md = map->gc->proto_data;
 	char buf[MSN_BUF_LEN];
-	char *srvfriend = str_to_utf8(map->friend);
 
 	if (*(map->user)) {
-		g_snprintf(buf, sizeof(buf), "ADD %d BL %s %s\r\n", ++md->trId, map->user, url_encode(srvfriend));
+		g_snprintf(buf, sizeof(buf), "ADD %d BL %s %s\r\n", ++md->trId, map->user, url_encode(map->friend));
 		if (msn_write(md->fd, buf, strlen(buf)) < 0) {
 			hide_login_progress(map->gc, "Write error");
 			signoff(map->gc);
@@ -908,7 +893,6 @@
 		build_block_list();
 	}
 	
-	g_free(srvfriend);
 	g_free(map->user);
 	g_free(map->friend);
 	g_free(map);
@@ -947,7 +931,7 @@
 
 		ap = g_new0(struct msn_add_permit, 1);
 		ap->user = g_strdup(user);
-		ap->friend = utf8_to_str(friend);
+		ap->friend = g_strdup(friend);
 		ap->gc = gc;
 
 		g_snprintf(msg, sizeof(msg), _("The user %s (%s) wants to add %s to his or her buddy list."),
@@ -1031,7 +1015,7 @@
 		if ((b = find_buddy(gc, user)) != NULL) {
 			if (b->proto_data)
 				g_free(b->proto_data);
-			b->proto_data = utf8_to_str(friend);
+			b->proto_data = g_strdup(friend);
 		}
 
 		if (!g_strcasecmp(state, "BSY")) {
@@ -1076,7 +1060,7 @@
 		if (!g_strcasecmp(which, "FL") && pos) {
 			struct msn_buddy *b = g_new0(struct msn_buddy, 1);
 			b->user = g_strdup(who);
-			b->friend = utf8_to_str(friend);
+			b->friend = g_strdup(friend);
 			md->fl = g_slist_append(md->fl, b);
 		} else if (!g_strcasecmp(which, "AL") && pos) {
 			char *dupl;
@@ -1104,7 +1088,7 @@
 				debug_printf("Unresolved MSN RL entry\n");
 				ap = g_new0(struct msn_add_permit, 1);
 				ap->user = g_strdup(who);
-				ap->friend = utf8_to_str(friend);
+				ap->friend = g_strdup(friend);
 				ap->gc = gc;
                          
 		                g_snprintf(msg, sizeof(msg), _("The user %s (%s) wants to add you to their buddy list"),ap->user, ap->friend);
@@ -1185,7 +1169,7 @@
 		if ((b = find_buddy(gc, user)) != NULL) {
 			if (b->proto_data)
 				g_free(b->proto_data);
-			b->proto_data = utf8_to_str(friend);
+			b->proto_data = g_strdup(friend);
 		}
 
 		if (!g_strcasecmp(state, "BSY")) {
@@ -1225,10 +1209,8 @@
 		GET_NEXT(tmp);
 
 		friend = url_decode(tmp);
-		friend = utf8_to_str(friend);
 
 		g_snprintf(gc->displayname, sizeof(gc->displayname), "%s", friend);
-		g_free(friend);
 	} else if (!g_strncasecmp(buf, "REM", 3)) {
 	} else if (!g_strncasecmp(buf, "RNG", 3)) {
 		struct msn_switchboard *ms;
@@ -1406,7 +1388,7 @@
 static void msn_process_main_msg(struct gaim_connection *gc, char *msg)
 {
 	struct msn_data *md = gc->proto_data;
-	char *skiphead, *utf;
+	char *skiphead;
 	char *content;
 
 	content = strstr(msg, "Content-Type: ");
@@ -1458,12 +1440,9 @@
 	if (!skiphead || !skiphead[4])
 		return;
 	skiphead += 4;
-	utf = utf8_to_str(skiphead);
-	strip_linefeed(utf);
-
-	serv_got_im(gc, md->msguser, utf, 0, time(NULL), -1);
+	strip_linefeed(skiphead);
 
-	g_free(utf);
+	serv_got_im(gc, md->msguser, skiphead, 0, time(NULL), -1);
 }
 
 static void msn_callback(gpointer data, gint source, GaimInputCondition cond)
@@ -1631,9 +1610,7 @@
 
 		/* so here, we're either getting the challenge or the OK */
 		if (!g_strcasecmp(resp, "OK")) {
-			friend = utf8_to_str(friend);
 			g_snprintf(gc->displayname, sizeof(gc->displayname), "%s", friend);
-			g_free(friend);
 
 			g_snprintf(sendbuf, sizeof(sendbuf), "SYN %d 0\r\n", ++md->trId);
 			if (msn_write(md->fd, sendbuf, strlen(sendbuf)) < 0) {
@@ -1651,9 +1628,7 @@
 			md5_byte_t di[16];
 			int i;
 
-			friend = utf8_to_str(friend);
 			g_snprintf(buf2, sizeof(buf2), "%s%s", friend, gc->password);
-			g_free(friend);
 
 			md5_init(&st);
 			md5_append(&st, (const md5_byte_t *)buf2, strlen(buf2));
@@ -1890,7 +1865,7 @@
 	char buf[MSN_BUF_LEN];
 
 	if (ms) {
-		char *utf8, *send;
+		char *send;
 
 		if (ms->txqueue) {
 			debug_printf("appending to queue\n");
@@ -1899,12 +1874,10 @@
 		}
 
 		send = add_cr(message);
-		utf8 = str_to_utf8(send);
-		g_free(send);
 		g_snprintf(buf, sizeof(buf), "MSG %d N %d\r\n%s%s", ++ms->trId,
-				strlen(MIME_HEADER) + strlen(utf8),
-				MIME_HEADER, utf8);
-		g_free(utf8);
+				strlen(MIME_HEADER) + strlen(send),
+				MIME_HEADER, send);
+		g_free(send);
 		if (msn_write(ms->fd, buf, strlen(buf)) < 0)
 			msn_kill_switch(ms);
 		debug_printf("\n");
@@ -1932,18 +1905,16 @@
 {
 	struct msn_switchboard *ms = msn_find_switch_by_id(gc, id);
 	char buf[MSN_BUF_LEN];
-	char *utf8, *send;
+	char *send;
 
 	if (!ms)
 		return -EINVAL;
 
 	send = add_cr(message);
-	utf8 = str_to_utf8(send);
-	g_free(send);
 	g_snprintf(buf, sizeof(buf), "MSG %d N %d\r\n%s%s", ++ms->trId,
-			strlen(MIME_HEADER) + strlen(utf8),
-			MIME_HEADER, utf8);
-	g_free(utf8);
+			strlen(MIME_HEADER) + strlen(send),
+			MIME_HEADER, send);
+	g_free(send);
 	if (msn_write(ms->fd, buf, strlen(buf)) < 0) {
 		msn_kill_switch(ms);
 		return 0;
@@ -2178,7 +2149,7 @@
 	if (!entry || *entry == '\0') 
 		alias = g_strdup("");
 	else
-		alias = str_to_utf8(entry);
+		alias = g_strdup(entry);
 	
 	if (strlen(alias) >= BUDDY_ALIAS_MAXLEN) {
 		do_error_dialog(_("New MSN friendly name too long."), NULL, GAIM_ERROR);

[Gaim-commits] CVS: gaim/src/protocols/jabber jabber.c,1.68,1.69

From: Luke S. <lsc...@us...> - 2002-10-11 14:19:54

Update of /cvsroot/gaim/gaim/src/protocols/jabber
In directory usw-pr-cvs1:/tmp/cvs-serv4932/src/protocols/jabber

Modified Files:
	jabber.c 
Log Message:
(10:16:03) deryni: we're fully 'compliant'? (sorry if that betrays some underlying stupidity)
(10:16:55) Paco-Paco: yes
(10:17:24) Paco-Paco: provided the user has the font, on any of the services supporting unicode we should support every known language in the world :-)
(10:17:36) Paco-Paco: well, as soon as we have a proper utf-8 input widget


Index: jabber.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/jabber/jabber.c,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- jabber.c	11 Oct 2002 03:14:00 -0000	1.68
+++ jabber.c	11 Oct 2002 14:19:18 -0000	1.69
@@ -1305,8 +1305,6 @@
 			msg = xmlnode_get_data(y);
 		}
 
-		msg = utf8_to_str(msg);
-
 		if (!from)
 			return;
 
@@ -1362,9 +1360,6 @@
 			g_free(from);
 		}
 
-		if (msg)
-			g_free(msg);
-
 	} else if (!strcasecmp(type, "error")) {
 		if ((y = xmlnode_get_tag(p->x, "error"))) {
 			type = xmlnode_get_attrib(y, "code");
@@ -1389,12 +1384,9 @@
 			msg = xmlnode_get_data(y);
 		}
 
-		msg = utf8_to_str(msg);
-		
 		if ((subj = xmlnode_get_tag(p->x, "subject"))) {
 		   	topic = xmlnode_get_data(subj);
 		} 
-		topic = utf8_to_str(topic);
 
 		jc = find_existing_chat(GJ_GC(gjc), p->from);
 		if (!jc) {
@@ -1438,9 +1430,6 @@
 			}
 		}
 
-		g_free(msg);
-		g_free(topic);
-
 	} else {
 		debug_printf("unhandled message %s\n", type);
 	}
@@ -1764,9 +1753,6 @@
 	/*
 	 * Add or remove a buddy?  Change buddy's alias or group?
 	 */
-	if(name)
-		name = utf8_to_str(name);
-
 	if (BUD_SUB_TO_PEND(sub, ask) || BUD_SUBD_TO(sub, ask)) {
 		if ((b = find_buddy(GJ_GC(gjc), buddyname)) == NULL) {
 			debug_printf("adding buddy [4]: %s\n", buddyname);
@@ -1806,9 +1792,6 @@
 		jabber_remove_gaim_buddy(GJ_GC(gjc), buddyname);
 	}
 
-	if(name)
-		g_free(name);
-
 	g_free(buddyname);
 
 }
@@ -2478,10 +2461,8 @@
 	xmlnode_insert_tag(y, "composing");
 
 	if (message && strlen(message)) {
-		char *utf8 = str_to_utf8((char*)message);
 		y = xmlnode_insert_tag(x, "body");
-		xmlnode_insert_cdata(y, utf8, -1);
-		g_free(utf8);
+		xmlnode_insert_cdata(y, message, -1);
 	}
 
 	gjab_send(((struct jabber_data *)gc->proto_data)->gjc, x);
@@ -2539,9 +2520,7 @@
 		 */
 		if(my_alias != NULL && my_alias[0] != '\0' && strcmp(realwho, my_alias))
 		{
-			char *utf8 = str_to_utf8(my_alias);
-			xmlnode_put_attrib(y, "name", utf8);
-			g_free(utf8);
+			xmlnode_put_attrib(y, "name", my_alias);
 		}
 
 		/*
@@ -2965,10 +2944,8 @@
 	g_free(subject);
 
 	if (message && strlen(message)) {
-		char *utf8 = str_to_utf8((char*)message);
 		y = xmlnode_insert_tag(x, "body");
-		xmlnode_insert_cdata(y, utf8, -1);
-		g_free(utf8);
+		xmlnode_insert_cdata(y, message, -1);
 	}
 
 	gjab_send(((struct jabber_data *)gc->proto_data)->gjc, x);
@@ -3017,18 +2994,14 @@
 	if (message && strlen(message) > strlen("/topic ") &&
 			!g_strncasecmp(message, "/topic ", strlen("/topic "))) {
 		char buf[8192];
-		char *utf8 = str_to_utf8(message + strlen("/topic "));
 		y = xmlnode_insert_tag(x, "subject");
-		xmlnode_insert_cdata(y, utf8, -1);
+		xmlnode_insert_cdata(y, message + strlen("/topic "), -1);
 		y = xmlnode_insert_tag(x, "body");
-		g_snprintf(buf, sizeof(buf), "/me has changed the subject to: %s", utf8);
+		g_snprintf(buf, sizeof(buf), "/me has changed the subject to: %s", message + strlen("/topic"));
 		xmlnode_insert_cdata(y, buf, -1);
-		g_free(utf8);
 	} else if (message && strlen(message)) {
-		char *utf8 = str_to_utf8(message);
 		y = xmlnode_insert_tag(x, "body");
-		xmlnode_insert_cdata(y, utf8, -1);
-		g_free(utf8);
+		xmlnode_insert_cdata(y, message, -1);
 	}
 
 	gjab_send(((struct jabber_data *)gc->proto_data)->gjc, x);
@@ -3054,10 +3027,8 @@
 	xmlnode_put_attrib(x, "type", "normal");
 
 	if (message && strlen(message)) {
-		char *utf8 = str_to_utf8(message);
 		y = xmlnode_insert_tag(x, "body");
-		xmlnode_insert_cdata(y, utf8, -1);
-		g_free(utf8);
+		xmlnode_insert_cdata(y, message, -1);
 	}
 
 	gjab_send(((struct jabber_data *)gc->proto_data)->gjc, x);

[Gaim-commits] CVS: gaim/src gaim.h,1.341,1.342 util.c,1.136,1.137

From: Luke S. <lsc...@us...> - 2002-10-11 14:19:51

Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv4932/src

Modified Files:
	gaim.h util.c 
Log Message:
(10:16:03) deryni: we're fully 'compliant'? (sorry if that betrays some underlying stupidity)
(10:16:55) Paco-Paco: yes
(10:17:24) Paco-Paco: provided the user has the font, on any of the services supporting unicode we should support every known language in the world :-)
(10:17:36) Paco-Paco: well, as soon as we have a proper utf-8 input widget


Index: gaim.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gaim.h,v
retrieving revision 1.341
retrieving revision 1.342
diff -u -d -r1.341 -r1.342
--- gaim.h	11 Oct 2002 03:13:58 -0000	1.341
+++ gaim.h	11 Oct 2002 14:19:15 -0000	1.342
@@ -468,14 +468,6 @@
 extern char *convert_string(char *, const char *, const char *);
 extern const char *handle_uri(char *);
 
-#ifdef HAVE_LANGINFO_CODESET
-#define utf8_to_str(in) convert_string(in, nl_langinfo(CODESET), "UTF-8")
-#define str_to_utf8(in) convert_string(in, "UTF-8", nl_langinfo(CODESET))
-#else
-#define utf8_to_str(in) convert_string(in, "ISO-8859-1", "UTF-8")
-#define str_to_utf8(in) convert_string(in, "UTF-8", "ISO-8859-1")
-#endif
-
 /*------------------------------------------------------------------------*/
 /*  Multi-Entry dialog and vCard dialog support                           */
 /*------------------------------------------------------------------------*/

Index: util.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/util.c,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -d -r1.136 -r1.137
--- util.c	11 Oct 2002 03:13:59 -0000	1.136
+++ util.c	11 Oct 2002 14:19:17 -0000	1.137
@@ -1173,51 +1173,6 @@
 	fclose(fd);
 }
 
-char *convert_string(char *str, const char *destset, const char *srcset)
-{
-#ifdef HAVE_ICONV
-	char *buf;
-	iconv_t cd;
-	size_t insize = 0;
-	size_t outsize = 0;
-	size_t nconv = 0;
-	char *inptr;
-	char *outptr;
-	char *ret;
-
-	if (!str) 
-		return NULL; 
-	buf = g_malloc(strlen(str)*4);
-	insize = strlen(str);
-	inptr = str;
-	outsize = strlen(str)*4;
-	outptr = buf;
-
-	cd = iconv_open(destset, srcset);
-	if (cd == (iconv_t) -1) {
-		g_free(buf);
-		debug_printf("iconv_open(%s, %s) Error\n",destset, srcset);
-		return g_strdup(str);
-	}
-
-	nconv = iconv(cd, &inptr, &insize, &outptr, &outsize);
-	if (nconv == (size_t) -1) {
-		debug_printf("iconv Error\n");
-		g_free(buf);
-		return g_strdup(str);
-	}
-	*outptr = '\0';
-	iconv_close(cd);
-
-	ret = g_strdup(buf);
-	g_free(buf);
-
-	return ret;
-#else
-	return g_strdup(str);
-#endif
-}
-
 void strip_linefeed(gchar *text)
 {
 	int i, j;

[Gaim-commits] CVS: gaim ChangeLog,1.562,1.563

From: Luke S. <lsc...@us...> - 2002-10-11 14:19:48

Update of /cvsroot/gaim/gaim
In directory usw-pr-cvs1:/tmp/cvs-serv4932

Modified Files:
	ChangeLog 
Log Message:
(10:16:03) deryni: we're fully 'compliant'? (sorry if that betrays some underlying stupidity)
(10:16:55) Paco-Paco: yes
(10:17:24) Paco-Paco: provided the user has the font, on any of the services supporting unicode we should support every known language in the world :-)
(10:17:36) Paco-Paco: well, as soon as we have a proper utf-8 input widget


Index: ChangeLog
===================================================================
RCS file: /cvsroot/gaim/gaim/ChangeLog,v
retrieving revision 1.562
retrieving revision 1.563
diff -u -d -r1.562 -r1.563
--- ChangeLog	11 Oct 2002 03:52:07 -0000	1.562
+++ ChangeLog	11 Oct 2002 14:19:13 -0000	1.563
@@ -71,7 +71,7 @@
 	* Word-wrapping on mail notification text (Thanks, Andrew Molloy)
 	* /topic with no argument displays the current topic (Thanks Mark 
 	  Doliner)
-	* i18n fixes (Thanks Matt Wilson, Ethan Blanton, A Lee)
+	* Lots of i18n fixes (Thanks Matt Wilson, Ethan Blanton, A Lee)
 	* Removed Ctrl-C binding for color
 	* Docklet plugin--replaces the old GNOME applet.  You'll need the
 	  Panel Notification Area applet for GNOME 2, or the kicker for

[Gaim-commits] CVS: gaim/src/protocols/yahoo yahoo.c,1.54,1.55

From: Luke S. <lsc...@us...> - 2002-10-11 14:19:32

Update of /cvsroot/gaim/gaim/src/protocols/yahoo
In directory usw-pr-cvs1:/tmp/cvs-serv4932/src/protocols/yahoo

Modified Files:
	yahoo.c 
Log Message:
(10:16:03) deryni: we're fully 'compliant'? (sorry if that betrays some underlying stupidity)
(10:16:55) Paco-Paco: yes
(10:17:24) Paco-Paco: provided the user has the font, on any of the services supporting unicode we should support every known language in the world :-)
(10:17:36) Paco-Paco: well, as soon as we have a proper utf-8 input widget


Index: yahoo.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/yahoo/yahoo.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- yahoo.c	11 Oct 2002 05:39:37 -0000	1.54
+++ yahoo.c	11 Oct 2002 14:19:24 -0000	1.55
@@ -604,7 +604,7 @@
 			msg[j++] = m[i];
 		}
 		msg[j] = 0;
-		serv_got_im(gc, from, utf8_to_str(msg), 0, tm, -1);
+		serv_got_im(gc, from, g_strdup(msg), 0, tm, -1);
 	} else if (pkt->status == 2) {
 		do_error_dialog(_("Your Yahoo! message did not get sent."), NULL, GAIM_ERROR);
 	}
@@ -1191,7 +1191,7 @@
 {
 	struct yahoo_data *yd = gc->proto_data;
 	struct yahoo_packet *pkt = yahoo_packet_new(YAHOO_SERVICE_MESSAGE, YAHOO_STATUS_OFFLINE, 0);
-	char *msg = str_to_utf8(what);
+	char *msg = g_strdup(what);
 
 	yahoo_packet_hash(pkt, 1, gc->displayname);
 	yahoo_packet_hash(pkt, 5, who);

[Gaim-commits] CVS: gaim/src conversation.c,1.391,1.392

From: Luke S. <lsc...@us...> - 2002-10-11 12:24:30

Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv29876/src

Modified Files:
	conversation.c 
Log Message:
make an error display if you try to send a message when not connected (thanks Patrick (Zyk) Aussems)


Index: conversation.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/conversation.c,v
retrieving revision 1.391
retrieving revision 1.392
diff -u -d -r1.391 -r1.392
--- conversation.c	11 Oct 2002 03:13:57 -0000	1.391
+++ conversation.c	11 Oct 2002 12:24:25 -0000	1.392
@@ -1376,9 +1376,10 @@
 		else if (err == -ENOTCONN)
 			debug_printf("Not yet connected\n");
 #else
-		else if (err == SOCKET_ERROR)
-			if( WSAENOTCONN == WSAGetLastError() )
+		else if (err == SOCKET_ERROR) {
+			if (WSAENOTCONN == WSAGetLastError())
 				debug_printf("Not yet connected\n");
+		}
 #endif
 		else
 			do_error_dialog(_("Unable to send message"), NULL, GAIM_ERROR);

6 messages has been excluded from this view by a project administrator.

Flat | Threaded

<< < 1 .. 774 775 776 777 778 .. 860 > >> (Page 776 of 860)