Mercurial > pidgin.yaz

changeset 2278:00a8b7bcef6c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 2288] this is not good. committer: Tailor Script <tailor@pidgin.im>
author Eric Warmenhoven <eric@warmenhoven.org>
date Thu, 13 Sep 2001 22:20:14 +0000
parents 4f2a6268c5ec
children 63102b44541a
files src/protocols/jabber/jabber.c
diffstat 1 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/protocols/jabber/jabber.c	Thu Sep 13 21:26:17 2001 +0000
+++ b/src/protocols/jabber/jabber.c	Thu Sep 13 22:20:14 2001 +0000
@@ -589,11 +589,14 @@
 			if (((jc = find_existing_chat(GJ_GC(j), p->from)) != NULL) && jc->b)
 				serv_got_chat_in(GJ_GC(j), jc->b->id, p->from->resource, 1, m, time(NULL));
 			else {
+				int flags = 0;
+				if (xmlnode_get_tag(p->x, "gaim"))
+					flags = IM_FLAG_GAIMUSER;
 				if (find_conversation(jid_full(p->from)))
-					serv_got_im(GJ_GC(j), jid_full(p->from), m, 0, time(NULL));
+					serv_got_im(GJ_GC(j), jid_full(p->from), m, flags, time(NULL));
 				else {
 					from = g_strdup_printf("%s@%s", p->from->user, p->from->server);
-					serv_got_im(GJ_GC(j), from, m, 0, time(NULL));
+					serv_got_im(GJ_GC(j), from, m, flags, time(NULL));
 					g_free(from);
 				}
 			}
@@ -1238,6 +1241,7 @@
 	xmlnode_put_attrib(x, "to", realwho);
 	g_free(realwho);
 
+	xmlnode_insert_tag(x, "gaim");
 	xmlnode_put_attrib(x, "type", "chat");
 
 	if (message && strlen(message)) {