[ekg2-commit] r4110 - in trunk: ekg plugins/jabber: trunk/ekg/windows.c trunk/plugins/jabber/jabber.c trunk/plugins/jabber/jabber_handlers.c

[SVN commit]

Author: darkjames
Date: 2008-07-15 22:08:34 +0200 (Tue, 15 Jul 2008)
New Revision: 4110

Modified:
   trunk/ekg/windows.c
   trunk/plugins/jabber/jabber.c
   trunk/plugins/jabber/jabber_handlers.c
Log:
use query_emit_id_ro() here, and there.. :>



Modified: trunk/ekg/windows.c
===================================================================
--- trunk/ekg/windows.c	2008-07-15 19:48:35 UTC (rev 4109)
+++ trunk/ekg/windows.c	2008-07-15 20:08:34 UTC (rev 4110)
@@ -592,9 +592,7 @@
 	const int par0_matchlen	= par0_len > 2 ? par0_len : 2;
 
 	if (!xstrcmp(name, "clear") || (params[0] && !xstrncasecmp(params[0], "clear", par0_matchlen))) {
-		window_t *w = xmemdup(window_current, sizeof(window_t));
-		query_emit_id(NULL, UI_WINDOW_CLEAR, &w);
-		xfree(w);
+		query_emit_id_ro(NULL, UI_WINDOW_CLEAR, &window_current);
 		return 0;
 	}
 

Modified: trunk/plugins/jabber/jabber.c
===================================================================
--- trunk/plugins/jabber/jabber.c	2008-07-15 19:48:35 UTC (rev 4109)
+++ trunk/plugins/jabber/jabber.c	2008-07-15 20:08:34 UTC (rev 4110)
@@ -417,15 +417,7 @@
 	if (!s->connected && !s->connecting)
 		return;
 
-	{
-		char *__session = xstrdup(session_uid_get(s));
-		char *__reason = xstrdup(reason);
-		
-		query_emit_id(NULL, PROTOCOL_DISCONNECTED, &__session, &__reason, &type, NULL);
-
-		xfree(__session);
-		xfree(__reason);
-	}
+	query_emit_id_ro(NULL, PROTOCOL_DISCONNECTED, &(s->uid), &reason, &type, NULL);
 	
 	if (j->send_watch) {
 		j->send_watch->type = WATCH_NONE;

Modified: trunk/plugins/jabber/jabber_handlers.c
===================================================================
--- trunk/plugins/jabber/jabber_handlers.c	2008-07-15 19:48:35 UTC (rev 4109)
+++ trunk/plugins/jabber/jabber_handlers.c	2008-07-15 20:08:34 UTC (rev 4110)
@@ -1670,14 +1670,10 @@
 			}
 		}
 
-		{
-			char *session 	= xstrdup(session_uid_get(s));
+		if (!when)
+			when = time(NULL);
 
-			if (!when) when = time(NULL);
-			query_emit_id(NULL, PROTOCOL_STATUS, &session, &uid, &status, &descr, &when);
-
-			xfree(session);
-		}
+		query_emit_id_ro(NULL, PROTOCOL_STATUS, &(s->uid), &uid, &status, &descr, &when);
 		xfree(descr);
 	}
 	xfree(uid);