# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1244759613 0
# Node ID e49739413d73fffafb7dcbd7d5fa1423f849cb87
# Parent  2e91b80a9179c5c8da702c9c291d2811eb0433fe
Remove obsolete XEP-0091 (Legacy Delayed Delivery) code.

diff -r 2e91b80a9179 -r e49739413d73 libpurple/protocols/jabber/message.c
--- a/libpurple/protocols/jabber/message.c	Thu Jun 11 22:28:41 2009 +0000
+++ b/libpurple/protocols/jabber/message.c	Thu Jun 11 22:33:33 2009 +0000
@@ -740,12 +740,7 @@
 			if(timestamp)
 				jm->sent = purple_str_to_time(timestamp, TRUE, NULL, NULL, NULL);
 		} else if(!strcmp(child->name, "x")) {
-			if(!strcmp(xmlns, "jabber:x:delay")) {
-				const char *timestamp = xmlnode_get_attrib(child, "stamp");
-				jm->delayed = TRUE;
-				if(timestamp)
-					jm->sent = purple_str_to_time(timestamp, TRUE, NULL, NULL, NULL);
-			} else if(!strcmp(xmlns, "jabber:x:conference") &&
+			if(!strcmp(xmlns, "jabber:x:conference") &&
 					jm->type != JABBER_MESSAGE_GROUPCHAT_INVITE &&
 					jm->type != JABBER_MESSAGE_ERROR) {
 				const char *jid = xmlnode_get_attrib(child, "jid");
diff -r 2e91b80a9179 -r e49739413d73 libpurple/protocols/jabber/presence.c
--- a/libpurple/protocols/jabber/presence.c	Thu Jun 11 22:28:41 2009 +0000
+++ b/libpurple/protocols/jabber/presence.c	Thu Jun 11 22:33:33 2009 +0000
@@ -576,7 +576,7 @@
 			/* The rest of the cases used to check xmlns individually. */
 			continue;
 		} else if(!strcmp(y->name, "delay") && !strcmp(xmlns, "urn:xmpp:delay")) {
-			/* XXX: compare the time.  jabber:x:delay can happen on presence packets that aren't really and truly delayed */
+			/* XXX: compare the time.  urn:xmpp:delay can happen on presence packets that aren't really and truly delayed */
 			delayed = TRUE;
 			stamp = xmlnode_get_attrib(y, "stamp");
 		} else if(!strcmp(y->name, "c") && !strcmp(xmlns, "http://jabber.org/protocol/caps")) {
@@ -584,11 +584,7 @@
 		} else if (g_str_equal(y->name, "nick") && g_str_equal(xmlns, "http://jabber.org/protocol/nick")) {
 			nickname = xmlnode_get_data(y);
 		} else if(!strcmp(y->name, "x")) {
-			if(!strcmp(xmlns, "jabber:x:delay")) {
-				/* XXX: compare the time.  jabber:x:delay can happen on presence packets that aren't really and truly delayed */
-				delayed = TRUE;
-				stamp = xmlnode_get_attrib(y, "stamp");
-			} else if(!strcmp(xmlns, "http://jabber.org/protocol/muc#user")) {
+			if(!strcmp(xmlns, "http://jabber.org/protocol/muc#user")) {
 				xmlnode *z;
 
 				muc = TRUE;