Merge. mxit-2.x.y

Tue, 18 Dec 2012 16:06:51 +0200

author
Andrew Victor <andrew.victor@mxit.com>
date
Tue, 18 Dec 2012 16:06:51 +0200
branch
mxit-2.x.y
changeset 33557
20e1edc44d99
parent 33556
1fe2f250ff9e (current diff)
parent 33555
8feb2763abe9 (diff)
child 33559
94a95ba03c78

Merge.

libpurple/protocols/mxit/markup.c file | annotate | diff | comparison | revisions
libpurple/protocols/mxit/mxit.c file | annotate | diff | comparison | revisions
libpurple/protocols/mxit/protocol.c file | annotate | diff | comparison | revisions
libpurple/protocols/mxit/protocol.h file | annotate | diff | comparison | revisions
libpurple/protocols/mxit/roster.h file | annotate | diff | comparison | revisions
--- a/ChangeLog	Tue Dec 18 15:57:47 2012 +0200
+++ b/ChangeLog	Tue Dec 18 16:06:51 2012 +0200
@@ -32,6 +32,12 @@
 	* Fix a crash when removing a user before its icon is loaded. (Mark
 	  Barfield) (#15217)
 
+	MXit:
+	* Display farewell messages in a different colour to distinguish
+	  them from normal messages.
+	* Add support for typing notification.
+	* Add support for the Relationship Status profile attribute.
+
 	Yahoo!:
 	* Fix a double-free in profile/picture loading code. (Mihai Serban)
 	  (#15053)
--- a/libpurple/protocols/mxit/mxit.c	Tue Dec 18 15:57:47 2012 +0200
+++ b/libpurple/protocols/mxit/mxit.c	Tue Dec 18 16:06:51 2012 +0200
@@ -650,7 +650,6 @@
 	return m;
 }
 
-
 /*------------------------------------------------------------------------
  * Return Chat-room default settings.
  *

mercurial