[Gaim-commits] CVS: gaim/src conversation.c,1.686,1.687 conversation.h,1.73,1.74

[Mark D. <the...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11525

Modified Files:
	conversation.c conversation.h 
Log Message:
sf patch #1341917, from Evan Schoenberg
"Allow sending with GaimMsgFlags in conversation.c"


Index: conversation.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/conversation.c,v
retrieving revision 1.686
retrieving revision 1.687
diff -u -d -p -r1.686 -r1.687
--- conversation.c	28 Oct 2005 01:46:12 -0000	1.686
+++ conversation.c	31 Oct 2005 04:38:58 -0000	1.687
@@ -85,7 +85,7 @@ send_typed(gpointer data)
 }
 
 static void
-common_send(GaimConversation *conv, const char *message)
+common_send(GaimConversation *conv, const char *message, GaimMessageFlags msgflags)
 {
 	GaimConversationType type;
 	GaimAccount *account;
@@ -107,8 +107,11 @@ common_send(GaimConversation *conv, cons
 	type = gaim_conversation_get_type(conv);
 	ops  = gaim_conversation_get_ui_ops(conv);
 
-	if (conv->features & GAIM_CONNECTION_HTML)
+	if ((conv->features & GAIM_CONNECTION_HTML) &&
+		!(msgflags & GAIM_MESSAGE_RAW))
+	{
 		displayed = gaim_markup_linkify(message);
+	}
 	else
 		displayed = g_strdup(message);
 
@@ -155,15 +158,20 @@ common_send(GaimConversation *conv, cons
 						 gaim_conversation_get_name(conv), &sent);
 
 		if (sent != NULL && sent[0] != '\0') {
-			GaimMessageFlags msgflags = GAIM_MESSAGE_SEND;
+			GaimConvImFlags imflags = 0;
+
+			msgflags |= GAIM_MESSAGE_SEND;
+
+			if (msgflags & GAIM_MESSAGE_AUTO_RESP)
+				imflags |= GAIM_CONV_IM_AUTO_RESP;
 
 			if (conv->features & GAIM_CONNECTION_HTML) {
 				err = serv_send_im(gc, gaim_conversation_get_name(conv),
-				                   sent, 0);
+				                   sent, imflags);
 			} else {
 				gchar *tmp = gaim_unescape_html(sent);
 				err = serv_send_im(gc, gaim_conversation_get_name(conv),
-				                   tmp, 0);
+				                   tmp, imflags);
 				g_free(tmp);
 			}
 
@@ -1147,10 +1155,16 @@ gboolean gaim_conv_present_error(const c
 void
 gaim_conv_im_send(GaimConvIm *im, const char *message)
 {
+	gaim_conv_im_send_with_flags(im, message, 0);
+}
+
+void
+gaim_conv_im_send_with_flags(GaimConvIm *im, const char *message, GaimMessageFlags flags)
+{
 	g_return_if_fail(im != NULL);
 	g_return_if_fail(message != NULL);
 
-	common_send(gaim_conv_im_get_conversation(im), message);
+	common_send(gaim_conv_im_get_conversation(im), message, flags);
 }
 
 gboolean
@@ -1412,10 +1426,16 @@ gaim_conv_chat_write(GaimConvChat *chat,
 void
 gaim_conv_chat_send(GaimConvChat *chat, const char *message)
 {
+	gaim_conv_chat_send_with_flags(chat, message, 0);
+}
+
+void
+gaim_conv_chat_send_with_flags(GaimConvChat *chat, const char *message, GaimMessageFlags flags)
+{
 	g_return_if_fail(chat != NULL);
 	g_return_if_fail(message != NULL);
 
-	common_send(gaim_conv_chat_get_conversation(chat), message);
+	common_send(gaim_conv_chat_get_conversation(chat), message, flags);
 }
 
 void

Index: conversation.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/conversation.h,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -d -p -r1.73 -r1.74
--- conversation.h	28 Oct 2005 01:46:12 -0000	1.73
+++ conversation.h	31 Oct 2005 04:38:58 -0000	1.74
@@ -747,6 +747,15 @@ gboolean gaim_conv_present_error(const c
 void gaim_conv_im_send(GaimConvIm *im, const char *message);
 
 /**
+ * Sends a message to this IM conversation with specified flags.
+ *
+ * @param im      The IM.
+ * @param message The message to send.
+ * @param flags   The GaimMessageFlags flags to use in addition to GAIM_MESSAGE_SEND.
+ */
+void gaim_conv_im_send_with_flags(GaimConvIm *im, const char *message, GaimMessageFlags flags);
+
+/**
  * Adds a smiley to the conversation's smiley tree. If this returns
  * @c TRUE you should call gaim_conv_custom_smiley_write() one or more
  * times, and then gaim_conv_custom_smiley_close(). If this returns
@@ -954,6 +963,15 @@ void gaim_conv_chat_write(GaimConvChat *
 void gaim_conv_chat_send(GaimConvChat *chat, const char *message);
 
 /**
+ * Sends a message to this chat conversation with specified flags.
+ *
+ * @param chat    The chat.
+ * @param message The message to send.
+ * @param flags   The GaimMessageFlags flags to use.
+ */
+void gaim_conv_chat_send_with_flags(GaimConvChat *chat, const char *message, GaimMessageFlags flags);
+
+/**
  * Adds a user to a chat.
  *
  * @param chat        The chat.