Mercurial > pidgin

changeset 32427:633a5527963d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Wrap a few lines.
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Mon, 02 Jan 2012 07:24:55 +0000
parents 4dfafe26e51d
children b65989301854
files pidgin/gtkconv.c
diffstat 1 files changed, 15 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/pidgin/gtkconv.c	Mon Jan 02 07:17:23 2012 +0000
+++ b/pidgin/gtkconv.c	Mon Jan 02 07:24:55 2012 +0000
@@ -6290,25 +6290,34 @@
 
 	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;