changeset
merge of 'd584e1732e45d98d1a94bb50ccf136df0905d1b3'
Sun, 07 Jun 2009 18:46:23 +0000
- author
- Paul Aurich <darkrain42@pidgin.im>
- date
- Sun, 07 Jun 2009 18:46:23 +0000
- changeset 27309
- 9f3780185c28
- parent 27308
- d584e1732e45 (current diff)
- parent 27307
- 65906c6de115 (diff)
- child 27310
- fd59f3923233
- child 27312
- 07a772783c0f
merge of 'd584e1732e45d98d1a94bb50ccf136df0905d1b3'
and '65906c6de11503b6ac1a9a84ea0a73df628bd902'
--- 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",
