Mercurial > pidgin.yaz

diff src/server.c @ 6621:42fdf16f1dad

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[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 9714538226f0
children a4622f1fb5a1
line wrap: on
line diff
--- a/src/server.c	Mon Aug 25 00:39:39 2003 +0000
+++ b/src/server.c	Mon Aug 25 02:49:42 2003 +0000
@@ -258,7 +258,7 @@
 }
 
 int serv_send_im(GaimConnection *gc, const char *name, const char *message,
-				 int len, int flags)
+				 int len, int imflags)
 {
 	GaimConversation *c;
 	int val = -EINVAL;
@@ -270,9 +270,9 @@
 	c = gaim_find_conversation(name);
 
 	if (prpl_info && prpl_info->send_im)
-		val = prpl_info->send_im(gc, name, message, len, flags);
+		val = prpl_info->send_im(gc, name, message, len, imflags);
 
-	if (!(flags & IM_FLAG_AWAY))
+	if (!(imflags & IM_FLAG_AWAY))
 		serv_touch_idle(gc);
 
 	if (gc->away &&
@@ -799,7 +799,7 @@
 
 	while (templist) {
 		struct queued_message *qm = (struct queued_message *)templist->data;
-		if ((qm->flags & WFLAG_RECV) && !strcmp(name, qm->name))
+		if ((qm->flags & GAIM_MESSAGE_RECV) && !strcmp(name, qm->name))
 			i++;
 
 		templist = templist->next;
@@ -813,12 +813,12 @@
  * sure to follow along, kids
  */
 void serv_got_im(GaimConnection *gc, const char *who, const char *msg,
-				 guint32 flags, time_t mtime, gint len)
+				 guint32 imflags, time_t mtime, gint len)
 {
 	char *buffy;
 	char *angel;
 	int plugin_return;
-	int away = 0;
+	GaimMessageFlags away = 0;
 
 	GaimConversation *cnv;
 
@@ -835,7 +835,7 @@
 	 * It's a start.
 	 */
 
-	if (flags & IM_FLAG_GAIMUSER)
+	if (imflags & IM_FLAG_GAIMUSER)
 		gaim_debug(GAIM_DEBUG_MISC, "server", "%s is a gaim user.\n", who);
 
 	/*
@@ -859,7 +859,7 @@
 		plugin_return = GPOINTER_TO_INT(
 			gaim_signal_emit_return_1(gaim_conversations_get_handle(),
 									  "received-im-msg", gc->account,
-									  &angel, &buffy, &flags));
+									  &angel, &buffy, &imflags));
 
 		if (!buffy || !angel || plugin_return) {
 			if (buffy)
@@ -891,10 +891,10 @@
 	 * Um. When we call gaim_conversation_write with the message we received,
 	 * it's nice to pass whether or not it was an auto-response. So if it
 	 * was an auto-response, we set the appropriate flag. This is just so
-	 * prpls don't have to know about WFLAG_* (though some do anyway)
+	 * prpls don't have to know about GAIM_MESSAGE_* (though some do anyway)
 	 */
-	if (flags & IM_FLAG_AWAY)
-		away = WFLAG_AUTO;
+	if (imflags & IM_FLAG_AWAY)
+		away = GAIM_MESSAGE_AUTO_RESP;
 
 	/*
 	 * Alright. Two cases for how to handle this. Either we're away or
@@ -936,7 +936,7 @@
 			qm->message = g_memdup(message, len == -1 ? strlen(message) + 1 : len);
 			qm->account = gc->account;
 			qm->tm = mtime;
-			qm->flags = WFLAG_RECV | away;
+			qm->flags = GAIM_MESSAGE_RECV | away;
 			qm->len = len;
 			message_queue = g_slist_append(message_queue, qm);
 
@@ -973,7 +973,7 @@
 				cnv = gaim_conversation_new(GAIM_CONV_IM, gc->account, name);
 
 			gaim_im_write(GAIM_IM(cnv), NULL, message, len,
-						  away | WFLAG_RECV, mtime);
+						  away | GAIM_MESSAGE_RECV, mtime);
 		}
 
 		/*
@@ -1030,12 +1030,12 @@
 			qm->message = g_strdup(away_subs(tmpmsg, alias));
 			qm->account = gc->account;
 			qm->tm = mtime;
-			qm->flags = WFLAG_SEND | WFLAG_AUTO;
+			qm->flags = GAIM_MESSAGE_SEND | GAIM_MESSAGE_AUTO_RESP;
 			qm->len = -1;
 			message_queue = g_slist_append(message_queue, qm);
 		} else if (cnv != NULL)
 			gaim_im_write(GAIM_IM(cnv), NULL, away_subs(tmpmsg, alias),
-						  len, WFLAG_SEND | WFLAG_AUTO, mtime);
+						  len, GAIM_MESSAGE_SEND | GAIM_MESSAGE_AUTO_RESP, mtime);
 
 		g_free(tmpmsg);
 	} else {
@@ -1063,7 +1063,7 @@
 			qm->message = g_strdup(message);
 			qm->account = gc->account;
 			qm->tm = mtime;
-			qm->flags = away | WFLAG_RECV;
+			qm->flags = away | GAIM_MESSAGE_RECV;
 			qm->len = len;
 			unread_message_queue = g_slist_append(unread_message_queue, qm);
 		}
@@ -1072,7 +1072,7 @@
 				cnv = gaim_conversation_new(GAIM_CONV_IM, gc->account, name);
 
 			gaim_im_write(GAIM_IM(cnv), NULL, message, len,
-						  away | WFLAG_RECV, mtime);
+						  away | GAIM_MESSAGE_RECV, mtime);
 			gaim_window_flash(gaim_conversation_get_window(cnv));
 		}
 	}
@@ -1113,7 +1113,7 @@
 		return;
 	}
 
-	c = gaim_find_conversation(b->name);
+	c = gaim_find_conversation_with_account(b->name, account);
 
 	/* This code will 'align' the name from the TOC */
 	/* server with what's in our record.  We want to */
@@ -1154,7 +1154,7 @@
 					char *tmp = g_strdup_printf(_("%s logged in."),
 												gaim_get_buddy_alias(b));
 
-					gaim_conversation_write(c, NULL, tmp, -1, WFLAG_SYSTEM,
+					gaim_conversation_write(c, NULL, tmp, -1, GAIM_MESSAGE_SYSTEM,
 											time(NULL));
 					g_free(tmp);
 				}
@@ -1165,7 +1165,7 @@
 												  gaim_get_buddy_alias(b));
 					qm->account = gc->account;
 					qm->tm = time(NULL);
-					qm->flags = WFLAG_SYSTEM;
+					qm->flags = GAIM_MESSAGE_SYSTEM;
 					qm->len = -1;
 					message_queue = g_slist_append(message_queue, qm);
 				}
@@ -1183,7 +1183,7 @@
 					char *tmp = g_strdup_printf(_("%s logged out."),
 												gaim_get_buddy_alias(b));
 					gaim_conversation_write(c, NULL, tmp, -1,
-											WFLAG_SYSTEM, time(NULL));
+											GAIM_MESSAGE_SYSTEM, time(NULL));
 					g_free(tmp);
 				} else if (awayqueue && find_queue_total_by_name(b->name)) {
 					struct queued_message *qm = g_new0(struct queued_message, 1);
@@ -1192,7 +1192,7 @@
 												  gaim_get_buddy_alias(b));
 					qm->account = gc->account;
 					qm->tm = time(NULL);
-					qm->flags = WFLAG_SYSTEM;
+					qm->flags = GAIM_MESSAGE_SYSTEM;
 					qm->len = -1;
 					message_queue = g_slist_append(message_queue, qm);
 				}
@@ -1437,7 +1437,7 @@
 void serv_got_chat_in(GaimConnection *g, int id, const char *who,
 					  int whisper, const char *message, time_t mtime)
 {
-	int w;
+	GaimMessageFlags w;
 	GSList *bcs;
 	GaimConversation *conv = NULL;
 	GaimChat *chat = NULL;
@@ -1495,7 +1495,7 @@
 		buf = g_strdup(message);
 
 	if (whisper)
-		w = WFLAG_WHISPER;
+		w = GAIM_MESSAGE_WHISPER;
 	else
 		w = 0;