[ekg2-commit] r4106 - trunk/ekg: trunk/ekg/protocol.c trunk/ekg/themes.c

[SVN commit]

Author: wiechu
Date: 2008-07-14 19:35:47 +0200 (Mon, 14 Jul 2008)
New Revision: 4106

Modified:
   trunk/ekg/protocol.c
   trunk/ekg/themes.c
Log:
    fix w->act


Modified: trunk/ekg/protocol.c
===================================================================
--- trunk/ekg/protocol.c	2008-07-14 14:37:03 UTC (rev 4105)
+++ trunk/ekg/protocol.c	2008-07-14 17:35:47 UTC (rev 4106)
@@ -697,7 +697,7 @@
 		separate = 2;
 	else if ( (class == EKG_MSGCLASS_CHAT || class == EKG_MSGCLASS_SENT_CHAT) || 
 		  (!(config_make_window & 4) && (class == EKG_MSGCLASS_MESSAGE || class == EKG_MSGCLASS_SENT)) )
-		separate = to_me ? 4 : 1;
+		separate = to_me ? 3 : 1;
 
 	print_window(target, s, separate, class_str, user, timestamp,
 		(is_me ? text+4 : text),

Modified: trunk/ekg/themes.c
===================================================================
--- trunk/ekg/themes.c	2008-07-14 14:37:03 UTC (rev 4105)
+++ trunk/ekg/themes.c	2008-07-14 17:35:47 UTC (rev 4106)
@@ -702,7 +702,7 @@
  * @param separate:
  *		1 - EKG_MSGCLASS_MESSAGE || EKG_MSGCLASS_SENT
  *		2 - EKG_MSGCLASS_LOG || EKG_MSGCLASS_SENT_LOG
- *		4 - EKG_MSGCLASS_NOT2US
+ *		3 - msg to us
  *		0 - other
  *
  * @note 	We only check if @a w == NULL, if you send here wrong window_t ptr, everything can happen. don't do it.
@@ -721,10 +721,10 @@
 	/* Change w->act */
 	if (w != window_current && !w->floating && (separate != 2)) {
 		int newact;
-		if (separate == 1)
-			newact = 2;	/* msg to us */
-		else if (separate == 4)
-			newact = 3;	/* msg, but not to us */
+		if (separate == 3)
+			newact = 3;	/* msg to us */
+		else if (separate == 1)
+			newact = 2;	/* msg not to us */
 		else
 			newact = 1;	/* junk */