From c7010d43264dafca66ff65540c5d6666f1c66e2a Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Mon, 7 May 2007 19:48:22 +0000 Subject: [PATCH] [darcs-to-svn @ Use icon-name API instead of stock icons and update tango icons] svn path=/trunk/; revision=32 --- Makefile.am | 2 +- configure.ac | 4 +- data/16x16/Makefile.am | 13 +++ data/16x16/empathy-available.png | Bin 0 -> 689 bytes data/16x16/empathy-away.png | Bin 0 -> 538 bytes data/16x16/empathy-busy.png | Bin 0 -> 616 bytes data/16x16/empathy-extended-away.png | Bin 0 -> 729 bytes data/16x16/empathy-message-new.png | Bin 0 -> 693 bytes data/16x16/empathy-message.png | Bin 0 -> 510 bytes data/16x16/empathy-offline.png | Bin 0 -> 401 bytes data/16x16/empathy-pending.png | Bin 0 -> 605 bytes data/16x16/empathy-typing.png | Bin 0 -> 587 bytes {pixmaps => data}/Makefile.am | 23 ++-- {profiles => data}/gtalk.profile | 0 {profiles => data}/jabber.profile | 0 {profiles => data}/msn.profile | 0 {profiles => data}/salut.profile | 0 data/scalable/message-new.xcf | Bin 0 -> 4170 bytes data/scalable/message.xcf | Bin 0 -> 3182 bytes data/scalable/process-typing.xcf | Bin 0 -> 2926 bytes data/scalable/status-avaible.svg | 104 +++++++++++++++++ data/scalable/status-away-extended.svg | 120 +++++++++++++++++++ data/scalable/status-away.svg | 93 +++++++++++++++ data/scalable/status-busy.svg | 140 +++++++++++++++++++++++ data/scalable/status-offline.svg | 101 ++++++++++++++++ data/scalable/status-pending.svg | 103 +++++++++++++++++ libempathy-gtk/Makefile.am | 2 +- libempathy-gtk/empathy-images.h | 42 +++++++ libempathy-gtk/gossip-accounts-dialog.c | 15 ++- libempathy-gtk/gossip-chat-window.c | 68 ++++------- libempathy-gtk/gossip-chat.c | 8 +- libempathy-gtk/gossip-chat.h | 44 ++++--- libempathy-gtk/gossip-contact-list.c | 52 +++------ libempathy-gtk/gossip-preferences.c | 1 - libempathy-gtk/gossip-presence-chooser.c | 29 +++-- libempathy-gtk/gossip-private-chat.c | 30 +++-- libempathy-gtk/gossip-profile-chooser.c | 10 +- libempathy-gtk/gossip-stock.c | 129 --------------------- libempathy-gtk/gossip-stock.h | 63 ---------- libempathy-gtk/gossip-ui-utils.c | 125 +++++++++----------- libempathy-gtk/gossip-ui-utils.h | 14 +-- pixmaps/gossip-available.png | Bin 741 -> 0 bytes pixmaps/gossip-away.png | Bin 609 -> 0 bytes pixmaps/gossip-busy.png | Bin 888 -> 0 bytes pixmaps/gossip-extended-away.png | Bin 773 -> 0 bytes pixmaps/gossip-group-message.png | Bin 764 -> 0 bytes pixmaps/gossip-message.png | Bin 594 -> 0 bytes pixmaps/gossip-offline.png | Bin 524 -> 0 bytes pixmaps/gossip-pending.png | Bin 786 -> 0 bytes pixmaps/gossip-typing.png | Bin 820 -> 0 bytes pixmaps/vcard_16.png | Bin 411 -> 0 bytes pixmaps/vcard_48.png | Bin 3155 -> 0 bytes profiles/Makefile.am | 9 -- src/empathy-chat-main.c | 3 - src/empathy-contact-list-main.c | 5 - src/empathy-main.c | 8 +- 56 files changed, 893 insertions(+), 467 deletions(-) create mode 100644 data/16x16/Makefile.am create mode 100644 data/16x16/empathy-available.png create mode 100644 data/16x16/empathy-away.png create mode 100644 data/16x16/empathy-busy.png create mode 100644 data/16x16/empathy-extended-away.png create mode 100644 data/16x16/empathy-message-new.png create mode 100644 data/16x16/empathy-message.png create mode 100644 data/16x16/empathy-offline.png create mode 100644 data/16x16/empathy-pending.png create mode 100644 data/16x16/empathy-typing.png rename {pixmaps => data}/Makefile.am (56%) rename {profiles => data}/gtalk.profile (100%) rename {profiles => data}/jabber.profile (100%) rename {profiles => data}/msn.profile (100%) rename {profiles => data}/salut.profile (100%) create mode 100644 data/scalable/message-new.xcf create mode 100644 data/scalable/message.xcf create mode 100644 data/scalable/process-typing.xcf create mode 100644 data/scalable/status-avaible.svg create mode 100644 data/scalable/status-away-extended.svg create mode 100644 data/scalable/status-away.svg create mode 100644 data/scalable/status-busy.svg create mode 100644 data/scalable/status-offline.svg create mode 100644 data/scalable/status-pending.svg create mode 100644 libempathy-gtk/empathy-images.h delete mode 100644 libempathy-gtk/gossip-stock.c delete mode 100644 libempathy-gtk/gossip-stock.h delete mode 100644 pixmaps/gossip-available.png delete mode 100644 pixmaps/gossip-away.png delete mode 100644 pixmaps/gossip-busy.png delete mode 100644 pixmaps/gossip-extended-away.png delete mode 100644 pixmaps/gossip-group-message.png delete mode 100644 pixmaps/gossip-message.png delete mode 100644 pixmaps/gossip-offline.png delete mode 100644 pixmaps/gossip-pending.png delete mode 100644 pixmaps/gossip-typing.png delete mode 100644 pixmaps/vcard_16.png delete mode 100644 pixmaps/vcard_48.png delete mode 100644 profiles/Makefile.am diff --git a/Makefile.am b/Makefile.am index a14dcd11..cc530dd6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = po profiles pixmaps libempathy libempathy-gtk src +SUBDIRS = po data libempathy libempathy-gtk src DISTCHECK_CONFIGURE_FLAGS = \ --disable-scrollkeeper diff --git a/configure.ac b/configure.ac index d03973ce..bf331eee 100644 --- a/configure.ac +++ b/configure.ac @@ -84,9 +84,9 @@ PKG_CHECK_MODULES(MISSION_CONTROL_PLUGINS, dnl ----------------------------------------------------------- AC_OUTPUT([ Makefile + data/Makefile + data/16x16/Makefile po/Makefile.in - profiles/Makefile - pixmaps/Makefile libempathy/Makefile libempathy-gtk/Makefile src/Makefile diff --git a/data/16x16/Makefile.am b/data/16x16/Makefile.am new file mode 100644 index 00000000..1b12272c --- /dev/null +++ b/data/16x16/Makefile.am @@ -0,0 +1,13 @@ +icondir = $(datadir)/icons/hicolor/16x16/apps +icon_DATA = \ + empathy-available.png \ + empathy-offline.png \ + empathy-away.png \ + empathy-extended-away.png \ + empathy-busy.png \ + empathy-pending.png \ + empathy-message.png \ + empathy-message-new.png \ + empathy-typing.png + +EXTRA_DIST = $(icon_DATA) diff --git a/data/16x16/empathy-available.png b/data/16x16/empathy-available.png new file mode 100644 index 0000000000000000000000000000000000000000..66b24967a54b28a193163ef714e94d26e8b0d23e GIT binary patch literal 689 zcmV;i0#5yjP)(4Jh#5otI?WygTFJASAx2k+=tfDlC5=4Oj2n;62QT1*e#Ig&)Bhsa`{&kWVY4W&u=-q^ays*8g?B zfzpEVK(#=O7eCg1yx(tbl6!F9SDs9@0c_+7neKj0qa&0Cr3LNL&cgVD@#FQmRO!3Z zhYe$e+A@lONL;hhAX;KDFP;HhBq$3gX)AY8La|caqtow+8Iu;E5|pCNiD*cg43)!u zw2|V~5|+!mA3ss8sja+Sv(8tEF1_CoA7*CQqg=q*6wTw)q#$^e^!n XIq3Y`tIL?S00000NkvXXu0mjfN&7ez literal 0 HcmV?d00001 diff --git a/data/16x16/empathy-away.png b/data/16x16/empathy-away.png new file mode 100644 index 0000000000000000000000000000000000000000..ff59e309d082b1089edbfa7010a149b74e3bac73 GIT binary patch literal 538 zcmV+#0_FXQP)<#;=4TO@VqaabHo_K|H#T} zo{RL)M2@p&WKn_-BB4_1n*n|#N%+>7=${hg;OwB;bauD5l?#JKbGHHpB76CKe!tyl z%%4N&l<8w3R_ipWI~he41pz~`j^??sM$&kG)IY={|;(W4Q~^>wRI zDn0FsJkJF5L@Wj8-7xeRk1to8c43M zsrf#YO6C3lUfc@kiMTfOyJ6^=t1D8iNr4p5T9aH}ve#~VIr!KUasC4M@cKcuT3mG; zrg1!X*E2|RbHhCm8nxOTA71?i_#{%c;CMd_i|KHPHfHXg&L9BO;gC+NRYc_7smNUb z8$jUXalLN)r4qW+na7fu!>_lhfJa+f>icAJ0=%(j^=B7x>|Vt2pIcfaSHU4<{KB%z c{KjSU6Lzq7+3N0M3jhEB07*qoM6N<$f;IE$hX4Qo literal 0 HcmV?d00001 diff --git a/data/16x16/empathy-busy.png b/data/16x16/empathy-busy.png new file mode 100644 index 0000000000000000000000000000000000000000..fec554d8976b2252c023b2cfe0555fc94972489a GIT binary patch literal 616 zcmV-u0+;=XP)jC*ICiFSxn|srQI*uGsvbz?2r`s zP&nE@G&~~x#sC0S^8@eKi*{-4)wdm6P0nQ0^DaO(En7*IjUPn zSiZaPg-vxVnNt-PK*K}oWH{Qd>l!=eQ*J%Jy8q7^*8&(=fN%jwH}Rq25xKkd8X?>O z%%>^D6+)?p*}nY+|{YfN|LIbhc6SG;2P9nk7ie zRrBMSKHmV1`g)hC_3|G9cAb@tx5db*=$LE=tggMGR4zIDP%y-3IMNN!wplE$zPx<= z#OZ+F7k7fA;Yino-)4}^sY*62CLiT*7tSXxd0WBz5As-+<(U0`oy0_5P)L zlS@ccaTLbCb070+t~QyYGmN3-%oT+YpOi^rgiz6SUOf&ZB%yGmiH${}!cSq!b-EtMh#yzr+83h%tu$DQ>M{CsE)U z(Z#hiv>JgzRALgvrwo9mX~nIKjrA%x7og$@Ax*4PbLCW7?Vo9MI-*I_(at72#+U z4>Qy8Am5Ft19h&ko!fd3H`cFTVPK3ccRS$r6UB#XYFJOnR(9dcF&3J5#nj{sOUA=2 z_-=rmINtoVq48kVl4k{h09-H1%@wD04MV%DaoOL2EQgB6ecgD}dkgt_8_^l?XQZdu z?k|xn2Pi}poXNDe!0Q$J9afxcI}a}T7EnLI&~+Gw3MAh{WMQ$*yJQaX=yN9H(+FV5F;PIVd6^|k*QH&F$m1}!;`axvs(DtU(^7ACP|X=JZ?87 z1_r>D6(Ny`!QXWUvDhpY5^=Ph+yO8RfB=p+fm=v=06XJn(Fu2ZNe2sVt&fdb)HMTp8IZ`>bZUQ&64H^JHYNC0oC5$00000 LNkvXXu0mjf#y3MC literal 0 HcmV?d00001 diff --git a/data/16x16/empathy-message-new.png b/data/16x16/empathy-message-new.png new file mode 100644 index 0000000000000000000000000000000000000000..da01aff75d8011595a7875807359205259e201c9 GIT binary patch literal 693 zcmV;m0!safP)3wuSG;O!ms^^8Z&qpr5~c=aW}9f$CukG&9Yk;$g7^i3@I$mr z+J!=!(o6!c^dhBqQHoEP`1YJ>aWjjs`oVC{9GE}<2e z0gpthR?TXsEN+~(sJ<-Y6JvQ*eF9wmRiHYvO|hv=S8;*Hnhz*t1aQgmZMVp$FBi%+ z)p93N)u%TGhr0WE`!S0E2w@lBUEu5cK|E{&frhR%05%qL)W++aZ(eAAwS50^1YGLt zy~0X)nZ5meR0WeQvho}ad(?NXAUOCA01ch1IFKwA$RAHyBLFjFZ+{;%Lsf|-5V1+X z0Y9ou9IM?y4-zxO)GDiG5UrxBZh)lJ3L-y?+#xBokge+{Qb9uq0H`Rcim4%*g{U2i z+W)I*Y`)6|`~hXBb^k!;fgw7Q$OA7>5){y;LI1%lL(Ej&Yf4JT0B zc9)bKl4)T*d07!iLrN6Kgf!sp1b4&(;)Y0`pgCOH0mt2Ok8!CX4N8QtFgyF=Voy)6 zn%a?u-2J!x{QO)HkvB3vG1hEmQ|{i)Ul@aXzM^Z$$SiLp*qU99|-&^R(Yx&a)%#D6g|JX#7Noc)n* b9h`p$PFKy7manL200000NkvXXu0mjfLJTNE literal 0 HcmV?d00001 diff --git a/data/16x16/empathy-message.png b/data/16x16/empathy-message.png new file mode 100644 index 0000000000000000000000000000000000000000..be0e2e157b2b40f859942d2f2f2d1700b1046a1c GIT binary patch literal 510 zcmVoHOt`c{H5y9EnX_(nZd;09jb$5T6 znOlDY_4^NFV`EeM`_F67%-)w$9$EXCCeyJ4oj>4jN;=)!yBEjDZxj(%hl9~K09*Gp zPNw5cNuQb)t_%mG?`x(|*KjcU91%B~?T_~SC(TQkTDJEvrT_o{07*qoM6N<$f+m;W AApigX literal 0 HcmV?d00001 diff --git a/data/16x16/empathy-offline.png b/data/16x16/empathy-offline.png new file mode 100644 index 0000000000000000000000000000000000000000..0321dc6bb929d81864266d5e41ff27f3d1e72336 GIT binary patch literal 401 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf2?p zUk71ECym(^Ktah8*NBqf{Irtt#G+J&^73-M%)IR4BQtkiHLeS28-Grt|Rxu|70-tbMdONt-Ie4UYJon`~V8(rL;*7NN zuJ6YA731{oqNd72 zJ(cvW|4ux6x`;(ir~#<>@uCOSzgtfl82dP-<=(&RI?sON|C{M=IT-Y08{H4M-WS|m zGLNz0iEXL#vK8-TPOKN$;ofD-^tI#6zmf$Wy6<*h)SD;hAg7%rP;=F>{+iuE(}E`l z^e@RV&2L|E<5S~;`9E^m)sNQQVtz19VadX%wc$6D=P7@0ek$#~?dKhVO95M1Hl^*F rp?~V~cbQca+Ptp$FuHwT_gVk{xrze4%MZnX!N=g~>gTe~DWM4fmBpce literal 0 HcmV?d00001 diff --git a/data/16x16/empathy-pending.png b/data/16x16/empathy-pending.png new file mode 100644 index 0000000000000000000000000000000000000000..4adfdb648816b7a70d99f3c3ef98cc2cf22b4f35 GIT binary patch literal 605 zcmV-j0;2tiP)XTf@c(=;cLs;4ZIOOBZABCfi6Pb?TNhpQ z6xNYKycuSYd#6m~S^V8F8jj&+49=bACDJUMdIz zOh>U)UIrio5C9wkXlttC{!s{k`UMnAjUIVyT>u1=^kNrK+ku+uQ%L{;E=uzv;cZ+ge>0 zMG?c{2=jB7B>=bMR`>xx-mbngLU%mj33GOO3Yw;17{f7uR^%g2N3m4SCI$ZWokD&^ z?{;xjmZ9#{_o{E-#IF!)P6`5FDcs7f9Cf}TeI`dt7rYz!UCyF1wlrfX2s9p8?$bCxB%W7SFLvBEf+IqW}3Kz;AnB}010qNS#tmY4c7nw4c7reD4Tcy000McNliru*8&O+AquhpTAcs@0oX}I zK~y-)t&vY?6G0foe{puVo7y5COi)A+ES7o|k3A?-R47&yi%7j$v4>LpQw2exic%_i z35W`cH3?p%Co2dZJbUmYDo6=!#Yi=i-NtO4?2d=n>9(eV;+)=m^LX>#_Ywd%Z;j@a zQoa1^xiNZ8ODVOKQvWTs7DY<(8uo zSt;WCp0WC2Vvs$DPP3^rv1}g4)~^Upl~O$b+5C7zcky`~TL4O_o>M0W0Jw8E!yO~F>&&Re(e5sq*QI%o%^8kqLCO+Bh~Kc=)C9nmsS&h&gyQsj&=Ft1%woGOriIT+ zsdU_OYWg1Tj~Nd3og;8I1MuR}MIsfTb;RtpD}-TaBBbLHQlB2OqhmWC-^`%3#t8~k zz6b2>yKX*set(eNm)>DoD3_(#tXrL;ZD%(+xe=`+0M<6UI6(m?D6la1mac(uUS4gl zJFsngGXEsIZ{_B9bsoU7#IjjQddyctlI7yk63+~s-ybLC`Ymmoc@?54G;j0OkmQDT zb5AttJaZ!1vffpG=kYNB91DaHR2PM5;A00`vk~8*%0;2`dc4 Z)}H_wC^krib(a7D002ovPDHLkV1g`P{&xTX literal 0 HcmV?d00001 diff --git a/pixmaps/Makefile.am b/data/Makefile.am similarity index 56% rename from pixmaps/Makefile.am rename to data/Makefile.am index 6143ddc2..0f2e1b07 100644 --- a/pixmaps/Makefile.am +++ b/data/Makefile.am @@ -1,17 +1,11 @@ -imagedir = $(datadir)/empathy +SUBDIRS = 16x16 -image_DATA = \ - gossip-offline.png \ - gossip-available.png \ - gossip-busy.png \ - gossip-away.png \ - gossip-extended-away.png \ - gossip-pending.png \ - gossip-message.png \ - gossip-typing.png \ - gossip-group-message.png \ - vcard_16.png \ - vcard_48.png +profiledir = $(datadir)/mission-control/profiles +profile_DATA = \ + jabber.profile \ + gtalk.profile \ + salut.profile \ + msn.profile gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor @@ -27,6 +21,7 @@ update-icon-cache: fi EXTRA_DIST = \ - $(image_DATA) + $(image_DATA) \ + $(profile_DATA) diff --git a/profiles/gtalk.profile b/data/gtalk.profile similarity index 100% rename from profiles/gtalk.profile rename to data/gtalk.profile diff --git a/profiles/jabber.profile b/data/jabber.profile similarity index 100% rename from profiles/jabber.profile rename to data/jabber.profile diff --git a/profiles/msn.profile b/data/msn.profile similarity index 100% rename from profiles/msn.profile rename to data/msn.profile diff --git a/profiles/salut.profile b/data/salut.profile similarity index 100% rename from profiles/salut.profile rename to data/salut.profile diff --git a/data/scalable/message-new.xcf b/data/scalable/message-new.xcf new file mode 100644 index 0000000000000000000000000000000000000000..57d574347f4514a7b008d5a319162aa35d47abbd GIT binary patch literal 4170 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 WW6;wihjQ{>LF9)8#=}0`T)zZiA3B}@ literal 0 HcmV?d00001 diff --git a/data/scalable/message.xcf b/data/scalable/message.xcf new file mode 100644 index 0000000000000000000000000000000000000000..c255be04616d1938e5dd4047deee7dc1355ac237 GIT binary patch literal 3182 zcmc(hO>Z1U8ppeO1|~RWH+ER0-IEV1Z8#XgSAY-TBj?172Wt~MvW+&}a%pXEJL8Ez z00~KWk1{`wYn9YX7jvdcSzg53YPxs99RPlehXZ(^FBu=zkuJXU1dZy}E z&-}}^3>t8>dM8`ZV->f*-o>dN{XQx}$Mi>sGc*XAzd z-TYeZ(#5&A-h3;6P8qyCe)R^XUOHv!bmse_YZ%;l8;zy^6V{QJ! zmE{dAe({4Ut@_&P($ac$<8XmA`$efxPEI8re0*m(Nb_|;?MKVnR|CQk(e%1h7jGcOcH zeRn*VtQoQDdnYwDU-Y~j>2-ZtAJuiqWTxM?J>fdv?%lwM%W*@}S`7@y^rzgJ!#9S~jyC%j^{L6R53@X*(`w+;JVdkazc> zS`PR8fCbl;&wP&;FP=VYwxRoB)Q!7Q=oc!YO&emjm!wIr8y4#RLECh^pxa9a!$I2X z9;z0pNk0==KRHrQjXjY!q6~H0$3BkM5TzdN`V$*eGVd-iB3>0ez2n#oeM^Tv(6|26 z+?40!P_O@YQ_g_m4MWaSpe#uMHX6pXF=`kD*tkQfeCMtqWy5lJfR|vh)^$a;Tdj8J z-jvdiU<{xw5H&5+?3j@7L*T*FvK_#5Y^zY8l4#j3_dMV8xLc@1o)`yV7=>Zr73vsp z0Kh#$T&M`OT`!2@B<-h39F5g>jy+EL!)(}3;zJcDgwO#957Hx*j_A4A<|%m_PSDB$ zPu9@)XvcS*obaaviGWp%^d5J%jhhA$Hg0~^suN+O@ok+58(TMsu+b<8Ylb$hjSLNw zhuX)ckY^>gZ)wQeu^v8r^q8u6Z=dbEd;7kD|$N4>m=dq?VNvBwkd#yC;hwZ*ZGqg8|nr%m6=tC-&=Od}wxXz4B6 zyrFGs#8}(>_cNUsYsNP^G1mU|PhzYY#8}A|?h833GjV?bH^yiomVc0gctKI_)13Q? zBG6|7wl^!8a{gDEpvWO2Y32Yk^IRk3Vz|`$>Y2a%`K-!HY*2c+j7x4>QQ1f>Dd*6O z60W|CsbytW8I@*~5?R{B;sJctg*g|&QMVhjm~}lAsqaBAOc_oR9;&CsZatsZ6|}u*NQ>~s zOW?6f7W{c2Dnbolp&VS8oYFHHSh}je3IqN=2=da^C3-SobhA>`$$n=HKs7!eLv`v2Am?V2EpCf$ z9QRm{#hkwM#IullNs_XZB^;Z9UYPT?fX@!tzyVK?BcMez$Ym^hKeJTK=!aktwN>ii}k;pz(YyrAC|yevmxl= z2yim?SS_j)wR=K6C3aI3i60&&wgv4h9G+N(6T4)x_k5~TA4uKXWVBOSCjE}4YCx)e z=ldEV)g*edSad+Dk->@ux&ehevezNmYi_5rzrk5^51x76ShEEwkY6moPs!O@uj4=0p8*Hal>Gnz literal 0 HcmV?d00001 diff --git a/data/scalable/process-typing.xcf b/data/scalable/process-typing.xcf new file mode 100644 index 0000000000000000000000000000000000000000..d2fa5f44d1b35fa9fa8a7c16b1028cb6468c3c6c GIT binary patch literal 2926 zcmcgtL1-LR7@m3ave`{HtySYigasqENZJHZ>_LTs=%IKShoM1~bh~-GB%Op!8WTYj zVPzQ%kwRNM*qh^RF9p**d5EzJy@?l>CYzl?vH_b#((EMe&hP)v?5wkO0}9r+@6G%E z|9$VDFYo>HM`SKdC+3smiSf*2O2YP7YY;w;LzeOJ1diz0n+-+-@sl_>4kAC*!o(Xu z{vi1Uh8@aW8WX7@k^m_ol2emY*~AHN z8p?_bV~OEY!(QtGMp{cJaqERHTZ8q);efWz&rFXcGlocv1n)xULN{m2H+0#^%%b>Y zIz_7Ir^d%;QnPJ=wEOQa-_yC3&ZE`j>yo5AElEAM@Q6POyf_CJLFXEOJM}^0+}J`Y z`|Jo&A~@*$-@p-VVdBMF7$>POgpY)9JcRp0_!we}6|`Oi^bTsleTUZB>;6((CvutE z>0?Q2^hz#BJzXALl5sHt#~(3ShUW7}r1(FRg3{^S=)CA``?Hv@FP(XD z_|&u^(3a>!pcY&PApWl}qX%QsC3L$CdT*;KcUmA2jC+)Fr%$Poy$$(0*5|ca9y{c% zs%6`G>~g+=IM4HPtzqq0i}K?o2=wmSFKXX-Ym(bhPCvC6|vkaOWR;Bi}_m3#15t? z3fnfZ%Vq<|VOOEDBjT#kuM0;`@~%D;|jRqBy;x ztn4org(wzov)lFMLV;j$SzcxZN4zfzg`3L-xzG^jM@2-q@1Ea=+*STgt(L^yrs8h)$_<~_@nLEb0=icP=a|SaGIOE1MbIRQQ zgu%IyUSJFLiFBHvF(FT|w8LXOofZ>mIo;q);SuikFjs;o;NvJXw|;>L9Q3~M_|LyW z4;&mFQI6e%UTDUS5oG|O`y&j18%OlVpz_%oaB!8NIM7VV+1D-*bjjT^lKhXlJSg-M zzeV0_fj}u{WF*_^i+oD<%aW_%N7m5l8h&q`Qxly`i%E`FzkjCsm4<(rtT}bK0{fbV zAI7eBO{>EuKy9*LQqbH&BH-_V=9zV8XJu!#wz}h++m3VJ`3--*`N=)IvQb`NyG5a5 znkPjkDSBNeDIHT2EvBOs-IJn|6y2Ai>m)_LriZ2ITS)Yz=p;pNOYzON6yI!1p-?g1 zlcJIowXTwsj;VPt~olA>Ny!&1~OBzjU*lA^Yy_-0#*Z?>gSs2Ems zydXd+4E`ED;J$`6DFSW`N$xOZ=^(~#f{RJqY_4K)bY+NvBDt(%A}8*66_eXbh9EsC ziI1EeOHPRF)Meu$t#!-d|Kp!rP}fmHY>T0M% ze%-6DewDS?Jr;xC!<;V`U)Wv}}B zH5g+O3-yILCh4OR-R}P)R+l$!gd*7+UM$jQ=Hj`#Ks7nkA-Cq$X1_vL);t#K3v+U$ yj|zCZ9~Nsp#Hp+w#wv$dWsimWq;DWjCA;5$_%@T`K%*%Y9$MXc$o>}X)6$ + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/data/scalable/status-away-extended.svg b/data/scalable/status-away-extended.svg new file mode 100644 index 00000000..3104dff5 --- /dev/null +++ b/data/scalable/status-away-extended.svg @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + diff --git a/data/scalable/status-away.svg b/data/scalable/status-away.svg new file mode 100644 index 00000000..7e7b0ed6 --- /dev/null +++ b/data/scalable/status-away.svg @@ -0,0 +1,93 @@ + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/data/scalable/status-busy.svg b/data/scalable/status-busy.svg new file mode 100644 index 00000000..66fc7094 --- /dev/null +++ b/data/scalable/status-busy.svg @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff --git a/data/scalable/status-offline.svg b/data/scalable/status-offline.svg new file mode 100644 index 00000000..975f7dc8 --- /dev/null +++ b/data/scalable/status-offline.svg @@ -0,0 +1,101 @@ + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/data/scalable/status-pending.svg b/data/scalable/status-pending.svg new file mode 100644 index 00000000..89c626c8 --- /dev/null +++ b/data/scalable/status-pending.svg @@ -0,0 +1,103 @@ + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/libempathy-gtk/Makefile.am b/libempathy-gtk/Makefile.am index 2818b2a2..c5b66b74 100644 --- a/libempathy-gtk/Makefile.am +++ b/libempathy-gtk/Makefile.am @@ -10,6 +10,7 @@ noinst_LTLIBRARIES = libempathy-gtk.la libempathy_gtk_la_SOURCES = \ ephy-spinner.c ephy-spinner.h \ + empathy-images.h \ empathy-main-window.c empathy-main-window.h \ gossip-accounts-dialog.c gossip-accounts-dialog.h \ gossip-account-widget-generic.c gossip-account-widget-generic.h \ @@ -17,7 +18,6 @@ libempathy_gtk_la_SOURCES = \ gossip-profile-chooser.c gossip-profile-chooser.h \ gossip-cell-renderer-expander.c gossip-cell-renderer-expander.h \ gossip-cell-renderer-text.c gossip-cell-renderer-text.h \ - gossip-stock.c gossip-stock.h \ gossip-spell.c gossip-spell.h \ gossip-contact-groups.c gossip-contact-groups.h \ gossip-contact-list.c gossip-contact-list.h \ diff --git a/libempathy-gtk/empathy-images.h b/libempathy-gtk/empathy-images.h new file mode 100644 index 00000000..439f4c92 --- /dev/null +++ b/libempathy-gtk/empathy-images.h @@ -0,0 +1,42 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ +/* + * Copyright (C) 2007 Collabora Ltd. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + * + * Authors: Xavier Claessens + */ + +#ifndef __EMPATHY_IMAGES_H__ +#define __EMPATHY_IMAGES_H__ + +G_BEGIN_DECLS + +#define EMPATHY_IMAGE_OFFLINE "empathy-offline" +#define EMPATHY_IMAGE_AVAILABLE "empathy-available" +#define EMPATHY_IMAGE_BUSY "empathy-busy" +#define EMPATHY_IMAGE_AWAY "empathy-away" +#define EMPATHY_IMAGE_EXT_AWAY "empathy-extended-away" +#define EMPATHY_IMAGE_PENDING "empathy-pending" + +#define EMPATHY_IMAGE_MESSAGE "empathy-message" +#define EMPATHY_IMAGE_TYPING "empathy-typing" +#define EMPATHY_IMAGE_CONTACT_INFORMATION "vcard_16" +#define EMPATHY_IMAGE_GROUP_MESSAGE "gossip-group-message" + +G_END_DECLS + +#endif /* __EMPATHY_IMAGES_ICONS_H__ */ diff --git a/libempathy-gtk/gossip-accounts-dialog.c b/libempathy-gtk/gossip-accounts-dialog.c index ad9f7976..449577ae 100644 --- a/libempathy-gtk/gossip-accounts-dialog.c +++ b/libempathy-gtk/gossip-accounts-dialog.c @@ -305,15 +305,12 @@ accounts_dialog_update_account (GossipAccountsDialog *dialog, if (account) { McProfile *profile; - GdkPixbuf *pixbuf; - - pixbuf = gossip_pixbuf_from_account (account, GTK_ICON_SIZE_DIALOG); - gtk_image_set_from_pixbuf (GTK_IMAGE (dialog->image_type), pixbuf); - if (pixbuf) { - g_object_unref (pixbuf); - } profile = mc_account_get_profile (account); + gtk_image_set_from_icon_name (GTK_IMAGE (dialog->image_type), + mc_profile_get_icon_name (profile), + GTK_ICON_SIZE_DIALOG); + gtk_label_set_text (GTK_LABEL (dialog->label_type), mc_profile_get_display_name (profile)); @@ -412,6 +409,7 @@ accounts_dialog_model_pixbuf_data_func (GtkTreeViewColumn *tree_column, GossipAccountsDialog *dialog) { McAccount *account; + const gchar *icon_name; GdkPixbuf *pixbuf; TelepathyConnectionStatus status; @@ -420,7 +418,8 @@ accounts_dialog_model_pixbuf_data_func (GtkTreeViewColumn *tree_column, COL_ACCOUNT_POINTER, &account, -1); - pixbuf = gossip_pixbuf_from_account (account, GTK_ICON_SIZE_BUTTON); + icon_name = gossip_icon_name_from_account (account); + pixbuf = gossip_pixbuf_from_icon_name (icon_name, GTK_ICON_SIZE_BUTTON); if (pixbuf) { if (status == TP_CONN_STATUS_DISCONNECTED || diff --git a/libempathy-gtk/gossip-chat-window.c b/libempathy-gtk/gossip-chat-window.c index 9f6f1a36..feeda5e0 100644 --- a/libempathy-gtk/gossip-chat-window.c +++ b/libempathy-gtk/gossip-chat-window.c @@ -40,6 +40,7 @@ #include #include "gossip-chat-window.h" +#include "empathy-images.h" //#include "gossip-add-contact-dialog.h" //#include "gossip-chat-invite.h" //#include "gossip-contact-info-dialog.h" @@ -48,7 +49,6 @@ #include "gossip-preferences.h" #include "gossip-private-chat.h" //#include "gossip-sound.h" -#include "gossip-stock.h" #include "gossip-ui-utils.h" #define GET_PRIV(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GOSSIP_TYPE_CHAT_WINDOW, GossipChatWindowPriv)) @@ -106,8 +106,6 @@ struct _GossipChatWindowPriv { static void gossip_chat_window_class_init (GossipChatWindowClass *klass); static void gossip_chat_window_init (GossipChatWindow *window); static void gossip_chat_window_finalize (GObject *object); -static GdkPixbuf *chat_window_get_status_pixbuf (GossipChatWindow *window, - GossipChat *chat); static void chat_window_accel_cb (GtkAccelGroup *accelgroup, GObject *object, guint key, @@ -354,9 +352,9 @@ gossip_chat_window_init (GossipChatWindow *window) * stock image */ image = gtk_image_menu_item_get_image (GTK_IMAGE_MENU_ITEM (priv->menu_conv_info)); - gtk_image_set_from_stock (GTK_IMAGE (image), - GOSSIP_STOCK_CONTACT_INFORMATION, - GTK_ICON_SIZE_MENU); + gtk_image_set_from_icon_name (GTK_IMAGE (image), + EMPATHY_IMAGE_CONTACT_INFORMATION, + GTK_ICON_SIZE_MENU); /* Set up smiley menu */ menu = gossip_chat_view_get_smiley_menu ( @@ -502,30 +500,6 @@ gossip_chat_window_finalize (GObject *object) G_OBJECT_CLASS (gossip_chat_window_parent_class)->finalize (object); } -static GdkPixbuf * -chat_window_get_status_pixbuf (GossipChatWindow *window, - GossipChat *chat) -{ - GossipChatWindowPriv *priv; - GdkPixbuf *pixbuf; - - priv = GET_PRIV (window); - - if (g_list_find (priv->chats_new_msg, chat)) { - pixbuf = gossip_stock_render (GOSSIP_STOCK_MESSAGE, - GTK_ICON_SIZE_MENU); - } - else if (g_list_find (priv->chats_composing, chat)) { - pixbuf = gossip_stock_render (GOSSIP_STOCK_TYPING, - GTK_ICON_SIZE_MENU); - } - else { - pixbuf = gossip_chat_get_status_pixbuf (chat); - } - - return pixbuf; -} - static void chat_window_accel_cb (GtkAccelGroup *accelgroup, GObject *object, @@ -668,15 +642,24 @@ static void chat_window_update_status (GossipChatWindow *window, GossipChat *chat) { - GtkImage *image; - GdkPixbuf *pixbuf; + GossipChatWindowPriv *priv; + GtkImage *image; + const gchar *icon_name = NULL; + + priv = GET_PRIV (window); - pixbuf = chat_window_get_status_pixbuf (window, chat); + if (g_list_find (priv->chats_new_msg, chat)) { + icon_name = EMPATHY_IMAGE_MESSAGE; + } + else if (g_list_find (priv->chats_composing, chat)) { + icon_name = EMPATHY_IMAGE_TYPING; + } + else { + icon_name = gossip_chat_get_status_icon_name (chat); + } image = g_object_get_data (G_OBJECT (chat), "chat-window-tab-image"); - gtk_image_set_from_pixbuf (image, pixbuf); + gtk_image_set_from_icon_name (image, icon_name, GTK_ICON_SIZE_MENU); - g_object_unref (pixbuf); - chat_window_update_title (window, chat); chat_window_update_tooltip (window, chat); } @@ -686,7 +669,6 @@ chat_window_update_title (GossipChatWindow *window, GossipChat *chat) { GossipChatWindowPriv *priv; - GdkPixbuf *pixbuf = NULL; const gchar *str; gchar *title; gint n_chats; @@ -742,16 +724,10 @@ chat_window_update_title (GossipChatWindow *window, g_free (title); if (priv->chats_new_msg) { - pixbuf = gossip_stock_render (GOSSIP_STOCK_MESSAGE, - GTK_ICON_SIZE_MENU); + gtk_window_set_icon_name (GTK_WINDOW (priv->dialog), + EMPATHY_IMAGE_MESSAGE); } else { - pixbuf = NULL; - } - - gtk_window_set_icon (GTK_WINDOW (priv->dialog), pixbuf); - - if (pixbuf) { - g_object_unref (pixbuf); + gtk_window_set_icon_name (GTK_WINDOW (priv->dialog), NULL); } } diff --git a/libempathy-gtk/gossip-chat.c b/libempathy-gtk/gossip-chat.c index 85aeee27..e8906dbd 100644 --- a/libempathy-gtk/gossip-chat.c +++ b/libempathy-gtk/gossip-chat.c @@ -1072,13 +1072,13 @@ gossip_chat_get_tooltip (GossipChat *chat) return NULL; } -GdkPixbuf * -gossip_chat_get_status_pixbuf (GossipChat *chat) +const gchar * +gossip_chat_get_status_icon_name (GossipChat *chat) { g_return_val_if_fail (GOSSIP_IS_CHAT (chat), NULL); - if (GOSSIP_CHAT_GET_CLASS (chat)->get_status_pixbuf) { - return GOSSIP_CHAT_GET_CLASS (chat)->get_status_pixbuf (chat); + if (GOSSIP_CHAT_GET_CLASS (chat)->get_status_icon_name) { + return GOSSIP_CHAT_GET_CLASS (chat)->get_status_icon_name (chat); } return NULL; diff --git a/libempathy-gtk/gossip-chat.h b/libempathy-gtk/gossip-chat.h index 3de788ee..8cbcee0b 100644 --- a/libempathy-gtk/gossip-chat.h +++ b/libempathy-gtk/gossip-chat.h @@ -66,27 +66,26 @@ struct _GossipChatClass { GObjectClass parent; /* VTable */ - const gchar * (*get_name) (GossipChat *chat); - gchar * (*get_tooltip) (GossipChat *chat); - GdkPixbuf * (*get_status_pixbuf)(GossipChat *chat); - GossipContact * (*get_contact) (GossipChat *chat); - GtkWidget * (*get_widget) (GossipChat *chat); - - gboolean (*get_show_contacts)(GossipChat *chat); - void (*set_show_contacts)(GossipChat *chat, - gboolean show); - - gboolean (*is_group_chat) (GossipChat *chat); - void (*save_geometry) (GossipChat *chat, - gint x, - gint y, - gint w, - gint h); - void (*load_geometry) (GossipChat *chat, - gint *x, - gint *y, - gint *w, - gint *h); + const gchar * (*get_name) (GossipChat *chat); + gchar * (*get_tooltip) (GossipChat *chat); + const gchar * (*get_status_icon_name)(GossipChat *chat); + GossipContact * (*get_contact) (GossipChat *chat); + GtkWidget * (*get_widget) (GossipChat *chat); + + gboolean (*get_show_contacts) (GossipChat *chat); + void (*set_show_contacts) (GossipChat *chat, + gboolean show); + gboolean (*is_group_chat) (GossipChat *chat); + void (*save_geometry) (GossipChat *chat, + gint x, + gint y, + gint w, + gint h); + void (*load_geometry) (GossipChat *chat, + gint *x, + gint *y, + gint *w, + gint *h); }; GType gossip_chat_get_type (void); @@ -103,14 +102,13 @@ void gossip_chat_copy (GossipChat *chat); void gossip_chat_paste (GossipChat *chat); const gchar * gossip_chat_get_name (GossipChat *chat); gchar * gossip_chat_get_tooltip (GossipChat *chat); -GdkPixbuf * gossip_chat_get_status_pixbuf (GossipChat *chat); +const gchar * gossip_chat_get_status_icon_name (GossipChat *chat); GossipContact * gossip_chat_get_contact (GossipChat *chat); GossipContact * gossip_chat_get_own_contact (GossipChat *chat); GtkWidget * gossip_chat_get_widget (GossipChat *chat); gboolean gossip_chat_get_show_contacts (GossipChat *chat); void gossip_chat_set_show_contacts (GossipChat *chat, gboolean show); - gboolean gossip_chat_is_group_chat (GossipChat *chat); gboolean gossip_chat_is_connected (GossipChat *chat); diff --git a/libempathy-gtk/gossip-contact-list.c b/libempathy-gtk/gossip-contact-list.c index bf0556dc..aa5eb385 100644 --- a/libempathy-gtk/gossip-contact-list.c +++ b/libempathy-gtk/gossip-contact-list.c @@ -37,11 +37,11 @@ #include #include +#include "empathy-images.h" #include "gossip-contact-list.h" #include "gossip-contact-groups.h" #include "gossip-cell-renderer-expander.h" #include "gossip-cell-renderer-text.h" -#include "gossip-stock.h" #include "gossip-ui-utils.h" //#include "gossip-chat-invite.h" //#include "gossip-contact-info-dialog.h" @@ -257,7 +257,7 @@ static gboolean contact_list_update_list_mode_foreach (GtkTreeModel GossipContactList *list); enum { - COL_PIXBUF_STATUS, + COL_ICON_STATUS, COL_PIXBUF_AVATAR, COL_PIXBUF_AVATAR_VISIBLE, COL_NAME, @@ -288,11 +288,11 @@ static const GtkActionEntry entries[] = { N_("_Group"),NULL, NULL, NULL }, - { "Chat", GOSSIP_STOCK_MESSAGE, + { "Chat", EMPATHY_IMAGE_MESSAGE, N_("_Chat"), NULL, N_("Chat with contact"), G_CALLBACK (contact_list_action_cb) }, - { "Information", GOSSIP_STOCK_CONTACT_INFORMATION, + { "Information", EMPATHY_IMAGE_CONTACT_INFORMATION, N_("Infor_mation"), "I", N_("View contact information"), G_CALLBACK (contact_list_action_cb) }, @@ -308,7 +308,7 @@ static const GtkActionEntry entries[] = { N_("_Remove"), NULL, N_("Remove contact"), G_CALLBACK (contact_list_action_cb) }, - { "Invite", GOSSIP_STOCK_GROUP_MESSAGE, + { "Invite", EMPATHY_IMAGE_GROUP_MESSAGE, N_("_Invite to Chat Room"), NULL, N_("Invite to a currently open chat room"), G_CALLBACK (contact_list_action_cb) }, @@ -602,7 +602,6 @@ contact_list_contact_update (GossipContactList *list, gboolean do_remove = FALSE; gboolean do_set_active = FALSE; gboolean do_set_refresh = FALSE; - GdkPixbuf *pixbuf_presence; GdkPixbuf *pixbuf_avatar; priv = GET_PRIV (list); @@ -701,11 +700,10 @@ contact_list_contact_update (GossipContactList *list, set_model = TRUE; } - pixbuf_presence = gossip_pixbuf_for_contact (contact); pixbuf_avatar = gossip_pixbuf_avatar_from_contact_scaled (contact, 32, 32); for (l = iters; l && set_model; l = l->next) { gtk_tree_store_set (priv->store, l->data, - COL_PIXBUF_STATUS, pixbuf_presence, + COL_ICON_STATUS, gossip_icon_name_for_contact (contact), COL_STATUS, gossip_contact_get_status (contact), COL_IS_ONLINE, now_online, COL_NAME, gossip_contact_get_name (contact), @@ -713,9 +711,6 @@ contact_list_contact_update (GossipContactList *list, -1); } - if (pixbuf_presence) { - g_object_unref (pixbuf_presence); - } if (pixbuf_avatar) { g_object_unref (pixbuf_avatar); } @@ -1036,7 +1031,7 @@ contact_list_get_group (GossipContactList *list, gtk_tree_store_append (priv->store, &iter_group, NULL); gtk_tree_store_set (priv->store, &iter_group, - COL_PIXBUF_STATUS, NULL, + COL_ICON_STATUS, NULL, COL_NAME, name, COL_IS_GROUP, TRUE, COL_IS_ACTIVE, FALSE, @@ -1102,11 +1097,9 @@ contact_list_add_contact (GossipContactList *list, /* If no groups just add it at the top level. */ groups = gossip_contact_get_groups (contact); if (!groups) { - GdkPixbuf *pixbuf_status; GdkPixbuf *pixbuf_avatar; gboolean show_avatar = FALSE; - pixbuf_status = gossip_pixbuf_for_contact (contact); pixbuf_avatar = gossip_pixbuf_avatar_from_contact_scaled (contact, 32, 32); if (priv->show_avatars && !priv->is_compact) { @@ -1125,7 +1118,7 @@ contact_list_add_contact (GossipContactList *list, gtk_tree_store_append (priv->store, &iter, NULL); gtk_tree_store_set (priv->store, &iter, - COL_PIXBUF_STATUS, pixbuf_status, + COL_ICON_STATUS, gossip_icon_name_for_contact (contact), COL_PIXBUF_AVATAR, pixbuf_avatar, COL_PIXBUF_AVATAR_VISIBLE, show_avatar, COL_NAME, gossip_contact_get_name (contact), @@ -1145,16 +1138,12 @@ contact_list_add_contact (GossipContactList *list, if (pixbuf_avatar) { g_object_unref (pixbuf_avatar); } - if (pixbuf_status) { - g_object_unref (pixbuf_status); - } } /* Else add to each group. */ for (l = groups; l; l = l->next) { GtkTreePath *path; GtkTreeIter model_iter_group; - GdkPixbuf *pixbuf_status; GdkPixbuf *pixbuf_avatar; const gchar *name; gboolean created; @@ -1166,7 +1155,6 @@ contact_list_add_contact (GossipContactList *list, continue; } - pixbuf_status = gossip_pixbuf_for_contact (contact); pixbuf_avatar = gossip_pixbuf_avatar_from_contact_scaled (contact, 32, 32); contact_list_get_group (list, name, &iter_group, &iter_separator, &created); @@ -1187,7 +1175,7 @@ contact_list_add_contact (GossipContactList *list, gtk_tree_store_insert_after (priv->store, &iter, &iter_group, NULL); gtk_tree_store_set (priv->store, &iter, - COL_PIXBUF_STATUS, pixbuf_status, + COL_ICON_STATUS, gossip_icon_name_for_contact (contact), COL_PIXBUF_AVATAR, pixbuf_avatar, COL_PIXBUF_AVATAR_VISIBLE, show_avatar, COL_NAME, gossip_contact_get_name (contact), @@ -1207,9 +1195,6 @@ contact_list_add_contact (GossipContactList *list, if (pixbuf_avatar) { g_object_unref (pixbuf_avatar); } - if (pixbuf_status) { - g_object_unref (pixbuf_status); - } if (!created) { continue; @@ -1303,7 +1288,7 @@ contact_list_create_model (GossipContactList *list) } priv->store = gtk_tree_store_new (COL_COUNT, - GDK_TYPE_PIXBUF, /* Status pixbuf */ + G_TYPE_STRING, /* Status icon-name */ GDK_TYPE_PIXBUF, /* Avatar pixbuf */ G_TYPE_BOOLEAN, /* Avatar pixbuf visible */ G_TYPE_STRING, /* Name */ @@ -1834,9 +1819,6 @@ contact_list_cell_set_background (GossipContactList *list, NULL); } } else { - g_object_set (cell, - "cell-background-gdk", NULL, - NULL); #if 0 gint color_sum_normal; gint color_sum_selected; @@ -1873,24 +1855,22 @@ contact_list_pixbuf_cell_data_func (GtkTreeViewColumn *tree_column, GtkTreeIter *iter, GossipContactList *list) { - GdkPixbuf *pixbuf; - gboolean is_group; - gboolean is_active; + gchar *icon_name; + gboolean is_group; + gboolean is_active; gtk_tree_model_get (model, iter, COL_IS_GROUP, &is_group, COL_IS_ACTIVE, &is_active, - COL_PIXBUF_STATUS, &pixbuf, + COL_ICON_STATUS, &icon_name, -1); g_object_set (cell, "visible", !is_group, - "pixbuf", pixbuf, + "icon-name", icon_name, NULL); - if (pixbuf) { - g_object_unref (pixbuf); - } + g_free (icon_name); contact_list_cell_set_background (list, cell, is_group, is_active); } diff --git a/libempathy-gtk/gossip-preferences.c b/libempathy-gtk/gossip-preferences.c index 2179a7ef..a02a4fa9 100644 --- a/libempathy-gtk/gossip-preferences.c +++ b/libempathy-gtk/gossip-preferences.c @@ -33,7 +33,6 @@ #include #include "gossip-preferences.h" -#include "gossip-stock.h" #include "gossip-ui-utils.h" #include "gossip-theme-manager.h" #include "gossip-spell.h" diff --git a/libempathy-gtk/gossip-presence-chooser.c b/libempathy-gtk/gossip-presence-chooser.c index e540c8a4..46b27545 100644 --- a/libempathy-gtk/gossip-presence-chooser.c +++ b/libempathy-gtk/gossip-presence-chooser.c @@ -34,7 +34,7 @@ #include #include "gossip-ui-utils.h" -#include "gossip-stock.h" +#include "empathy-images.h" #include "gossip-presence-chooser.h" #include "gossip-status-presets.h" @@ -321,7 +321,6 @@ presence_chooser_show_dialog (GossipPresenceChooser *chooser, GtkWidget *combo; GtkWidget *entry; GtkWidget *checkbutton; - GdkPixbuf *pixbuf; const gchar *default_status; priv = GET_PRIV (chooser); @@ -355,9 +354,9 @@ presence_chooser_show_dialog (GossipPresenceChooser *chooser, G_CALLBACK (presence_chooser_dialog_response_cb), chooser); - pixbuf = gossip_pixbuf_for_presence_state (state); - gtk_image_set_from_pixbuf (GTK_IMAGE (image), pixbuf); - g_object_unref (pixbuf); + gtk_image_set_from_icon_name (GTK_IMAGE (image), + gossip_icon_name_for_presence_state (state), + GTK_ICON_SIZE_MENU); if (!store[state]) { GList *presets, *l; @@ -486,10 +485,10 @@ presence_chooser_menu_add_item (GossipPresenceChooser *chooser, { GtkWidget *item; GtkWidget *image; - const gchar *stock; + const gchar *icon_name; item = gtk_image_menu_item_new_with_label (str); - stock = gossip_stock_for_state (state); + icon_name = gossip_icon_name_for_presence_state (state); if (custom) { g_signal_connect ( @@ -505,7 +504,7 @@ presence_chooser_menu_add_item (GossipPresenceChooser *chooser, chooser); } - image = gtk_image_new_from_stock (stock, GTK_ICON_SIZE_MENU); + image = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_MENU); gtk_widget_show (image); gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image); @@ -943,7 +942,6 @@ presence_chooser_flash_timeout_cb (GossipPresenceChooser *chooser) { GossipPresenceChooserPriv *priv; McPresence state; - GdkPixbuf *pixbuf; static gboolean on = FALSE; priv = GET_PRIV (chooser); @@ -954,9 +952,9 @@ presence_chooser_flash_timeout_cb (GossipPresenceChooser *chooser) state = priv->flash_state_2; } - pixbuf = gossip_pixbuf_for_presence_state (state); - gtk_image_set_from_pixbuf (GTK_IMAGE (priv->image), pixbuf); - g_object_unref (pixbuf); + gtk_image_set_from_icon_name (GTK_IMAGE (priv->image), + gossip_icon_name_for_presence_state (state), + GTK_ICON_SIZE_MENU); on = !on; @@ -991,7 +989,6 @@ gossip_presence_chooser_flash_stop (GossipPresenceChooser *chooser, McPresence state) { GossipPresenceChooserPriv *priv; - GdkPixbuf *pixbuf; g_return_if_fail (GOSSIP_IS_PRESENCE_CHOOSER (chooser)); @@ -1002,9 +999,9 @@ gossip_presence_chooser_flash_stop (GossipPresenceChooser *chooser, priv->flash_timeout_id = 0; } - pixbuf = gossip_pixbuf_for_presence_state (state); - gtk_image_set_from_pixbuf (GTK_IMAGE (priv->image), pixbuf); - g_object_unref (pixbuf); + gtk_image_set_from_icon_name (GTK_IMAGE (priv->image), + gossip_icon_name_for_presence_state (state), + GTK_ICON_SIZE_MENU); priv->last_state = state; } diff --git a/libempathy-gtk/gossip-private-chat.c b/libempathy-gtk/gossip-private-chat.c index 17c55b19..a3bdbb6b 100644 --- a/libempathy-gtk/gossip-private-chat.c +++ b/libempathy-gtk/gossip-private-chat.c @@ -44,7 +44,7 @@ #include "gossip-chat.h" #include "gossip-preferences.h" //#include "gossip-sound.h" -#include "gossip-stock.h" +#include "empathy-images.h" #include "gossip-ui-utils.h" #define DEBUG_DOMAIN "PrivateChat" @@ -78,13 +78,9 @@ static void private_chat_widget_destroy_cb (GtkWidget GossipPrivateChat *chat); static const gchar * private_chat_get_name (GossipChat *chat); static gchar * private_chat_get_tooltip (GossipChat *chat); -static GdkPixbuf * private_chat_get_status_pixbuf (GossipChat *chat); +static const gchar * private_chat_get_status_icon_name (GossipChat *chat); static GossipContact *private_chat_get_contact (GossipChat *chat); static GtkWidget * private_chat_get_widget (GossipChat *chat); -/*static GdkPixbuf * private_chat_pad_to_size (GdkPixbuf *pixbuf, - gint width, - gint height, - gint extra_padding_right);*/ G_DEFINE_TYPE (GossipPrivateChat, gossip_private_chat, GOSSIP_TYPE_CHAT); @@ -96,14 +92,14 @@ gossip_private_chat_class_init (GossipPrivateChatClass *klass) object_class->finalize = private_chat_finalize; - chat_class->get_name = private_chat_get_name; - chat_class->get_tooltip = private_chat_get_tooltip; - chat_class->get_status_pixbuf = private_chat_get_status_pixbuf; - chat_class->get_contact = private_chat_get_contact; - chat_class->get_widget = private_chat_get_widget; - chat_class->get_show_contacts = NULL; - chat_class->set_show_contacts = NULL; - chat_class->is_group_chat = NULL; + chat_class->get_name = private_chat_get_name; + chat_class->get_tooltip = private_chat_get_tooltip; + chat_class->get_status_icon_name = private_chat_get_status_icon_name; + chat_class->get_contact = private_chat_get_contact; + chat_class->get_widget = private_chat_get_widget; + chat_class->get_show_contacts = NULL; + chat_class->set_show_contacts = NULL; + chat_class->is_group_chat = NULL; g_type_class_add_private (object_class, sizeof (GossipPrivateChatPriv)); } @@ -283,8 +279,8 @@ private_chat_get_tooltip (GossipChat *chat) status); } -static GdkPixbuf * -private_chat_get_status_pixbuf (GossipChat *chat) +static const gchar * +private_chat_get_status_icon_name (GossipChat *chat) { GossipPrivateChatPriv *priv; GossipContact *contact; @@ -295,7 +291,7 @@ private_chat_get_status_pixbuf (GossipChat *chat) contact = gossip_chat_get_contact (chat); - return gossip_pixbuf_for_contact (contact); + return gossip_icon_name_for_contact (contact); } static GossipContact * diff --git a/libempathy-gtk/gossip-profile-chooser.c b/libempathy-gtk/gossip-profile-chooser.c index 7accbefe..96c072c9 100644 --- a/libempathy-gtk/gossip-profile-chooser.c +++ b/libempathy-gtk/gossip-profile-chooser.c @@ -64,16 +64,16 @@ gossip_profile_chooser_new (void) /* set up combo box with new store */ store = gtk_list_store_new (COL_COUNT, - GDK_TYPE_PIXBUF, /* Icon */ - G_TYPE_STRING, /* Label */ - MC_TYPE_PROFILE); /* Profile */ + G_TYPE_STRING, /* Icon name */ + G_TYPE_STRING, /* Label */ + MC_TYPE_PROFILE); /* Profile */ combo_box = gtk_combo_box_new_with_model (GTK_TREE_MODEL (store)); renderer = gtk_cell_renderer_pixbuf_new (); gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo_box), renderer, FALSE); gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combo_box), renderer, - "pixbuf", COL_ICON, + "icon-name", COL_ICON, NULL); renderer = gtk_cell_renderer_text_new (); gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo_box), renderer, TRUE); @@ -89,7 +89,7 @@ gossip_profile_chooser_new (void) gtk_list_store_append (store, &iter); gtk_list_store_set (store, &iter, - COL_ICON, gossip_pixbuf_from_profile (profile, GTK_ICON_SIZE_BUTTON), + COL_ICON, mc_profile_get_icon_name (profile), COL_LABEL, mc_profile_get_display_name (profile), COL_PROFILE, profile, -1); diff --git a/libempathy-gtk/gossip-stock.c b/libempathy-gtk/gossip-stock.c deleted file mode 100644 index 1490e65e..00000000 --- a/libempathy-gtk/gossip-stock.c +++ /dev/null @@ -1,129 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* - * Copyright (C) 2003-2007 Imendio AB - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - * - * Authors: Mikael Hallendal - * Richard Hult - * Martyn Russell - */ - -#include "config.h" - -#include - -#include - -#include "gossip-stock.h" - -static GtkIconFactory *icon_factory = NULL; -static GtkWidget *main_widget = NULL; - -static GtkStockItem stock_items[] = { - { GOSSIP_STOCK_OFFLINE, NULL }, - { GOSSIP_STOCK_AVAILABLE, NULL }, - { GOSSIP_STOCK_BUSY, NULL }, - { GOSSIP_STOCK_AWAY, NULL }, - { GOSSIP_STOCK_EXT_AWAY, NULL }, - { GOSSIP_STOCK_PENDING, NULL }, - { GOSSIP_STOCK_MESSAGE, NULL }, - { GOSSIP_STOCK_TYPING, NULL }, - { GOSSIP_STOCK_CONTACT_INFORMATION, NULL }, - { GOSSIP_STOCK_GROUP_MESSAGE, NULL } -}; - -void -gossip_stock_init (GtkWidget *widget) -{ - GtkIconSet *icon_set; - gint i; - - g_assert (icon_factory == NULL); - - main_widget = g_object_ref (widget); - - gtk_stock_add (stock_items, G_N_ELEMENTS (stock_items)); - - icon_factory = gtk_icon_factory_new (); - gtk_icon_factory_add_default (icon_factory); - g_object_unref (icon_factory); - - for (i = 0; i < G_N_ELEMENTS (stock_items); i++) { - gchar *path, *filename; - GdkPixbuf *pixbuf; - - filename = g_strdup_printf ("%s.png", stock_items[i].stock_id); - path = gossip_paths_get_image_path (filename); - pixbuf = gdk_pixbuf_new_from_file (path, NULL); - g_free (path); - g_free (filename); - - icon_set = gtk_icon_set_new_from_pixbuf (pixbuf); - - gtk_icon_factory_add (icon_factory, - stock_items[i].stock_id, - icon_set); - - gtk_icon_set_unref (icon_set); - - g_object_unref (pixbuf); - } -} - -void -gossip_stock_finalize (void) -{ - g_assert (icon_factory != NULL); - - gtk_icon_factory_remove_default (icon_factory); - g_object_unref (main_widget); - - main_widget = NULL; - icon_factory = NULL; -} - -GdkPixbuf * -gossip_stock_render (const gchar *stock, - GtkIconSize size) -{ - return gtk_widget_render_icon (main_widget, stock, size, NULL); -} - -const gchar * -gossip_stock_for_state (McPresence state) -{ - switch (state) { - case MC_PRESENCE_AVAILABLE: - return GOSSIP_STOCK_AVAILABLE; - case MC_PRESENCE_DO_NOT_DISTURB: - return GOSSIP_STOCK_BUSY; - case MC_PRESENCE_AWAY: - return GOSSIP_STOCK_AWAY; - case MC_PRESENCE_EXTENDED_AWAY: - return GOSSIP_STOCK_EXT_AWAY; - case MC_PRESENCE_HIDDEN: - case MC_PRESENCE_OFFLINE: - case MC_PRESENCE_UNSET: - return GOSSIP_STOCK_OFFLINE; - default: - g_assert_not_reached (); - } - - return NULL; -} - - diff --git a/libempathy-gtk/gossip-stock.h b/libempathy-gtk/gossip-stock.h deleted file mode 100644 index 8cf66eb6..00000000 --- a/libempathy-gtk/gossip-stock.h +++ /dev/null @@ -1,63 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* - * Copyright (C) 2003-2007 Imendio AB - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - * - * Authors: Mikael Hallendal - * Richard Hult - * Martyn Russell - */ - -#ifndef __GOSSIP_STOCK_H__ -#define __GOSSIP_STOCK_H__ - -#include -#include - -#include - -G_BEGIN_DECLS - -#define GOSSIP_STOCK_OFFLINE "gossip-offline" -#define GOSSIP_STOCK_AVAILABLE "gossip-available" -#define GOSSIP_STOCK_BUSY "gossip-busy" -#define GOSSIP_STOCK_AWAY "gossip-away" -#define GOSSIP_STOCK_EXT_AWAY "gossip-extended-away" -#define GOSSIP_STOCK_PENDING "gossip-pending" - -#define GOSSIP_STOCK_MESSAGE "gossip-message" -#define GOSSIP_STOCK_TYPING "gossip-typing" - - -#define GOSSIP_STOCK_CONTACT_INFORMATION "vcard_16" - -#define GOSSIP_STOCK_AIM "gossip-aim" -#define GOSSIP_STOCK_ICQ "gossip-icq" -#define GOSSIP_STOCK_MSN "gossip-msn" -#define GOSSIP_STOCK_YAHOO "gossip-yahoo" - -#define GOSSIP_STOCK_GROUP_MESSAGE "gossip-group-message" - -void gossip_stock_init (GtkWidget *widget); -void gossip_stock_finalize (void); -GdkPixbuf * gossip_stock_render (const gchar *stock, - GtkIconSize size); -const gchar * gossip_stock_for_state (McPresence state); - -G_END_DECLS - -#endif /* __GOSSIP_STOCK_ICONS_H__ */ diff --git a/libempathy-gtk/gossip-ui-utils.c b/libempathy-gtk/gossip-ui-utils.c index b6dfb8f9..9bf2fb36 100644 --- a/libempathy-gtk/gossip-ui-utils.c +++ b/libempathy-gtk/gossip-ui-utils.c @@ -41,7 +41,9 @@ #include #include "gossip-ui-utils.h" -#include "gossip-stock.h" +#include "empathy-images.h" + +#define DEBUG_DOMAIN "UiUtils" struct SizeData { gint width; @@ -200,24 +202,34 @@ gossip_glade_setup_size_group (GladeXML *gui, } GdkPixbuf * -gossip_pixbuf_from_smiley (GossipSmiley type, - GtkIconSize icon_size) +gossip_pixbuf_from_icon_name (const gchar *icon_name, + GtkIconSize icon_size) { GtkIconTheme *theme; GdkPixbuf *pixbuf = NULL; GError *error = NULL; - gint w, h; - gint size; - const gchar *icon_id; theme = gtk_icon_theme_get_default (); - if (!gtk_icon_size_lookup (icon_size, &w, &h)) { - size = 16; - } else { - size = (w + h) / 2; + pixbuf = gtk_icon_theme_load_icon (theme, + icon_name, + icon_size, + 0, + &error); + if (error) { + gossip_debug (DEBUG_DOMAIN, "Error loading icon: %s", error->message); + g_clear_error (&error); } + return pixbuf; +} + +GdkPixbuf * +gossip_pixbuf_from_smiley (GossipSmiley type, + GtkIconSize icon_size) +{ + const gchar *icon_id; + switch (type) { case GOSSIP_SMILEY_NORMAL: /* :) */ icon_id = "stock_smiley-1"; @@ -306,106 +318,79 @@ gossip_pixbuf_from_smiley (GossipSmiley type, icon_id = NULL; } - pixbuf = gtk_icon_theme_load_icon (theme, - icon_id, /* icon name */ - size, /* size */ - 0, /* flags */ - &error); - return pixbuf; + return gossip_pixbuf_from_icon_name (icon_id, icon_size); } -GdkPixbuf * -gossip_pixbuf_from_profile (McProfile *profile, - GtkIconSize icon_size) -{ - GtkIconTheme *theme; - gint size = 48; - gint w, h; - const gchar *icon_id = NULL; - GError *error = NULL; - - theme = gtk_icon_theme_get_default (); - - if (gtk_icon_size_lookup (icon_size, &w, &h)) { - size = (w + h) / 2; - } - - icon_id = mc_profile_get_icon_name (profile); - - theme = gtk_icon_theme_get_default (); - return gtk_icon_theme_load_icon (theme, - icon_id, /* Icon name */ - size, /* Size */ - 0, /* Flags */ - &error); -} - -GdkPixbuf * -gossip_pixbuf_from_account (McAccount *account, - GtkIconSize icon_size) +const gchar * +gossip_icon_name_from_account (McAccount *account) { McProfile *profile; profile = mc_account_get_profile (account); - return gossip_pixbuf_from_profile (profile, icon_size); + return mc_profile_get_icon_name (profile); } -GdkPixbuf * -gossip_pixbuf_for_presence_state (McPresence state) +const gchar * +gossip_icon_name_for_presence_state (McPresence state) { - const gchar *stock; - - stock = gossip_stock_for_state (state); + switch (state) { + case MC_PRESENCE_AVAILABLE: + return EMPATHY_IMAGE_AVAILABLE; + case MC_PRESENCE_DO_NOT_DISTURB: + return EMPATHY_IMAGE_BUSY; + case MC_PRESENCE_AWAY: + return EMPATHY_IMAGE_AWAY; + case MC_PRESENCE_EXTENDED_AWAY: + return EMPATHY_IMAGE_EXT_AWAY; + case MC_PRESENCE_HIDDEN: + case MC_PRESENCE_OFFLINE: + case MC_PRESENCE_UNSET: + return EMPATHY_IMAGE_OFFLINE; + default: + g_assert_not_reached (); + } - return gossip_stock_render (stock, GTK_ICON_SIZE_MENU); + return NULL; } -GdkPixbuf * -gossip_pixbuf_for_presence (GossipPresence *presence) +const gchar * +gossip_icon_name_for_presence (GossipPresence *presence) { McPresence state; g_return_val_if_fail (GOSSIP_IS_PRESENCE (presence), - gossip_pixbuf_offline ()); + EMPATHY_IMAGE_OFFLINE); state = gossip_presence_get_state (presence); - return gossip_pixbuf_for_presence_state (state); + return gossip_icon_name_for_presence_state (state); } -GdkPixbuf * -gossip_pixbuf_for_contact (GossipContact *contact) +const gchar * +gossip_icon_name_for_contact (GossipContact *contact) { GossipPresence *presence; GossipSubscription subscription; g_return_val_if_fail (GOSSIP_IS_CONTACT (contact), - gossip_pixbuf_offline ()); + EMPATHY_IMAGE_OFFLINE); presence = gossip_contact_get_presence (contact); if (presence) { - return gossip_pixbuf_for_presence (presence); + return gossip_icon_name_for_presence (presence); } subscription = gossip_contact_get_subscription (contact); if (subscription != GOSSIP_SUBSCRIPTION_BOTH && subscription != GOSSIP_SUBSCRIPTION_TO) { - return gossip_stock_render (GOSSIP_STOCK_PENDING, - GTK_ICON_SIZE_MENU); + return EMPATHY_IMAGE_PENDING; } - return gossip_pixbuf_offline (); -} - -GdkPixbuf * -gossip_pixbuf_offline (void) -{ - return gossip_stock_render (GOSSIP_STOCK_OFFLINE, - GTK_ICON_SIZE_MENU); + return EMPATHY_IMAGE_OFFLINE; } GdkPixbuf * diff --git a/libempathy-gtk/gossip-ui-utils.h b/libempathy-gtk/gossip-ui-utils.h index 1e1bb1ee..d1625cfe 100644 --- a/libempathy-gtk/gossip-ui-utils.h +++ b/libempathy-gtk/gossip-ui-utils.h @@ -67,16 +67,14 @@ void gossip_glade_setup_size_group (GladeXML *g gchar *first_widget, ...); /* Pixbufs */ -GdkPixbuf * gossip_pixbuf_from_smiley (GossipSmiley type, - GtkIconSize icon_size); -GdkPixbuf * gossip_pixbuf_from_profile (McProfile *account, +GdkPixbuf * gossip_pixbuf_from_icon_name (const gchar *icon_name, GtkIconSize icon_size); -GdkPixbuf * gossip_pixbuf_from_account (McAccount *account, +GdkPixbuf * gossip_pixbuf_from_smiley (GossipSmiley type, GtkIconSize icon_size); -GdkPixbuf * gossip_pixbuf_for_presence_state (McPresence state); -GdkPixbuf * gossip_pixbuf_for_presence (GossipPresence *presence); -GdkPixbuf * gossip_pixbuf_for_contact (GossipContact *contact); -GdkPixbuf * gossip_pixbuf_offline (void); +const gchar * gossip_icon_name_from_account (McAccount *account); +const gchar * gossip_icon_name_for_presence_state (McPresence state); +const gchar * gossip_icon_name_for_presence (GossipPresence *presence); +const gchar * gossip_icon_name_for_contact (GossipContact *contact); GdkPixbuf * gossip_pixbuf_from_avatar_scaled (GossipAvatar *avatar, gint width, gint height); diff --git a/pixmaps/gossip-available.png b/pixmaps/gossip-available.png deleted file mode 100644 index c2d074f500b06ece0565d979069f996c0dac246b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 741 zcmV@2HQ*UHxaBpO3pY$&$0000EbVXQnL3MO! zZ*l-tZfkCDcW#U!4DtW~03Lc&Sad{Xb7OL8aCB*JZU6vyoJ&+F$V@INElLFd5MKj+ z>hujP0006sNklw5=xJiO2i)^g(8Mj1=~c@{9v=$Zj)@fyB?CPjWl@Zz+)c6 zywA)V2H52w1J)xP`m2OX6pSqenpOgxE0ZYXtXlA#VIv|uF6bmsfaoNZl#5BxB0H8f65Dwf-UQBw* zn`JDQmf=tboO1{vAPLExqMkYoAwN?#kQw3)nj58Mz{BN<41R{y(9t%#=1?+~sx>4P*4ATH(42-cp zgbUt5x^1*;=2p<_Z@YkHS)W!uNDb_`+^68 z9s&ZRV3;tS%CWJ7k9>j1i*!1@IS>GVR4OIewiYiJ)#H>R6qWa8+dzJHc0Rw;{#}hf XD>2R)M%!kj00000NkvXXu0mjfttB}{ diff --git a/pixmaps/gossip-away.png b/pixmaps/gossip-away.png deleted file mode 100644 index ba9ed232a3c4e167846d5e3b98fabd38d322f3db..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 609 zcmV-n0-pVeP)@2HQ*UHxaBpO3pY$&$0000EbVXQnL3MO! zZ*l-tZfkCDcW#U!4DtW~03Lc&Sad{Xb7OL8aCB*JZU6vyoJ&+F$V@INElLFd5MKj+ z>hujP00057NklFOZjphU!=jkRhq)uz{&n|mEiX~XHV&V!{Rk(sFjWNe3_ccJG;#%Ga*@deCd2}tCaJzsotfXjH;WM zvRIruR@g5D98dR){mngGEauC93&^iE16hy{Y~v=H~()!%5ZzW zm_)DplZOsK|$o4+2 zU7eXJhqrTjdl@j?zkce-a3UJPef|WaHO4YnmeuKAJ4DU(%+iZbYOVhHVdsK~=FDW= z3`Z=(`s!PnR*20&u^9-B02)3t+OW}v+3|F^S+8F%l}dd-E(a@M{He?93lARcQvf0e vvNZ(}5kMgVB7!o;_q>gBz`b9;^8f2QLO5|1BdN@2HQ*UHxaBpO3pY$&$0000EbVXQnL3MO! zZ*l-tZfkCDcW#U!4DtW~03Lc&Sad{Xb7OL8aCB*JZU6vyoJ&+F$V@INElLFd5MKj+ z>hujP0008VNkl?B#JH#}j)~gd)@>8v&1IzTyvma+SX}a0hpazA75T|-vRUg1yFr?dv1T>=@W0hK9JqD zvrWd)BPM?-yV1{nTm1b-WwbQ2avE^|3fSJ0`2LfR-YOJ^hLn%0xNsWp7Qn{{;Ntl0 z=*)-LuT7V0dp9;Vnw~Cu`u(%VjvqWYqT_IyXsL*IRRkV{L`co9r?N6(b*6M{IaR5K z-va0csJpA>)RDtSOkAHOTK*A)X68=?LZP%~q3T$87?Wx5u^pWYr}Fuomo68tUTy%M zdE>RgG~N+CngXE_D&XVKLv}wmfRAI6K`TMfM371F_B#ifE_^ZeDX>ifv}euG3(vQw zd{n_l4-hH|B1uzAhJE`E5c_~q`46V1rug}%N&5S@vmQlkNT^lgJF{~&x98cK62c;+ zCGrMqldP;Pk;`St=Q}aRVvHeN4e`!ZHvntSUH$UwYfB?9?@1#QAS^})gsTr(3qy*< zB2p=<`&KbZCU8RI~cKi4P`!y?=Lp{%-n-bPGsHfN zG}x8QWYS!}8L~C=Bz?Vo@2HQ*UHxaBpO3pY$&$0000EbVXQnL3MO! zZ*l-tZfkCDcW#U!4DtW~03Lc&Sad{Xb7OL8aCB*JZU6vyoJ&+F$V@INElLFd5MKj+ z>hujP00071Nkl`2!`j+R}}(CT<`J)lHUE zL|26o1a^^N7ZO1xWO%0+{tXocQj;VLFD7ZSVTzm1B*>|(Rhv5p+}6cd)F>*U_ws$8 z=flJM0RMA17Ck#Q>ohnmX`oi_GWYJp&z5Mg^su!qV-@MAwzgv>zZL#!S-|4*`P$v) znxie~C^w10K=9tb0C-V@TNhkTLHQ6yd#Oa#ShU^kK2-5n00Y6zPFs~pl#NKt%^({2 zh{__Va5=a(RaR#8%Cg)IfaLT{o?j~EnT01;&sh-L#H7!Mak(0oy1GCqK{~yS&{BAN zcxYsPF|^zYVC|;_GQpi2jvAv@Z@}8TA1@4*=l;Q zd4wOM05D3FJ?n8cXp$?77~NFSar+v!5^*TXR`$7~2tgDfNfMe4J8GlR&-LE{#T0`* zP4y-s6yQs64&e-kGgd3&@ffr`4}gJhY8sLC4Oq-(G&j2nCMG6NP{2?78m1j8PS-ZbkEfJvwERb^pF zsqoLfg{{F3N-5keE(n4EogjecI9%zx9@p!OpAi61(wKO>p~j!aLb_}sad^U8c@qe{Tgb05e+sLr%10aQ2M;)$jbds$m3sAhG9C`E zytG)$E_%J*#Ge4!dW=Q;Db;!iVbo$t9-j^b7IL?5S9iWUK+3fM00000NkvXXu0mjf Dp0G!K diff --git a/pixmaps/gossip-group-message.png b/pixmaps/gossip-group-message.png deleted file mode 100644 index ed2d33b9f861db2daebf5d371047f3af5884f869..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 764 zcmVWFU8GbZ8({Xk{QrNlj4iWF>9@00Ll1L_t(|+O3mINK|1I z$A90wGmbNkI?d?hBOMtHja&p#1Z|_GElS%(3(>#~$u^16GH4UjqI}RQF^e8Vn+he0 zYK%xrdQzB4=A$v4JJ&mpd+*mG6-|j2{oyRm;e3Do=lstHe@8LU4#>r5Uab8yns4-V z%ZagJdv5xJ-PdzT0@qhIh?Pl2MY%5;ovl$-XSJdzo>*+YY2@Vq`FZ~39$&C>)jP*Z z0>enQ$K&zl+S*!Yc6K&hU0w9_-r_(>1lzJG-G6zFL}g_%H8oLxq@f|BEEE#mogG4v zHdn9R#BFP2%J{l7t|AC}q-URUn>~6b4~_=7*AyU_?FGiT3Z?cwy#T&FcAT- zz?bDF*X_dP0Iw6CkLx`7qyccM?Kr>-#iedrv&5|h4&z)+ZszOB6bTb{muGOeKgEV! z0Ybhoda=T^HjQW2V@1wKR6r~#5aDn|-F(_L7E2}hHgEB5&SEBJkP<3}kwM{(O6IK? z0D3@I|8$`$rfHpr8cuk6N1pNO-D9NUWYoKpO(8eKckWZQc>+hCN+K;WQzokj@`DAD zgAJ`Y_)GDGl3Y1`hO`O&gKzlwb&A5GY94iTQPxson@LOBhO`0aGJ((U_m+mY@MSWJ zDIMeoHzI|K+dE2*H;Yu-L`pY9Cx@0sR)rA9q?Es1uu+wTgn_2%q-?=lOy}pE4pLHI zx0g(p6QQVbap?jOQpyX<3QWspX66SAaScO{ad+S;LUHo`^EeL&-;z!yu&lJT-XSg7 u*qD=7baCzXkRXu~DYfYLHsCD(8@~V#yY_XBcII;c0000C5z6un6Uso+p32*nH)NU*{&_ia;zbWB3PCMA_5UX*L6fugeZyt z06`ESo6X|k;h{pBrcEr%iiy9Uq9`CDSe6yzgCIb^-$y>5cSP59Q<|pH-`|d%RQ$#q@weV=^aCn^?;@8xnCp66k+*?@Bn&iU5ur#t5yp66ja9^>NT0+~$a zors7|Pfx?Qw>LPB1JCmih9MYZu@gAw2!a5%ZKKg>K$4_zyVlLk&DGi2**c%kW3gBu z3`01MvmMau_2BzHY}-bs(}5&OAfnfuEZpASzUOkewP6?l0M0qSzP_+ptuUQV(QG!6 zNF*Q#!sJkbsZc05hGBqn4%c;I+ct*7A*$6X1VPyE{GEq%Ivu{eyda7q%w{tT1_L}j zJ>mHH7@{byiRf^QkB*Me?RGI5jc|8&hg2#BQ563zBqD)`s8lLd7-Lz+n6cSxC=A0- g&iQX5GU@2HNp5R%V_|S*VAOhp0000EbVXQnL3MO! zZ*l-tZfkCDcW#U!4DtW~03Lc&Sad{Xb7OL8aCB*JZU6vyoJ&+F$V@INElLFd5MKj+ z>hujP00047NklY5sgBx|I(qbw5tgs9#&7Y2rb?+j-c;C~P8Hlxw#tC@T<)fNO07$5>OK+gvt zVt9;s6T)3t)?WZXcLApI`P=o?-^p~MF(&VOPoZhLx~f7KJ4c_qbN7^@FPFC;%CepU zDE9$brs3lJVjNTQpFbWpMe$gLuHGkr#8vd3mQ znx-`X>D5=B%_cXC#o6U}lt(58m_WoY3t$jf7$F2Jir>HfY&IY9F6IdU1BL~0L$XZ( O0000~2HJ#TtX0GqAaQUuCN8k+$ml!EnF$BYe zqy#ZdtAU|0{75K>z+#|9h<&9$>E&Gq@QK3aH#y7A_k41`xrZpF@IRwn^cW8L2Q^I# zYnm1Y04ZfuN*RsD64U?glCufIA-`AG^>>YpjUAnx*J{09FHy=uDwR^pON+VPR4Q32 zl^#T6iSOqC;gG*g2(d6YH0%oYUZ=-WqEO6ZfBy$uu38A)f#sz|H4}+sOXYGP8cS^0 zfN;o9g%HcbL&H~teK$yGp5#g1q!p(p?l zLLU2Ce7;~`h?L7En3)4;oI?l!#ux~t*xcH}x6Li|ba#_0t*xz$u@L~E0N`*qh691X zCB`VS=1*|WAvgyY0+iAdF^28!ZODp5Z!jpTtEwK^zhGHbPjhn%%HnF-LI|>16NX{n*s|JffKtlAg+RGfgr;dHViX&jo3@b>0zxSiA*iXTfn`~`eS*eV za&IpUN+}p)$QKHTfBKBIWb(v(dIF^sO&&LPc6Oi(k+K0tmCDEU^)<=4Kqg}%9*@H` z%|GT-`Ft(#GU2u%uMFx^i2H8 zxhmhe-TRPp{_5_)fU~Qsi@H4?=(>(EHaybPt@IGxU?6O)nLIlyV98>_3U zUjqnADO~^{IL{GEze1^Jx~{*Un2gw_bAYombT8!MLR{vWwmUHyDO|Mk3n4ufeHAb- QssI2007*qoM6N<$f?WFU8GbZ8({Xk{QrNlj1+3MgYKATls8 zGayP~Yjt8ECu(VJZDC_4AX9W@X>Mh5Co}I@0007?Nkl|fpMjRt3t_UR&VoK3U0E9P)JA?Zrq8hw2)0# zE-V2bI+@VPWID-2?wfgklJH*Vz0-xx_KZ;ro5(UI0wf6yS3Y0Mcr;q}^_d zWm)37u6Uj&mSu_OdE)!NSe7NNR!f2)5Ysdz2m%R$K+@d_p65}k)v#?F+qO|kVcRz4 za=BM;ZEc~HVtsv`YPAYLs*6x6mB{DwXss~}1FbbL?7umE<{a5<_MJX}VHkW&qO}&S zwM-QX62~0@q*yG9>$>8)uFTBLNDu_#`@Wc_`39k@FbvslG$56NxC20~R-@5qpp;^5 zZSA#vVRd!&Lj(Y=HQ${-&u_n)96B;gE|=@&^eKtsIN~^tSe7M@0|PQPHulOvsZ=5e0su0Z z410bX5h0HDsB4#aUvqTiIDY#jhX;qK*XvvwA7|;o1Jv6=R4Nq!q9`Ie&`)%*&!z9b zq5R?*g)5h7Hfr3QEYSZ&!sADes8lMXUn7voWB^D5Nwm+|(_?J!>@qyqPZUL@JA3Tz z>@sK!qj#GC2&t|Ml|nlI?GeU;+iKHE62gN6luD8AOY`LEpLm|%y`EC<@AIo8 zgV(NI{}ECNpxF4Q%CqMc${U-MH>y-NHn}&yNC`10@}bo+qp*9Hssf9H?CR@Ju`F3SJ^l$ybf`?xXy0000h9)QH;XgJE{&F|#vo7ycT?tC!!_n}FnUIYi_~<~R<37=VZf zl}d%vU5BGwmdY~>3{NpKF^%VWn5K!=8lTTsyZW(kM|YqX^DR-WR=K`BV{&Gmi}NcE zcd`HkgF&LvD28DWiA3-`uW1KgV=x+y;qR~s^w^ZjWdK~)t?|iZ@`DJq2`tNEBXh&? z@)GWIKeJ1#0HjhW0F+X-^ZQp25n+68jc_Q$)^?i0!y|+JeQd5Twv_*a23?(yI9h9zQUFa8 zluJ)_4IIZ|Y-H%$->+PHB9lq8u((oRqm|jVEno2e051b+=Llos=^_9C002ovPDHLk FV1lqSw5tFB diff --git a/pixmaps/vcard_48.png b/pixmaps/vcard_48.png deleted file mode 100644 index 776006cd85eaa0033728a7e6cb1d35b061d39167..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3155 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 #include #include -#include #define BUS_NAME "org.gnome.Empathy.Chat" #define OBJECT_PATH "/org/freedesktop/Telepathy/ChannelHandler" @@ -80,8 +79,6 @@ main (int argc, char *argv[]) EmpathyChandler *chandler; gtk_init (&argc, &argv); - /* FIXME: This is a horrible hack */ - gossip_stock_init (gtk_window_new (GTK_WINDOW_TOPLEVEL)); chandler = empathy_chandler_new (BUS_NAME, OBJECT_PATH); diff --git a/src/empathy-contact-list-main.c b/src/empathy-contact-list-main.c index 084649ba..8ea131c2 100644 --- a/src/empathy-contact-list-main.c +++ b/src/empathy-contact-list-main.c @@ -30,14 +30,12 @@ #include #include -#include #include static void destroy_cb (GtkWidget *window, gpointer user_data) { - gossip_stock_finalize (); gtk_main_quit (); } @@ -49,9 +47,6 @@ main (int argc, char *argv[]) gtk_init (&argc, &argv); - /* FIXME: This is a horrible hack */ - gossip_stock_init (gtk_window_new (GTK_WINDOW_TOPLEVEL)); - window = empathy_main_window_show (); g_signal_connect (window, "destroy", G_CALLBACK (destroy_cb), diff --git a/src/empathy-main.c b/src/empathy-main.c index 2aea589f..fb5684aa 100644 --- a/src/empathy-main.c +++ b/src/empathy-main.c @@ -35,8 +35,8 @@ #include #include +#include #include -#include #include #define DEBUG_DOMAIN "Empathy" @@ -104,7 +104,6 @@ static void destroy_cb (GtkWidget *window, gpointer user_data) { - gossip_stock_finalize (); gtk_main_quit (); } @@ -130,9 +129,6 @@ main (int argc, char *argv[]) gtk_init (&argc, &argv); - /* FIXME: This is a horrible hack */ - gossip_stock_init (gtk_window_new (GTK_WINDOW_TOPLEVEL)); - /* Setting up MC */ monitor = mc_account_monitor_new (); mc = mission_control_new (tp_get_bus ()); @@ -154,7 +150,7 @@ main (int argc, char *argv[]) NULL); /* Setting up the tray icon */ - icon = gtk_status_icon_new_from_stock (GOSSIP_STOCK_MESSAGE); + icon = gtk_status_icon_new_from_icon_name (EMPATHY_IMAGE_MESSAGE); gtk_status_icon_set_tooltip (icon, "Empathy - click here to show/hide the main window"); gtk_status_icon_set_visible (icon, TRUE); g_signal_connect (icon, "activate", -- 2.39.2