Mercurial > pidgin
diff finch/finch.c @ 18015:f8fc41570bf1
propagate from branch 'org.maemo.garage.pidgin.pidgin.pidgin-create-window' (head aa14d4a155af76ab7e3be4b5a92082e3bb2daa21)
to branch 'im.pidgin.rlaager.merging.for_2_1_0' (head c8c2bc1f0dd3a0a30b7be8b90114f176ab8c7943)
author | Richard Laager <rlaager@wiktel.com> |
---|---|
date | Sun, 20 May 2007 14:53:41 +0000 |
parents | 58e82c3b697e |
children | b8572b937c09 |
line wrap: on
line diff
--- a/finch/finch.c Sun May 20 14:53:34 2007 +0000 +++ b/finch/finch.c Sun May 20 14:53:41 2007 +0000 @@ -156,11 +156,15 @@ gnt_input_add, g_source_remove, NULL, /* input_get_error */ +#if GLIB_CHECK_VERSION(2,14,0) + g_timeout_add_seconds, +#else + NULL, +#endif /* padding */ NULL, NULL, - NULL, NULL };