Mercurial > pidgin
comparison 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 |
comparison
equal
deleted
inserted
replaced
17726:52c49142bbed | 18015:f8fc41570bf1 |
---|---|
154 g_timeout_add, | 154 g_timeout_add, |
155 g_source_remove, | 155 g_source_remove, |
156 gnt_input_add, | 156 gnt_input_add, |
157 g_source_remove, | 157 g_source_remove, |
158 NULL, /* input_get_error */ | 158 NULL, /* input_get_error */ |
159 #if GLIB_CHECK_VERSION(2,14,0) | |
160 g_timeout_add_seconds, | |
161 #else | |
162 NULL, | |
163 #endif | |
159 | 164 |
160 /* padding */ | 165 /* padding */ |
161 NULL, | |
162 NULL, | 166 NULL, |
163 NULL, | 167 NULL, |
164 NULL | 168 NULL |
165 }; | 169 }; |
166 | 170 |