Mercurial > pidgin.yaz
diff libpurple/protocols/yahoo/libymsg.c @ 29869:f44718de8b06
merged with im.pidgin.pidgin
| author | Yoshiki Yazawa <yaz@honeyplanet.jp> |
|---|---|
| date | Mon, 22 Feb 2010 16:05:25 +0900 |
| parents | d77ecfe2b2c9 2b9db39bd7ed |
| children | 2292d8896b0b |
line wrap: on
line diff
--- a/libpurple/protocols/yahoo/libymsg.c Tue Feb 16 17:20:11 2010 +0900 +++ b/libpurple/protocols/yahoo/libymsg.c Mon Feb 22 16:05:25 2010 +0900 @@ -1125,9 +1125,12 @@ m = m2; purple_util_chrreplace(m, '\r', '\n'); if (!strcmp(m, "<ding>")) { + PurpleConversation *conv = NULL; char *username; username = g_markup_escape_text(im->fed_from, -1); + conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_ANY, + username, account); purple_prpl_got_attention(gc, username, YAHOO_BUZZ); g_free(username); g_free(m); @@ -1779,11 +1782,8 @@ char *crumb = NULL; char *crypt = NULL; -#if GLIB_CHECK_VERSION(2,6,0) totalelements = g_strv_length(split_data); -#else - while (split_data[++totalelements] != NULL); -#endif + if (totalelements >= 4) { response_no = strtol(split_data[0], NULL, 10); crumb = g_strdup(split_data[1] + strlen("crumb=")); @@ -1865,11 +1865,8 @@ int response_no = -1; char *token = NULL; -#if GLIB_CHECK_VERSION(2,6,0) totalelements = g_strv_length(split_data); -#else - while (split_data[++totalelements] != NULL); -#endif + if(totalelements == 1) response_no = strtol(split_data[0], NULL, 10); else if(totalelements >= 2) {