1
0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-11-18 02:55:12 +00:00

Merge branch 'master' of ssh://git.omp.am/home/omp/git/conky

This commit is contained in:
Nikolas Garofil 2009-07-24 11:45:33 +02:00
commit ce8d124ce6

View File

@ -42,7 +42,7 @@
/* Xpath expressions for XOAP xml parsing */
#define NUM_XPATH_EXPRESSIONS 7
const xmlChar *xpath_expression[NUM_XPATH_EXPRESSIONS] = {
const char *xpath_expression[NUM_XPATH_EXPRESSIONS] = {
"/weather/cc/lsup", "/weather/cc/tmp", "/weather/cc/t",
"/weather/cc/bar/r", "/weather/cc/wind/s", "/weather/cc/wind/d",
"/weather/cc/hmid"
@ -97,7 +97,7 @@ static void parse_cc(PWEATHER *res, xmlXPathContextPtr xpathCtx)
xmlXPathObjectPtr xpathObj;
for (i = 0; i < NUM_XPATH_EXPRESSIONS; i++) {
xpathObj = xmlXPathEvalExpression(xpath_expression[i], xpathCtx);
xpathObj = xmlXPathEvalExpression((xmlChar *)xpath_expression[i], xpathCtx);
if ((xpathObj != NULL) && (xpathObj->nodesetval->nodeTab[0]->type == XML_ELEMENT_NODE)) {
content = (char *)xmlNodeGetContent(xpathObj->nodesetval->nodeTab[0]);
switch(i) {