pidgin/ljfisher-ssl-client-auth

Better status message handling in Gadu-Gadu. Fixes #14314

2011-06-22, Tomasz Wasilczyk
3368a7044a4a
Parents 186f61a85ac2
Children 2eef2f27855f
Better status message handling in Gadu-Gadu. Fixes #14314
2 files changed, 27 insertions(+), 20 deletions(-)
  • +1 -0
    ChangeLog
  • +26 -20
    libpurple/protocols/gg/gg.c
    • --- a/ChangeLog Wed Jun 22 17:43:51 2011 +0000
    +++ b/ChangeLog Wed Jun 22 22:10:37 2011 +0000
    @@ -18,6 +18,7 @@
    Gadu-Gadu:
    * Fixed searching for buddies in public directory. (Tomasz Wasilczyk)
    (#5242)
    + * Better status message handling. (Tomasz Wasilczyk) (#14314)
    version 2.8.0 (06/07/2011):
    General:
    --- a/libpurple/protocols/gg/gg.c Wed Jun 22 17:43:51 2011 +0000
    +++ b/libpurple/protocols/gg/gg.c Wed Jun 22 22:10:37 2011 +0000
    @@ -1071,6 +1071,7 @@
    {
    gchar *from;
    const char *st;
    + char *status_msg = NULL;
    ggp_update_buddy_avatar(gc, uin);
    @@ -1108,14 +1109,24 @@
    break;
    }
    - purple_debug_info("gg", "st = %s\n", st);
    - //msg = charset_convert(descr, "CP1250", "UTF-8");
    - if (descr == NULL) {
    + if (descr != NULL) {
    + status_msg = g_strdup(descr);
    + g_strstrip(status_msg);
    + if (status_msg[0] == '\0') {
    + g_free(status_msg);
    + status_msg = NULL;
    + }
    + }
    +
    + purple_debug_info("gg", "status of %u is %s [%s]\n", uin, st,
    + status_msg ? status_msg : "");
    + if (status_msg == NULL) {
    purple_prpl_got_user_status(purple_connection_get_account(gc),
    - from, st, NULL);
    + from, st, NULL);
    } else {
    purple_prpl_got_user_status(purple_connection_get_account(gc),
    - from, st, "message", descr, NULL);
    + from, st, "message", status_msg, NULL);
    + g_free(status_msg);
    }
    g_free(from);
    }
    @@ -1945,23 +1956,18 @@
    char *text;
    char *tmp;
    - status = purple_presence_get_active_status(purple_buddy_get_presence(b));
    -
    + status = purple_presence_get_active_status(
    + purple_buddy_get_presence(b));
    msg = purple_status_get_attr_string(status, "message");
    - if (msg != NULL) {
    - tmp = purple_markup_strip_html(msg);
    - text = g_markup_escape_text(tmp, -1);
    - g_free(tmp);
    -
    - return text;
    - } else {
    - tmp = purple_utf8_salvage(purple_status_get_name(status));
    - text = g_markup_escape_text(tmp, -1);
    - g_free(tmp);
    -
    - return text;
    - }
    + if (msg == NULL)
    + return NULL;
    +
    + tmp = purple_markup_strip_html(msg);
    + text = g_markup_escape_text(tmp, -1);
    + g_free(tmp);
    +
    + return text;
    }
    static void ggp_tooltip_text(PurpleBuddy *b, PurpleNotifyUserInfo *user_info, gboolean full)