diff src/conversation.h @ 6621:42fdf16f1dad

[gaim-migrate @ 7145] Individual accounts remember the "No Proxy" setting instead of reverting back to "Use Global Proxy Settings" Proxy settings for individual accounts do not revert to "No Proxy" if you open an account, don't change the proxy drop down, then save the account. Those two sound like the same thing, but they're different. I think. Added the "use environmental variables" setting in a way that isn't horrible. We're not using that thing that splits the proxy variable into host:port yet. I'll do that later. I would have done that earlier, but I had to go buy a bike. Also, I'd like to show what the environmental variables are set to somewhere. That'll come later. Also a patch from Robot101: (22:10:25) Bzubhipheron: I have a patch that replaces #define WFLAG_* with GaimMessageFlags GAIM_MESSAGE_* (22:10:30) Bzubhipheron: (an enum in disguise) (22:14:18) Bzubhipheron: GaimMessageFlags protrays much better typing information than "int". most of the other #defines are gone, and glib standardises on enums for its flags too. (22:14:27) Bzubhipheron: (gone or going) (22:14:45) Bzubhipheron: and it makes the prototype of my message queueing stuff prettier. committer: Tailor Script <[e-mail]>

--- a/src/conversation.h	Mon Aug 25 00:39:39 2003 +0000
+++ b/src/conversation.h	Mon Aug 25 02:49:42 2003 +0000
@@ -97,6 +97,21 @@
 
 } GaimTypingState;
 
+/**
+ * Flags applicable to a message. Most will have send, recv or system.
+ */
+typedef enum
+{
+	GAIM_MESSAGE_SEND = 0x01,      /**< Outgoing message.     */
+	GAIM_MESSAGE_RECV = 0x02,      /**< Incoming message.     */
+	GAIM_MESSAGE_SYSTEM = 0x04,    /**< System message.       */
+	GAIM_MESSAGE_AUTO_RESP = 0x08, /**< Auto response.        */
+	GAIM_MESSAGE_COLORIZE = 0x10,  /**< Colorize nicks.       */
+	GAIM_MESSAGE_NICK = 0x20,      /**< Contains your nick.   */
+	GAIM_MESSAGE_NO_LOG = 0x40,    /**< Do not log.           */
+	GAIM_MESSAGE_WHISPER = 0x80    /**< Whispered message.    */
+} GaimMessageFlags;
+
 #include "account.h"
 #include "server.h"
 
@@ -136,11 +151,11 @@
 {
 	void (*destroy_conversation)(GaimConversation *conv);
 	void (*write_chat)(GaimConversation *conv, const char *who,
-					   const char *message, int flags, time_t mtime);
+					   const char *message, GaimMessageFlags flags, time_t mtime);
 	void (*write_im)(GaimConversation *conv, const char *who,
-					 const char *message, size_t len, int flags, time_t mtime);
+					 const char *message, size_t len, GaimMessageFlags flags, time_t mtime);
 	void (*write_conv)(GaimConversation *conv, const char *who,
-					   const char *message, size_t length, int flags,
+					   const char *message, size_t length, GaimMessageFlags flags,
 					   time_t mtime);
 
 	void (*chat_add_user)(GaimConversation *conv, const char *user);
@@ -732,14 +747,14 @@
  * @param who     The user who sent the message.
  * @param message The message.
  * @param length  The length of the message.
- * @param flags   The flags.
+ * @param flags   The message flags.
  * @param mtime   The time the message was sent.
  *
  * @see gaim_im_write()
  * @see gaim_chat_write()
  */
 void gaim_conversation_write(GaimConversation *conv, const char *who,
-							 const char *message, size_t length, int flags,
+							 const char *message, size_t length, GaimMessageFlags flags,
 							 time_t mtime);
 
 /**
@@ -884,11 +899,11 @@
  * @param message The message to write.
  * @param len     The length of the message, or -1 to specify the length
  *                of @a message.
- * @param flag    The flags.
+ * @param flags   The message flags.
  * @param mtime   The time the message was sent.
  */
 void gaim_im_write(GaimIm *im, const char *who,
-				   const char *message, size_t len, int flag, time_t mtime);
+				   const char *message, size_t len, GaimMessageFlags flags, time_t mtime);
 
 /**
  * Sends a message to this IM conversation.
@@ -1043,11 +1058,11 @@
  * @param chat    The chat.
  * @param who     The user who sent the message.
  * @param message The message to write.
- * @param flag    The flags.
+ * @param flags   The flags.
  * @param mtime   The time the message was sent.
  */
 void gaim_chat_write(GaimChat *chat, const char *who,
-					 const char *message, int flag, time_t mtime);
+					 const char *message, GaimMessageFlags flags, time_t mtime);
 
 /**
  * Sends a message to this chat conversation.