Mercurial > pidgin
changeset 2731:e9e624d8803e
[gaim-migrate @ 2744]
eh
committer: Tailor Script <tailor@pidgin.im>
| author | Eric Warmenhoven <eric@warmenhoven.org> |
|---|---|
| date | Sat, 17 Nov 2001 02:50:06 +0000 |
| parents | a9aabf1170f1 |
| children | efa3e7115cb5 |
| files | src/applet.c src/buddy.c src/protocols/jabber/jabber.c src/protocols/oscar/icq.c |
| diffstat | 4 files changed, 16 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/applet.c Sat Nov 17 00:37:07 2001 +0000 +++ b/src/applet.c Sat Nov 17 02:50:06 2001 +0000 @@ -306,7 +306,7 @@ awayname, a->name, (AppletCallbackFunc)do_away_message, a); - awy = g_slist_next(awy); + awy = awy->next; g_free(awayname); } }
--- a/src/buddy.c Sat Nov 17 00:37:07 2001 +0000 +++ b/src/buddy.c Sat Nov 17 02:50:06 2001 +0000 @@ -1951,6 +1951,8 @@ char caps[256]; char *sotime = NULL, *itime; + int i; + time(&t); if (!bs->connlist) return; @@ -1976,6 +1978,8 @@ style = gtk_style_new(); gdk_font_unref(gtk_style_get_font(style)); gtk_style_set_font(style, gdk_font_ref(gtk_style_get_font(bs->label->style))); + for (i = 0; i < 5; i++) + style->fg[i] = bs->label->style->fg[i]; if ((blist_options & OPT_BLIST_GREY_IDLERS) && (b->idle)) { style->fg[GTK_STATE_NORMAL].red = (style->fg[GTK_STATE_NORMAL].red / 2) + (style->base[GTK_STATE_NORMAL].red / 2);
--- a/src/protocols/jabber/jabber.c Sat Nov 17 00:37:07 2001 +0000 +++ b/src/protocols/jabber/jabber.c Sat Nov 17 02:50:06 2001 +0000 @@ -773,10 +773,14 @@ } else { /* keep track of away msg same as yahoo plugin */ struct jabber_data *jd = GJ_GC(j)->proto_data; - gpointer val = g_hash_table_lookup(jd->hash, b->name); - if (val) + gpointer val = g_hash_table_lookup(jd->hash, normalize(b->name)); + if (val) { g_free(val); - g_hash_table_insert(jd->hash, g_strdup(b->name), g_strdup(xmlnode_get_tag_data(p->x, "status"))); + g_hash_table_insert(jd->hash, normalize(b->name), + g_strdup(xmlnode_get_tag_data(p->x, "status"))); + } else + g_hash_table_insert(jd->hash, g_strdup(normalize(b->name)), + g_strdup(xmlnode_get_tag_data(p->x, "status"))); if (!resources) {
--- a/src/protocols/oscar/icq.c Sat Nov 17 00:37:07 2001 +0000 +++ b/src/protocols/oscar/icq.c Sat Nov 17 02:50:06 2001 +0000 @@ -121,6 +121,8 @@ fu16_t cmdlen, cmd, reqid; if (!(tl = aim_readtlvchain(bs)) || !(datatlv = aim_gettlv(tl, 0x0001, 1))) { + if (tl) + aim_freetlvchain(tl); faimdprintf(sess, 0, "corrupt ICQ response\n"); return 0; } @@ -163,6 +165,8 @@ ret = userfunc(sess, rx); } + aim_freetlvchain(tl); + return ret; }