Mercurial > pidgin.yaz
comparison libpurple/conversation.c @ 25482:e4ee1c5bd51e
propagate from branch 'im.pidgin.pidgin' (head 8fb8a09e9fe9177bb4efcd0f7ecd126919e73c20)
to branch 'im.pidgin.pidgin.yaz' (head e06a2e033588557223befc5642a996715857ce8e)
author | Yoshiki Yazawa <yaz@honeyplanet.jp> |
---|---|
date | Tue, 15 May 2007 02:39:12 +0000 |
parents | 73556f13c3b5 f35329c1094e |
children | bb8ad59ae9c4 |
comparison
equal
deleted
inserted
replaced
17108:62fa9341769c | 25482:e4ee1c5bd51e |
---|---|
1093 void | 1093 void |
1094 purple_conv_im_write(PurpleConvIm *im, const char *who, const char *message, | 1094 purple_conv_im_write(PurpleConvIm *im, const char *who, const char *message, |
1095 PurpleMessageFlags flags, time_t mtime) | 1095 PurpleMessageFlags flags, time_t mtime) |
1096 { | 1096 { |
1097 PurpleConversation *c; | 1097 PurpleConversation *c; |
1098 char *tmpmessage = NULL; | |
1098 | 1099 |
1099 g_return_if_fail(im != NULL); | 1100 g_return_if_fail(im != NULL); |
1100 g_return_if_fail(message != NULL); | 1101 g_return_if_fail(message != NULL); |
1101 | 1102 |
1102 c = purple_conv_im_get_conversation(im); | 1103 c = purple_conv_im_get_conversation(im); |
1103 | 1104 |
1105 // yaz | |
1106 if (purple_prefs_get_bool("/purple/conversations/msnstyle")) { | |
1107 tmpmessage = g_strdup_printf("<br>%s", message); | |
1108 } else { | |
1109 tmpmessage = g_strdup_printf("%s", message); | |
1110 } | |
1111 | |
1104 /* Raise the window, if specified in prefs. */ | 1112 /* Raise the window, if specified in prefs. */ |
1105 if (c->ui_ops != NULL && c->ui_ops->write_im != NULL) | 1113 if (c->ui_ops != NULL && c->ui_ops->write_im != NULL) |
1106 c->ui_ops->write_im(c, who, message, flags, mtime); | 1114 c->ui_ops->write_im(c, who, tmpmessage, flags, mtime); |
1107 else | 1115 else |
1108 purple_conversation_write(c, who, message, flags, mtime); | 1116 purple_conversation_write(c, who, tmpmessage, flags, mtime); |
1117 | |
1118 g_free(tmpmessage); | |
1109 } | 1119 } |
1110 | 1120 |
1111 gboolean purple_conv_present_error(const char *who, PurpleAccount *account, const char *what) | 1121 gboolean purple_conv_present_error(const char *who, PurpleAccount *account, const char *what) |
1112 { | 1122 { |
1113 PurpleConversation *conv; | 1123 PurpleConversation *conv; |