pidgin.yaz: src/conversation.c comparison

comparison src/conversation.c @ 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 <tailor@pidgin.im>

author	Mark Doliner <mark@kingant.net>
date	Mon, 25 Aug 2003 02:49:42 +0000
parents	d8fd7c29eaf0
children	a4622f1fb5a1

comparison

equal deleted inserted replaced

-:7230e5920911
+:42fdf16f1dad
 					g_slist_free(conv->u.im->images);
 					conv->u.im->images = NULL;
 					if (binary)
 						gaim_im_write(im, NULL, bigbuf, length,
-									  WFLAG_SEND, time(NULL));
+									  GAIM_MESSAGE_SEND, time(NULL));
 					else
-						gaim_im_write(im, NULL, buffy, -1, WFLAG_SEND,
+						gaim_im_write(im, NULL, buffy, -1, GAIM_MESSAGE_SEND,
 									  time(NULL));
 				}
 				if (binary)
 					g_free(bigbuf);
 			else {
 				err = serv_send_im(gc, gaim_conversation_get_name(conv),
 								   buffy, -1, imflags);
 				if (err > 0)
-					gaim_im_write(im, NULL, buf, -1, WFLAG_SEND, time(NULL));
+					gaim_im_write(im, NULL, buf, -1, GAIM_MESSAGE_SEND, time(NULL));
 			}
 			gaim_signal_emit(gaim_conversations_get_handle(), "sent-im-msg",
 							 gaim_conversation_get_account(conv),
 							 gaim_conversation_get_name(conv), buffy);
 	return c;
 }
 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)
 {
 	GaimPluginProtocolInfo *prpl_info = NULL;
 	GaimConnection *gc = NULL;
 	GaimAccount *account;
 		if (gaim_conversation_get_type(conv) == GAIM_CONV_IM ||
 			!(prpl_info->options & OPT_PROTO_UNIQUE_CHATNAME)) {
 			if (who == NULL) {
-				if (flags & WFLAG_SEND) {
+				if (flags & GAIM_MESSAGE_SEND) {
 					b = gaim_find_buddy(account,
 										gaim_account_get_username(account));
 					if (b != NULL && strcmp(b->name, gaim_get_buddy_alias(b)))
 						who = gaim_get_buddy_alias(b);
 	ops->write_conv(conv, who, message, length, flags, mtime);
 	win = gaim_conversation_get_window(conv);
 	/* Tab highlighting */
-	if (!(flags & WFLAG_RECV) && !(flags & WFLAG_SYSTEM))
+	if (!(flags & GAIM_MESSAGE_RECV) && !(flags & GAIM_MESSAGE_SYSTEM))
 		return;
 	if (gaim_conversation_get_type(conv) == GAIM_CONV_IM) {
-		if ((flags & WFLAG_RECV) == WFLAG_RECV)
+		if ((flags & GAIM_MESSAGE_RECV) == GAIM_MESSAGE_RECV)
 			gaim_im_set_typing_state(GAIM_IM(conv), GAIM_NOT_TYPING);
 	}
 	if (gaim_window_get_active_conversation(win) != conv) {
-		if ((flags & WFLAG_NICK) == WFLAG_NICK ||
+		if ((flags & GAIM_MESSAGE_NICK) == GAIM_MESSAGE_NICK ||
 				gaim_conversation_get_unseen(conv) == GAIM_UNSEEN_NICK)
 			unseen = GAIM_UNSEEN_NICK;
-		else if ((flags & WFLAG_SYSTEM) == WFLAG_SYSTEM &&
+		else if ((flags & GAIM_MESSAGE_SYSTEM) == GAIM_MESSAGE_SYSTEM &&
 				 gaim_conversation_get_unseen(conv) != GAIM_UNSEEN_TEXT)
 			unseen = GAIM_UNSEEN_EVENT;
 		else
 			unseen = GAIM_UNSEEN_TEXT;
 	}
 							 GAIM_CONV_UPDATE_TYPING);
 }
 void
 gaim_im_write(GaimIm *im, const char *who, const char *message,
-			  size_t len, int flags, time_t mtime)
+			  size_t len, GaimMessageFlags flags, time_t mtime)
 {
 	GaimConversation *c;
 	g_return_if_fail(im != NULL);
 	g_return_if_fail(message != NULL);
 	return chat->id;
 }
 void
 gaim_chat_write(GaimChat *chat, const char *who, const char *message,
-				int flags, time_t mtime)
+				GaimMessageFlags flags, time_t mtime)
 {
 	GaimAccount *account;
 	GaimConversation *conv;
 	GaimConnection *gc;
 	/* Don't display this if the person who wrote it is ignored. */
 	if (gaim_chat_is_user_ignored(chat, who))
 		return;
-	if (!(flags & WFLAG_WHISPER)) {
+	if (!(flags & GAIM_MESSAGE_WHISPER)) {
 		char *str;
 		const char *disp;
 		str = g_strdup(normalize(who));
 		disp = gaim_connection_get_display_name(gc);
 		if (!gaim_utf8_strcasecmp(str, normalize(gaim_account_get_username(account))) ||
 			(disp && !gaim_utf8_strcasecmp(str, normalize(disp)))) {
-			flags |= WFLAG_SEND;
+			flags |= GAIM_MESSAGE_SEND;
 		}
 		else {
-			flags |= WFLAG_RECV;
+			flags |= GAIM_MESSAGE_RECV;
 			if (find_nick(gc, message))
-				flags |= WFLAG_NICK;
+				flags |= GAIM_MESSAGE_NICK;
 		}
 		g_free(str);
 	}
 		else
 			g_snprintf(tmp, sizeof(tmp),
 					   _("%s [<I>%s</I>] entered the room."),
 					   user, extra_msg);
-		gaim_conversation_write(conv, NULL, tmp, -1, WFLAG_SYSTEM, time(NULL));
+		gaim_conversation_write(conv, NULL, tmp, -1, GAIM_MESSAGE_SYSTEM, time(NULL));
 	}
 	gaim_signal_emit(gaim_conversations_get_handle(),
 					 "chat-buddy-joined", conv, user);
 }
 	if (gaim_prefs_get_bool("/core/conversations/chat/show_nick_change")) {
 		g_snprintf(tmp, sizeof(tmp),
 				   _("%s is now known as %s"), old_user, new_user);
-		gaim_conversation_write(conv, NULL, tmp, -1, WFLAG_SYSTEM, time(NULL));
+		gaim_conversation_write(conv, NULL, tmp, -1, GAIM_MESSAGE_SYSTEM, time(NULL));
 	}
 }
 void
 gaim_chat_remove_user(GaimChat *chat, const char *user, const char *reason)
 			g_snprintf(tmp, sizeof(tmp),
 					   _("%s left the room (%s)."), user, reason);
 		else
 			g_snprintf(tmp, sizeof(tmp), _("%s left the room."), user);
-		gaim_conversation_write(conv, NULL, tmp, -1, WFLAG_SYSTEM, time(NULL));
+		gaim_conversation_write(conv, NULL, tmp, -1, GAIM_MESSAGE_SYSTEM, time(NULL));
 	}
 	gaim_signal_emit(gaim_conversations_get_handle(), "chat-buddy-left",
 					 conv, user, reason);
 }
 						   _("(+%d more)"), size - 10);
 			g_snprintf(tmp, sizeof(tmp), _(" left the room (%s)."), reason);
 			gaim_conversation_write(conv, NULL, tmp, -1,
-									WFLAG_SYSTEM, time(NULL));
+									GAIM_MESSAGE_SYSTEM, time(NULL));
 		}
 	}
 }
 void

Mercurial > pidgin.yaz

comparison src/conversation.c @ 6621:42fdf16f1dad