Mercurial > pidgin.yaz
diff libpurple/protocols/msn/nexus.c @ 29775:e446b56c01e4
propagate from branch 'im.pidgin.pidgin' (head be77df4826034ac2521177bb6af6b60be3d1b4c4)
to branch 'im.pidgin.pidgin.next.minor' (head c0803026336ad6c803c2982ec7b0153378d71860)
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Tue, 16 Feb 2010 15:16:44 +0000 |
| parents | e77894113a14 |
| children | a99b6dcdb60d |
line wrap: on
line diff
--- a/libpurple/protocols/msn/nexus.c Tue Feb 16 15:16:28 2010 +0000 +++ b/libpurple/protocols/msn/nexus.c Tue Feb 16 15:16:44 2010 +0000 @@ -244,15 +244,6 @@ gpointer data; }; -#if !GLIB_CHECK_VERSION(2, 12, 0) -static gboolean -nexus_remove_all_cb(gpointer key, gpointer val, gpointer data) -{ - return TRUE; -} -#endif - - static gboolean nexus_parse_token(MsnNexus *nexus, int id, xmlnode *node) { @@ -281,12 +272,7 @@ if (token_str == NULL) return FALSE; -#if GLIB_CHECK_VERSION(2, 12, 0) g_hash_table_remove_all(nexus->tokens[id].token); -#else - g_hash_table_foreach_remove(nexus->tokens[id].token, - nexus_remove_all_cb, NULL); -#endif elems = g_strsplit(token_str, "&", 0);