pidgin: 76b7bd70: Wrap a few lines.
qulogic at pidgin.im
qulogic at pidgin.im
Tue Jan 3 04:41:21 EST 2012
----------------------------------------------------------------------
Revision: 76b7bd700682140ac40b25bb5bbbb39290e97b16
Parent: a05327a3c765144507362e7927b7a5c88f55c343
Author: qulogic at pidgin.im
Date: 01/02/12 02:24:55
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/76b7bd700682140ac40b25bb5bbbb39290e97b16
Changelog:
Wrap a few lines.
Changes against parent a05327a3c765144507362e7927b7a5c88f55c343
patched pidgin/gtkconv.c
-------------- next part --------------
============================================================
--- pidgin/gtkconv.c c49ee396766e47fa652dde3467f206f8ddacb502
+++ pidgin/gtkconv.c 85cc2943f45c7976c424d98c5d088641fe9b5951
@@ -6290,25 +6290,34 @@ pidgin_conv_write_conv(PurpleConversatio
old_flags = gtkconv->last_flags;
if ((flags & PURPLE_MESSAGE_SEND) && (old_flags & PURPLE_MESSAGE_SEND)) {
- message_html = pidgin_conversation_theme_get_template(gtkconv->theme, PIDGIN_CONVERSATION_THEME_TEMPLATE_OUTGOING_NEXT_CONTENT);
+ message_html = pidgin_conversation_theme_get_template(gtkconv->theme,
+ PIDGIN_CONVERSATION_THEME_TEMPLATE_OUTGOING_NEXT_CONTENT);
func = "appendNextMessage";
+
} else if (flags & PURPLE_MESSAGE_SEND) {
- message_html = pidgin_conversation_theme_get_template(gtkconv->theme, PIDGIN_CONVERSATION_THEME_TEMPLATE_OUTGOING_CONTENT);
+ message_html = pidgin_conversation_theme_get_template(gtkconv->theme,
+ PIDGIN_CONVERSATION_THEME_TEMPLATE_OUTGOING_CONTENT);
+
} else if ((flags & PURPLE_MESSAGE_RECV) && (old_flags & PURPLE_MESSAGE_RECV)) {
GList *history = purple_conversation_get_message_history(conv);
PurpleConvMessage *last_msg = (PurpleConvMessage *)history->data;
/* If the senders are the same, use appendNextMessage */
if (purple_strequal(purple_conversation_message_get_sender(last_msg), name)) {
- message_html = pidgin_conversation_theme_get_template(gtkconv->theme, PIDGIN_CONVERSATION_THEME_TEMPLATE_INCOMING_NEXT_CONTENT);
+ message_html = pidgin_conversation_theme_get_template(gtkconv->theme,
+ PIDGIN_CONVERSATION_THEME_TEMPLATE_INCOMING_NEXT_CONTENT);
func = "appendNextMessage";
} else {
- message_html = pidgin_conversation_theme_get_template(gtkconv->theme, PIDGIN_CONVERSATION_THEME_TEMPLATE_INCOMING_CONTENT);
+ message_html = pidgin_conversation_theme_get_template(gtkconv->theme,
+ PIDGIN_CONVERSATION_THEME_TEMPLATE_INCOMING_CONTENT);
}
} else if (flags & PURPLE_MESSAGE_RECV) {
- message_html = pidgin_conversation_theme_get_template(gtkconv->theme, PIDGIN_CONVERSATION_THEME_TEMPLATE_INCOMING_CONTENT);
+ message_html = pidgin_conversation_theme_get_template(gtkconv->theme,
+ PIDGIN_CONVERSATION_THEME_TEMPLATE_INCOMING_CONTENT);
+
} else {
- message_html = pidgin_conversation_theme_get_template(gtkconv->theme, PIDGIN_CONVERSATION_THEME_TEMPLATE_STATUS);
+ message_html = pidgin_conversation_theme_get_template(gtkconv->theme,
+ PIDGIN_CONVERSATION_THEME_TEMPLATE_STATUS);
}
gtkconv->last_flags = flags;
More information about the Commits
mailing list