Mercurial > pidgin
changeset 27075:c2c6ef44d66e
merge of '31f78d91abb7452e597bbd0f20f910c6cbb56099'
and 'f017580a3b23ad3050f63c88789c0229df75a8ee'
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Sun, 07 Jun 2009 18:46:23 +0000 |
| parents | 5bbdb0a93c52 (current diff) 7b7d1fc8dbbf (diff) |
| children | abab554140b5 7dbe7ae559d3 |
| files | |
| diffstat | 2 files changed, 3 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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)
--- 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",