# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1244400383 0
# Node ID c2c6ef44d66e44b64b7e9437bb523f2be0c9e8de
# Parent  5bbdb0a93c528e944612c3cb006af6c84c1dae91# Parent  7b7d1fc8dbbfa2283083d8590bfd1f3bfa82ba62
merge of '31f78d91abb7452e597bbd0f20f910c6cbb56099'
     and 'f017580a3b23ad3050f63c88789c0229df75a8ee'

diff -r 5bbdb0a93c52 -r c2c6ef44d66e ChangeLog
--- a/ChangeLog	Sun Jun 07 18:45:17 2009 +0000
+++ b/ChangeLog	Sun Jun 07 18:46:23 2009 +0000
@@ -60,6 +60,8 @@
 	* Fix an issue where Cyrus SASL DIGEST MD5 authentication might fail if
 	  the username, password, or realm (the JID domain) contain non-ASCII
 	  characters.
+	* Show emblem for mobile, handheld, and web clients and bots (if the other
+	  client supports it).
 
 	Yahoo:
 	* P2P file transfers.  (Sulabh Mahajan)
diff -r 5bbdb0a93c52 -r c2c6ef44d66e pidgin/plugins/pidginrc.c
--- a/pidgin/plugins/pidginrc.c	Sun Jun 07 18:45:17 2009 +0000
+++ b/pidgin/plugins/pidginrc.c	Sun Jun 07 18:46:23 2009 +0000
@@ -34,7 +34,7 @@
 	"/plugins/gtk/purplerc/color/GtkIMHtml::receive-name-color",
 	"/plugins/gtk/purplerc/color/GtkIMHtml::highlight-name-color",
 	"/plugins/gtk/purplerc/color/GtkIMHtml::action-name-color",
-	"/plugins/gtk/purplerc/color/GtkIMHtml::typing-ntofication-color"
+	"/plugins/gtk/purplerc/color/GtkIMHtml::typing-notification-color"
 };
 static const gchar *color_prefs_set[] = {
 	"/plugins/gtk/purplerc/set/color/GtkIMHtml::hyperlink-color",