From 3758f3ff944c1cbcb7d3f53e873dcccb3d9a3f90 Mon Sep 17 00:00:00 2001 From: Thierry Lorthiois Date: Sun, 31 May 2009 17:32:49 +0000 Subject: [PATCH] issue 87 : another try --- src/battery/battery.c | 21 +++++++++++++++++++-- src/tint2 | Bin 64012 -> 64012 bytes 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/src/battery/battery.c b/src/battery/battery.c index c07f072..f0bb1ff 100644 --- a/src/battery/battery.c +++ b/src/battery/battery.c @@ -140,10 +140,27 @@ void init_battery() } } if (battery_dir != 0) { - path_energy_now = g_build_filename(battery_dir, "energy_now", NULL); - path_energy_full = g_build_filename(battery_dir, "energy_full", NULL); + char *path1 = g_build_filename(battery_dir, "energy_now", NULL); + if (g_file_test (path1, G_FILE_TEST_EXISTS)) { + path_energy_now = g_build_filename(battery_dir, "energy_now", NULL); + path_energy_full = g_build_filename(battery_dir, "energy_full", NULL); + } + else { + char *path2 = g_build_filename(battery_dir, "charge_now", NULL); + if (g_file_test (path2, G_FILE_TEST_EXISTS)) { + path_energy_now = g_build_filename(battery_dir, "charge_now", NULL); + path_energy_full = g_build_filename(battery_dir, "charge_full", NULL); + } + else { + g_free(battery_dir); + battery_dir = 0; + fprintf(stderr, "ERROR: can't found energy_* or charge_*\n"); + } + g_free(path2); + } path_current_now = g_build_filename(battery_dir, "current_now", NULL); path_status = g_build_filename(battery_dir, "status", NULL); + g_free(path1); } FILE *fp; diff --git a/src/tint2 b/src/tint2 index 5f9d2354e3960c0f03b4f077299e6b371fdc2af8..b9e7d04d71ee303fa6a38a120ad8371e12180ea4 100755 GIT binary patch delta 5073 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 delta 4769 zcmZ9Qdsvf47KbyCU=$H3D&nF+O}UjzQHr)Gl$M}YP{9I$00G0bB8qYm#VcTq5vv}x zx@uR-*6OZQ^h3oJ1r$WkqIJ7neU#PiRt?+M(%WjEt!95S1go1r-kdpe&Y3f3X1;Hd zO+VRg`pI@nrCrlKnXKvF){O;2@*(ACE0p=!k_`(T#^NZT9K4 ztU{T)KUS*nzRB3{N$>kRwp&`^8*IyVP`&?W<9EtrRV|K{1&=M34!L@6oI+`KdStQm zrb1C&A~WlDP;Edm+b%r`aAf!z_HsAFI6XmbY$rVon&!MiCfj0K_mxa0GisEby-7PH z&BRTxq-&F6f45yG%ihvE(PFXGXxAx}rZvJ&t~PsYm%@V2GgeJDA^Vt~_J{Z*YIjH+ znRP4Q#vXz7%tY_)WMiYp)7@~SO*B-_wIjJ-?tQ|GXGq?9&wr6t|ops1eK&G)8$te=I5l>=hdO>DEtf?$f zvWb4*mMx~=&nXzQTqdio_=#Z=QMtd1mXo#Bxtv~{dj(EE&kcc-U#y)RjY;u2;GXy} zw`7Hqmv>NNf7$n56=j#lrqd7cA$HK3FLsk&>t-`DnPw)agl0oGSrSJhfDsA=FwYoJ zbS8{r$@F!?SPyGlWFa$7RU0GKL(RK7EtVS!C&cV|(~lfd+?j!*5`7V;FfmuqmA+5( zhBR8+ANS;C>p;m`72+<}`hg#7gTY(caL_%;AABn*2rN(XWIC!%3b4~5CDkRGoiW;z zPr%Y;u^7wML-}?ZV%<(WFPxZQZhE`RI?BXkKc*#pvMb`0Cilmg)y3l=rwhp{5!imf z+D_-E6ogHe%~4J9M-_$8+1J3j*789<){GLJxHg2&+g@ zqYS<&lW1|Gipo<`@I8w9QpT_p8kVX;J^^4N%?4AbK**bg{E1+<&^!?GurzKNkj8zZ z)7-@>spwd&LPDjq{s`>!>wGuYqeNRBY4`@1&Y6ZYh$#Ws#DzLHx#=J z^h;WZNNl=(j2*(6H?`B|1h+x9sgU#AttI+Mud?F`zjj_wH(vXp?N7_0RP>j_E0rGW z$Fo%ONcR9E(mlq*iEqMZH_PiSaICZ@S(Hi@>5D}I_8DW~tY_tNM%VhXnrC~BR!ZzCj}i1Dm<|Q4SdUF82Em`bf+3iS#)XK|ZX!8FPcvQfxK!Bn~-WR}fse84n{%~pdYf_uPJY610h zS7?Uha5)f6qqn&%mE~v|RM&D}0-xmaK%RL#^(evYysSXgR`l|A=rNbf!3fa#rnt-Q!gsjL3MVQjV4Lv7wvuGce*g^e%%?lt*JX!euUdc^G>cCn2uxRYrW9@aXzix z;4+Q(xIVQ$zoaWWWZ`~+khwP5nbG%xGa zw0^ze_c7t}b^KYj_cyH%w9Ru2bbF&79^oeLx63r&b-*IJ_wn6l{K$FJV^}y=?;i{c zeu~IIjnxMRKYd|R&gS=?X<0UhqWYolg*~HN_g)xFl3L$;jUm*pTmH=q(*3QMd82{8 zWiQc(+ttiZ>e${bALYkya>e&+QjoVX^_Ed{5$D%@)K{w8{RLw_Qstfm8}_1fb002( zFG(l=@F9Q91gw3(Fr zNr=scOxlL8#!TwMmpPMcjszh<@Db0|aN@U`38i>L6<_49ENm5VB^=AUg4MO@m3Z#k zqW{@WUu$PR@4Q#?eCGWhslx81ub4DlMegiJui?$v2qz{gHup(+c zHj*u&FOEeHbIKC6<%?&2P(a>N`bz~Um_{TL$Hn;T#^GwS7owSB?$o4LAgO4zoaZ^O zh$JZ@WC^l8-=D2Jzp%;8|A5LArNl;Ty)#5;ZdsGzfj~CJ!s&#?Ia&tZ3nmsA% zp*J3YVu%~h*qp&6jj76tHa}gOKD9S3pLQMJ=rB>CtZM0a*Bj-#8c2aBMzRGIbz(fr zr@RwMke}46T$f<%nl_xfs+J;uY|t%yS2!%dI(uN{`;Mxmu#=I@DHIh}Y^qX-{b$Zx zMB5qz$1dW}R@Cz83Zb4y79tZID%VAHyD@TPKBg;IUwz)aiMBS5pxLL~sI_r;%wVfW zA?8q1i6O+q5h^_gq1@HATxXtuMt?7QF7U8eq=4TR9xJ3Y&(5Wbr{2N*CjI613p4+( z^M`CwpI$T#)ijRc>-jX=m0YOg)^X0gg9hr%!ztJ=c(~75)aCh@AC`=mn z{-)BT5oI?ofwo%nIV_abnyN{FKePo>YuiYg+&-MGpy>8V;F|Wytc)7l z16_3%OGTSHs7050zWRiC%3va+bo8V>1(#jjg`FtY4;O;iGE#TU#=UK6$9OyncXsT? zZoiNyBuqui;-`>Iip9Bo=wr8#tcsCuVq6LefVjhGg_v3 zk#RTW>WVh`bqCx~|M_XMlNL6`PoE@zNv7!TYz!%NCnBi*6(9R}7>JcW8BgI?LY(5z zUis7^LQ7Rw_%FAQt{lZ*9En#WUkFAP)_u#ag9Bu;if@LRkHpZ)YgKms zczCBINN@bL*Lg_sk|kLMMf!q8r4)15SE{}HGh;H^aeo5-n>lsgi=|6n-oI%lIhkK) z)byYX|Eq+2M@n{xx*n<&_#epc8a;S8K?!NbHJMCJZjV%U;?Jgg6!vKR;5A5S4gP