Mercurial > pidgin.yaz
comparison 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 |
comparison
equal
deleted
inserted
replaced
29785:4c266d9c17eb | 29786:f549ad844d54 |
---|---|
1547 * If 'Music': | 1547 * If 'Music': |
1548 * 5: Artist | 1548 * 5: Artist |
1549 * 6: Album | 1549 * 6: Album |
1550 * 7: ? | 1550 * 7: ? |
1551 */ | 1551 */ |
1552 #if GLIB_CHECK_VERSION(2,6,0) | |
1553 strings = g_strv_length(cmedia_array); | 1552 strings = g_strv_length(cmedia_array); |
1554 #else | |
1555 while (cmedia_array[++strings] != NULL); | |
1556 #endif | |
1557 | 1553 |
1558 if (strings >= 4 && !strcmp(cmedia_array[2], "1")) { | 1554 if (strings >= 4 && !strcmp(cmedia_array[2], "1")) { |
1559 if (user->extinfo == NULL) | 1555 if (user->extinfo == NULL) |
1560 user->extinfo = g_new0(MsnUserExtendedInfo, 1); | 1556 user->extinfo = g_new0(MsnUserExtendedInfo, 1); |
1561 else { | 1557 else { |