[ekg2-commit] r3852 - trunk/plugins/jabber: trunk/plugins/jabber/commands.c trunk/plugins/jabber/jabber_dcc.c trunk/plugins/jabber/misc.c

[SVN commit]

Author: peres
Date: 2008-03-07 19:11:45 +0100 (Fri, 07 Mar 2008)
New Revision: 3852

Modified:
   trunk/plugins/jabber/commands.c
   trunk/plugins/jabber/jabber_dcc.c
   trunk/plugins/jabber/misc.c
Log:
And last few ones.

I don't think LZW support is more important than other XXX-es,
so removed #warning.



Modified: trunk/plugins/jabber/commands.c
===================================================================
--- trunk/plugins/jabber/commands.c	2008-03-07 18:03:15 UTC (rev 3851)
+++ trunk/plugins/jabber/commands.c	2008-03-07 18:11:45 UTC (rev 3852)
@@ -267,9 +267,9 @@
 		/* threaded messages */
 	if (!xstrcmp(name, "tmsg")) {
 			/* just make it compatible with /msg */
-		thread = params[1];
-		params[1] = params[2];
-		params[2] = thread;
+		const char *tmp	= params[1];
+		params[1]	= params[2];
+		params[2]	= tmp;
 		
 			/* and now we can set real thread */
 		thread = jabber_escape(params[2]);
@@ -290,7 +290,7 @@
 			msg	= NULL;
 		}
 	} else 
-		msg = params[1]; /* bez tematu */
+		msg = (char*) params[1]; /* bez tematu */
 	if ((c = newconference_find(session, target))) 
 		ismuc = 1;
 

Modified: trunk/plugins/jabber/jabber_dcc.c
===================================================================
--- trunk/plugins/jabber/jabber_dcc.c	2008-03-07 18:03:15 UTC (rev 3851)
+++ trunk/plugins/jabber/jabber_dcc.c	2008-03-07 18:11:45 UTC (rev 3852)
@@ -359,8 +359,6 @@
 	d->priv = NULL;
 
 	if (p) {
-		list_t l;
-
 		if (p->protocol == JABBER_DCC_PROTOCOL_BYTESTREAMS) {
 			/* XXX, free protocol-specified data */
 

Modified: trunk/plugins/jabber/misc.c
===================================================================
--- trunk/plugins/jabber/misc.c	2008-03-07 18:03:15 UTC (rev 3851)
+++ trunk/plugins/jabber/misc.c	2008-03-07 18:11:45 UTC (rev 3852)
@@ -389,7 +389,6 @@
 			break;
 
 		case JABBER_COMPRESSION_LZW:	/* XXX */
-#warning "LZW SUPPORT !!!"
 		default:
 			debug_error("[jabber] jabber_handle_write() unknown compression: %d\n", j->using_compress);
 	}
@@ -491,7 +490,7 @@
 				&& xstrcmp(thr->subject, resubject) /* ...also with Re: prefix... */
 				&& (xstrncmp(thr->subject, config_subject_reply_prefix, l)
 					|| xstrcmp(thr->subject+l, subject)) /* ...on both sides... */
-				: thr->subject)) || !uid || xstrcmp(thr->uid, uid)); /* ...and UID */
+				: !!thr->subject)) || !uid || xstrcmp(thr->uid, uid)); /* ...and UID */
 	                prev = thr, thr = thr->next, i++); /* <- that's third param for 'for' */
 
 	if (!thr && can_add) { /* haven't found anything, but can create something */