Mercurial > pidgin.yaz
comparison src/protocols/oscar/oscar.c @ 12365:7f1c4630799c
[gaim-migrate @ 14669]
Deal with idle and available oscar buddy status text correctly?
committer: Tailor Script <tailor@pidgin.im>
author | Mark Doliner <mark@kingant.net> |
---|---|
date | Tue, 06 Dec 2005 00:05:42 +0000 |
parents | 88de0d2fb68e |
children | a2f7bb907926 |
comparison
equal
deleted
inserted
replaced
12364:6fd82071a7b8 | 12365:7f1c4630799c |
---|---|
7636 if (aim_ssi_waitingforauth(od->sess->ssi.local, gname, b->name)) | 7636 if (aim_ssi_waitingforauth(od->sess->ssi.local, gname, b->name)) |
7637 ret = g_strdup(_("Not Authorized")); | 7637 ret = g_strdup(_("Not Authorized")); |
7638 else | 7638 else |
7639 ret = g_strdup(_("Offline")); | 7639 ret = g_strdup(_("Offline")); |
7640 } | 7640 } |
7641 else if (gaim_presence_is_available(presence) && !strcmp(id, OSCAR_STATUS_ID_AVAILABLE)) | 7641 else if (gaim_status_is_available(status) && !strcmp(id, OSCAR_STATUS_ID_AVAILABLE)) |
7642 { | 7642 { |
7643 /* Available */ | |
7643 message = gaim_status_get_attr_string(status, "message"); | 7644 message = gaim_status_get_attr_string(status, "message"); |
7644 if (message != NULL) | 7645 if (message != NULL) |
7645 { | 7646 { |
7646 ret = g_markup_escape_text(message, -1); | 7647 ret = g_markup_escape_text(message, -1); |
7647 gaim_util_chrreplace(ret, '\n', ' '); | 7648 gaim_util_chrreplace(ret, '\n', ' '); |
7648 } | 7649 } |
7649 } | 7650 } |
7650 else if (!gaim_presence_is_available(presence) && !strcmp(id, OSCAR_STATUS_ID_AWAY)) | 7651 else if (!gaim_status_is_available(status) && !strcmp(id, OSCAR_STATUS_ID_AWAY)) |
7651 { | 7652 { |
7653 /* Away */ | |
7652 message = gaim_status_get_attr_string(status, "message"); | 7654 message = gaim_status_get_attr_string(status, "message"); |
7653 if (message != NULL) | 7655 if (message != NULL) |
7654 { | 7656 { |
7655 gchar *tmp1, *tmp2; | 7657 gchar *tmp1, *tmp2; |
7656 tmp1 = gaim_markup_strip_html(message); | 7658 tmp1 = gaim_markup_strip_html(message); |