Mercurial > pidgin
diff libpurple/plugins/joinpart.c @ 20453:69febfa6d307
propagate from branch 'im.pidgin.pidgin' (head d3e5a5add3f39caa08b46c83177328e51c2d961a)
to branch 'im.pidgin.cpw.khc.msnp14' (head a8f6c999b039b4097aa70cd8d2597f3127615435)
| author | Carlos Silva <typ0@pidgin.im> |
|---|---|
| date | Sat, 16 Jun 2007 04:00:32 +0000 |
| parents | 4ca97b26a8fb |
| children | 926ccb104da0 |
line wrap: on
line diff
--- a/libpurple/plugins/joinpart.c Sun Jun 03 01:06:44 2007 +0000 +++ b/libpurple/plugins/joinpart.c Sat Jun 16 04:00:32 2007 +0000 @@ -86,7 +86,7 @@ /* If the room is small, don't bother. */ chat = PURPLE_CONV_CHAT(conv); threshold = purple_prefs_get_int(THRESHOLD_PREF); - if (g_list_length(purple_conv_chat_get_users(chat)) < threshold) + if (g_list_length((GList *)purple_conv_chat_get_users(chat)) < threshold) return FALSE; /* We always care about our buddies! */ @@ -210,7 +210,7 @@ * we don't have to worry one will be called after this. */ g_hash_table_destroy((GHashTable *)data[0]); - g_source_remove(GPOINTER_TO_UINT(data[1])); + purple_timeout_remove(GPOINTER_TO_UINT(data[1])); g_free(data); return TRUE;