Mercurial > pidgin.yaz
changeset 25473:85fa0e8a031a
merge of '890e8c11f907d84dcdc7590a07680d9a55b7ca8d'
and 'af3793ad5174c8a8ae26ab1dc4989acce0fe5b9c'
| author | Yoshiki Yazawa <yaz@honeyplanet.jp> |
|---|---|
| date | Wed, 02 May 2007 12:20:45 +0000 |
| parents | 096330f964b6 (current diff) 0663e4f77bf5 (diff) |
| children | 3b014d70e7c9 5eca30c2935b |
| files | libpurple/version.h |
| diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/conversation.c Tue May 01 16:17:33 2007 +0000 +++ b/libpurple/conversation.c Wed May 02 12:20:45 2007 +0000 @@ -1099,7 +1099,7 @@ c = purple_conv_im_get_conversation(im); // yaz - if (purple_prefs_get_bool("/core/conversations/msnstyle")) { + if (purple_prefs_get_bool("/purple/conversations/msnstyle")) { tmpmessage = g_strdup_printf("<br>%s", message); } else { tmpmessage = g_strdup_printf("%s", message);
--- a/pidgin/gtkprefs.c Tue May 01 16:17:33 2007 +0000 +++ b/pidgin/gtkprefs.c Wed May 02 12:20:45 2007 +0000 @@ -917,7 +917,7 @@ #endif pidgin_prefs_checkbox(_("Use smooth-scrolling"), PIDGIN_PREFS_ROOT "/conversations/use_smooth_scrolling", vbox); - pidgin_prefs_checkbox(_("Use msn messenger style"), "/core/conversations/msnstyle", vbox);//yaz + pidgin_prefs_checkbox(_("Use msn messenger style"), "/purple/conversations/msnstyle", vbox);//yaz #ifdef _WIN32 pidgin_prefs_checkbox(_("F_lash window when IMs are received"), PIDGIN_PREFS_ROOT "/win32/blink_im", vbox); #endif