Mercurial > pidgin.yaz
diff libpurple/protocols/msn/notification.c @ 29786:f549ad844d54
propagate from branch 'im.pidgin.pidgin.next.minor' (head 42544ec892337510146c931806a95dbf69c2fe30)
to branch 'im.pidgin.pidgin' (head 32a27a2c6eebcccdecd7d7cd420b3789c69cbb09)
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Thu, 18 Feb 2010 09:22:01 +0000 |
| parents | 56b73246e468 2c84c8d4a34d |
| children | 4ebecacf2fbb c5a7516418c7 |
line wrap: on
line diff
--- a/libpurple/protocols/msn/notification.c Thu Feb 18 09:20:29 2010 +0000 +++ b/libpurple/protocols/msn/notification.c Thu Feb 18 09:22:01 2010 +0000 @@ -1549,11 +1549,7 @@ * 6: Album * 7: ? */ -#if GLIB_CHECK_VERSION(2,6,0) strings = g_strv_length(cmedia_array); -#else - while (cmedia_array[++strings] != NULL); -#endif if (strings >= 4 && !strcmp(cmedia_array[2], "1")) { if (user->extinfo == NULL)