Changeset b79308b for protocols/jabber/jabber.c

Timestamp:

2008-04-14T13:10:53Z (16 years ago)

Author:

ulim <a.sporto+bee@…>

Branches:

master

Children:

0cab388

Parents:

6cac643 (diff), aa31117 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merged in upstream r379 (somewhere after 1.2-3).
Just one trivial conflict in the jabber Makefile, went smoothly.

File:

• protocols/jabber/jabber.c (modified) (1 diff)

protocols/jabber/jabber.c

@@ -267 +267 @@
         xt_free( jd->xt );
         
+        g_free( jd->cached_id_prefix );
         g_free( jd->away_message );
         g_free( jd->username );