Imported Upstream version 2.6.0

This commit is contained in:
arnaud.quette@free.fr 2011-01-26 10:35:08 +01:00
parent 26fb71b504
commit 459aaf9392
510 changed files with 40508 additions and 18859 deletions

View file

@ -330,7 +330,7 @@ int main(int argc, char **argv)
}
/* add a timer for data update */
#ifdef HAVE_GLIB_2_14
#ifdef HAVE_G_TIMEOUT_ADD_SECONDS
g_timeout_add_seconds (poll_interval,
#else
g_timeout_add (1000 * poll_interval, /* seconds */