[Gaim-commits] CVS: gaim/src/protocols/jabber jabber.c,1.41,1.42 jconn.c,1.1,1.2 xstream.c,1.3,1.4

[Sean E. <sea...@us...>]

Update of /cvsroot/gaim/gaim/src/protocols/jabber
In directory usw-pr-cvs1:/tmp/cvs-serv10148/src/protocols/jabber

Modified Files:
	jabber.c jconn.c xstream.c 
Log Message:
new shortcuts:
Ctrl--  Decrease Font Size
Ctrl-=  Increase Font Size
Ctrl-0  Normal Font Size
Ctrl-F  Select Font
Ctrl-C  Text Color
Ctrl-W  Close IM/Chat Window (or Tab, if using tabbed conversations)
Ctrl-N  New IM/Chat Tab (if using tabbed conversations)
Ctrl-Z  Minimize (Iconify) IM/Chat Window
-As suggested by Shreedeep K Bhachech



Index: jabber.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/jabber/jabber.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- jabber.c	15 Apr 2002 03:23:09 -0000	1.41
+++ jabber.c	20 Apr 2002 08:10:13 -0000	1.42
@@ -731,15 +731,40 @@
 	}
 }
 
+static time_t iso8601_to_time(char *timestamp)
+{
+   struct tm t;
+   if(sscanf(timestamp,"%04d%02d%02dT%02d:%02d:%02d", &t.tm_year, &t.tm_mon, &t.tm_mday, &t.tm_hour, &t.tm_min, &t.tm_sec))
+   {
+      t.tm_year -= 1900;
+      t.tm_mon -= 1;
+      return mktime(&t) - timezone;
+   }
+   return 0;
+}
+
 static void jabber_handlemessage(gjconn gjc, jpacket p)
 {
-	xmlnode y, xmlns, subj;
+	xmlnode y, xmlns, subj, z;
+	time_t time_sent = time(NULL);
 
 	char *from = NULL, *msg = NULL, *type = NULL, *topic = NULL;
 	char m[BUF_LONG * 2];
 
 	type = xmlnode_get_attrib(p->x, "type");
 
+	z = xmlnode_get_firstchild(p->x);
+
+	while(z)
+	{
+	   if(NSCHECK(z,NS_DELAY))
+	   {
+	      char *timestamp = xmlnode_get_attrib(z,"stamp");
+	      time_sent = iso8601_to_time(timestamp);
+	   }
+	   z = xmlnode_get_nextsibling(z);
+	}
+
 	if (!type || !strcasecmp(type, "normal") || !strcasecmp(type, "chat")) {
 
 		/* XXX namespaces could be handled better. (mid) */
@@ -778,13 +803,13 @@
 			struct jabber_chat *jc;
 			g_snprintf(m, sizeof(m), "%s", msg);
 			if (((jc = find_existing_chat(GJ_GC(gjc), p->from)) != NULL) && jc->b)
-				serv_got_chat_in(GJ_GC(gjc), jc->b->id, p->from->resource, 1, m, time(NULL));
+				serv_got_chat_in(GJ_GC(gjc), jc->b->id, p->from->resource, 1, m, time_sent);
 			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(gjc), jid_full(p->from), m, flags, time(NULL), -1);
+					serv_got_im(GJ_GC(gjc), jid_full(p->from), m, flags, time_sent, -1);
 				else {
 					if(p->from->user) {
 					    from = g_strdup_printf("%s@%s", p->from->user, p->from->server);
@@ -792,7 +817,7 @@
 					    /* server message? */
 					    from = g_strdup(p->from->server);
 					}
-					serv_got_im(GJ_GC(gjc), from, m, flags, time(NULL), -1);
+					serv_got_im(GJ_GC(gjc), from, m, flags, time_sent, -1);
 					g_free(from);
 				}
 			}
@@ -870,7 +895,7 @@
 				
 
 				g_snprintf(buf, sizeof(buf), "%s", msg);
-				serv_got_chat_in(GJ_GC(gjc), jc->b->id, p->from->resource, 0, buf, time(NULL));
+				serv_got_chat_in(GJ_GC(gjc), jc->b->id, p->from->resource, 0, buf, time_sent);
 			}
 		} else { /* message from the server */
 		   	if(jc->b && topic) {
@@ -887,7 +912,7 @@
 		debug_printf("unhandled message %s\n", type);
 	}
 }
-
+	   
 static void jabber_handlepresence(gjconn gjc, jpacket p)
 {
 	char *to, *from, *type;
@@ -908,20 +933,18 @@
 	from = xmlnode_get_attrib(p->x, "from");
 	type = xmlnode_get_attrib(p->x, "type");
 	
-	z = xmlnode_get_tag(p->x, "x");
+	z = xmlnode_get_firstchild(p->x);
 	
-	if(NSCHECK(z,NS_DELAY))
+	while(z)
 	{
-	   struct tm t;
-	   char *timestamp = xmlnode_get_attrib(z,"stamp");
-	   if(sscanf(timestamp,"%04d%02d%02dT%02d:%02d:%02d", &t.tm_year, &t.tm_mon, &t.tm_mday, &t.tm_hour, &t.tm_min, &t.tm_sec))
+	   if(NSCHECK(z,NS_DELAY))
 	   {
-	      t.tm_year -= 1900;
-	      t.tm_mon -= 1;
-	      signon = mktime(&t) - timezone;
+	      char *timestamp = xmlnode_get_attrib(z,"stamp");
+	      signon = iso8601_to_time(timestamp);
 	   }
+	   z = xmlnode_get_nextsibling(z);
 	}
-
+	
 	if ((y = xmlnode_get_tag(p->x, "show"))) {
 		show = xmlnode_get_data(y);
 		if (!show) {

Index: jconn.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/jabber/jconn.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- jconn.c	31 Jul 2001 01:00:38 -0000	1.1
+++ jconn.c	20 Apr 2002 08:10:13 -0000	1.2
@@ -384,7 +384,7 @@
 char *jab_reg(jconn j)
 {
     xmlnode x,y,z;
-    char *hash, *user, *id;
+    char *user, *id;
 
     if (!j) return(NULL);
 

Index: xstream.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/jabber/xstream.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- xstream.c	4 Apr 2002 03:04:57 -0000	1.3
+++ xstream.c	20 Apr 2002 08:10:13 -0000	1.4
@@ -153,7 +153,7 @@
 /* attempts to parse the buff onto this stream firing events to the handler, returns the last known status */
 int xstream_eat(xstream xs, char *buff, int len)
 {
-    char *err;
+    char *err = NULL;
     xmlnode xerr;
     static char maxerr[] = "maximum node size reached";
     static char deeperr[] = "maximum node depth reached";