Mercurial > pidgin.yaz

comparison libpurple/protocols/msn/msn.c @ 31811:41f1e44ad4b5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
propagate from branch 'im.pidgin.pidgin' (head 6f879669a6513a5c40335bbaefe842389a92b39e) to branch 'im.pidgin.pidgin.next.minor' (head 8cdcfae03192b964373cd95a73342d30ed15d13a)
author Marcus Lundblad <ml@update.uu.se>
date Sat, 20 Nov 2010 13:02:08 +0000
parents 23be655cc688 0123c69ec0e5
children ea2a155b4439
comparison
equal deleted inserted replaced
31369:250a16f2548f 31811:41f1e44ad4b5
968 if (purple_presence_is_online(presence)) 968 if (purple_presence_is_online(presence))
969 { 969 {
970 const char *psm, *name; 970 const char *psm, *name;
971 const char *mediatype = NULL; 971 const char *mediatype = NULL;
972 char *currentmedia = NULL; 972 char *currentmedia = NULL;
973 char *tmp;
974 973
975 psm = purple_status_get_attr_string(status, "message"); 974 psm = purple_status_get_attr_string(status, "message");
976 if (purple_presence_is_status_primitive_active(presence, PURPLE_STATUS_TUNE)) { 975 if (purple_presence_is_status_primitive_active(presence, PURPLE_STATUS_TUNE)) {
977 PurpleStatus *tune = purple_presence_get_status(presence, "tune"); 976 PurpleStatus *tune = purple_presence_get_status(presence, "tune");
978 const char *title = purple_status_get_attr_string(tune, PURPLE_TUNE_TITLE); 977 const char *title = purple_status_get_attr_string(tune, PURPLE_TUNE_TITLE);
1012 g_free(tmp2); 1011 g_free(tmp2);
1013 tmp2 = tmp3; 1012 tmp2 = tmp3;
1014 } 1013 }
1015 1014
1016 if (psm != NULL && *psm) { 1015 if (psm != NULL && *psm) {
1017 tmp = g_markup_escape_text(psm, -1); 1016 purple_notify_user_info_add_pair_plaintext(user_info, tmp2, psm);
1018 purple_notify_user_info_add_pair(user_info, tmp2, tmp);
1019 g_free(tmp);
1020 } else { 1017 } else {
1021 purple_notify_user_info_add_pair(user_info, _("Status"), tmp2); 1018 purple_notify_user_info_add_pair(user_info, _("Status"), tmp2);
1022 } 1019 }
1023 1020
1024 g_free(tmp2); 1021 g_free(tmp2);
1025 } else { 1022 } else {
1026 if (psm != NULL && *psm) { 1023 if (psm != NULL && *psm) {
1027 tmp = g_markup_escape_text(psm, -1);
1028 if (purple_presence_is_idle(presence)) { 1024 if (purple_presence_is_idle(presence)) {
1029 purple_notify_user_info_add_pair(user_info, _("Idle"), tmp); 1025 purple_notify_user_info_add_pair_plaintext(user_info, _("Idle"), psm);
1030 } else { 1026 } else {
1031 purple_notify_user_info_add_pair(user_info, _("Status"), tmp); 1027 purple_notify_user_info_add_pair_plaintext(user_info, _("Status"), psm);
1032 } 1028 }
1033 g_free(tmp);
1034 } else { 1029 } else {
1035 if (purple_presence_is_idle(presence)) { 1030 if (purple_presence_is_idle(presence)) {
1036 purple_notify_user_info_add_pair(user_info, _("Status"), 1031 purple_notify_user_info_add_pair(user_info, _("Status"),
1037 _("Idle")); 1032 _("Idle"));
1038 } else { 1033 } else {
2219 const char *alias; 2214 const char *alias;
2220 2215
2221 alias = purple_buddy_get_local_buddy_alias(b); 2216 alias = purple_buddy_get_local_buddy_alias(b);
2222 if (alias && alias[0]) 2217 if (alias && alias[0])
2223 { 2218 {
2224 char *aliastext = g_markup_escape_text(alias, -1); 2219 purple_notify_user_info_add_pair_plaintext(user_info, _("Alias"), alias);
2225 purple_notify_user_info_add_pair(user_info, _("Alias"), aliastext);
2226 g_free(aliastext);
2227 } 2220 }
2228 2221
2229 if ((alias = purple_buddy_get_server_alias(b)) != NULL) 2222 if ((alias = purple_buddy_get_server_alias(b)) != NULL)
2230 { 2223 {
2231 char *nicktext = g_markup_escape_text(alias, -1); 2224 char *nicktext = g_markup_escape_text(alias, -1);