[ekg2-commit] r3831 - trunk/plugins/ncurses: trunk/plugins/ncurses/contacts.c trunk/plugins/ncurses/old.c

[SVN commit]

Author: peres
Date: 2008-03-02 22:08:34 +0100 (Sun, 02 Mar 2008)
New Revision: 3831

Modified:
   trunk/plugins/ncurses/contacts.c
   trunk/plugins/ncurses/old.c
Log:

Wrr, commit skipped these.



Modified: trunk/plugins/ncurses/contacts.c
===================================================================
--- trunk/plugins/ncurses/contacts.c	2008-03-02 19:27:48 UTC (rev 3830)
+++ trunk/plugins/ncurses/contacts.c	2008-03-02 21:08:34 UTC (rev 3831)
@@ -117,7 +117,10 @@
 	u->nickname	= nickname;
 	u->descr	= up->descr;
 	u->status	= up->status;
-	u->xstate	= up->xstate;
+		/* XXX: we need to copy these two? or maybe we shall memcpy() whole struct,
+		 * then change invidual fields? */
+	u->blink	= up->blink;
+	u->typing	= up->typing;
 	u->private	= priv;
 	return u;
 }
@@ -364,9 +367,9 @@
 			else
 				snprintf(tmp, sizeof(tmp), "contacts_%s", status_t);
 
-			if (u->xstate & EKG_XSTATE_BLINK)
+			if (u->blink)
 				xstrcat(tmp, "_blink");
-			if (u->xstate & EKG_XSTATE_TYPING)
+			if (u->typing)
 				xstrcat(tmp, "_typing");
 
 			line = format_string(format_find(tmp), u->nickname, u->descr);

Modified: trunk/plugins/ncurses/old.c
===================================================================
--- trunk/plugins/ncurses/old.c	2008-03-02 19:27:48 UTC (rev 3830)
+++ trunk/plugins/ncurses/old.c	2008-03-02 21:08:34 UTC (rev 3831)
@@ -1590,7 +1590,7 @@
 		/* XXX add unknown and likes!; maybe we could use ekg_status_string()? */
 #undef __add_format_emp_st
 
-		__add_format_emp("typing", (q->xstate & EKG_XSTATE_TYPING));
+		__add_format_emp("typing", q->typing);
 		__add_format_dup("query_descr", (q->descr), q->descr);
 #if 0	
 		__add_format_dup("query_ip", (q->ip), inet_ntoa(*((struct in_addr*)(&q->ip)))); 	/* XXX!!! */