[ekg2-commit] r3916 - in trunk/plugins: irc jabber: trunk/plugins/irc/irc.c trunk/plugins/jabber/jabber.c trunk/plugins/jabber/jabber_handlers.c

[SVN commit]

Author: peres
Date: 2008-03-19 23:43:27 +0100 (Wed, 19 Mar 2008)
New Revision: 3916

Modified:
   trunk/plugins/irc/irc.c
   trunk/plugins/jabber/jabber.c
   trunk/plugins/jabber/jabber_handlers.c
Log:

/me in jabber-MUC support.
And removal of prompt in IRC /me's; I think they'll look better now.
And they all are now aligned with normal statements.



Modified: trunk/plugins/irc/irc.c
===================================================================
--- trunk/plugins/irc/irc.c	2008-03-19 22:20:55 UTC (rev 3915)
+++ trunk/plugins/irc/irc.c	2008-03-19 22:43:27 UTC (rev 3916)
@@ -2338,10 +2338,10 @@
 	format_add("irc_quit",		_("%> %Y%2%n has quit irc (%4)\n"), 1);
 	format_add("irc_split",		"%> ", 1);
 	format_add("irc_unknown_ctcp",	_("%> %Y%2%n sent unknown CTCP %3: (%4)\n"), 1);
-	format_add("irc_ctcp_action_y_pub",	"%> %y%e* %2%n %4\n", 1);
-	format_add("irc_ctcp_action_y",		"%> %Y%e* %2%n %4\n", 1);
-	format_add("irc_ctcp_action_pub",	"%> %y%h* %2%n %5\n", 1);
-	format_add("irc_ctcp_action",		"%> %Y%h* %2%n %5\n", 1);
+	format_add("irc_ctcp_action_y_pub",	"%y%e* %2%n  %4\n", 1);
+	format_add("irc_ctcp_action_y",		"%Y%e* %2%n  %4\n", 1);
+	format_add("irc_ctcp_action_pub",	"%y%h* %2%n  %5\n", 1);
+	format_add("irc_ctcp_action",		"%Y%h* %2%n  %5\n", 1);
 	format_add("irc_ctcp_request_pub",	_("%> %Y%2%n requested ctcp %5 from %4\n"), 1);
 	format_add("irc_ctcp_request",		_("%> %Y%2%n requested ctcp %5\n"), 1);
 	format_add("irc_ctcp_reply",		_("%> %Y%2%n CTCP reply from %3: %5\n"), 1);

Modified: trunk/plugins/jabber/jabber.c
===================================================================
--- trunk/plugins/jabber/jabber.c	2008-03-19 22:20:55 UTC (rev 3915)
+++ trunk/plugins/jabber/jabber.c	2008-03-19 22:43:27 UTC (rev 3916)
@@ -1260,6 +1260,8 @@
 	/* %1 - sessionname %2 - mucjid %3 - nickname %4 - text %5 - atr */
 	format_add("jabber_muc_recv", 	"%B<%w%X%5%3%B>%n %4", 1);
 	format_add("jabber_muc_send",	"%B<%n%X%5%W%3%B>%n %4", 1);
+	format_add("jabber_muc_me", 	"%y*%X%5%3%B%n  %4", 1);
+	format_add("jabber_muc_me_sent","%Y*%X%5%W%3%B%n  %4", 1);
 
 	/* %1 - sessionname, %2 - mucjid %3 - text */
 	format_add("jabber_muc_notice", "%n-%P%2%n- %3", 1);

Modified: trunk/plugins/jabber/jabber_handlers.c
===================================================================
--- trunk/plugins/jabber/jabber_handlers.c	2008-03-19 22:20:55 UTC (rev 3915)
+++ trunk/plugins/jabber/jabber_handlers.c	2008-03-19 22:43:27 UTC (rev 3916)
@@ -1006,11 +1006,12 @@
 
 		/* jesli (bsent != 0) wtedy mamy do czynienia z backlogiem */
 
-			class	|= EKG_NO_THEMEBIT;
+			class	|= EKG_NO_THEMEBIT;	/* XXX: maybe some core-side support instead of forcing our themes? */
 			ekgbeep	= EKG_NO_BEEP;
 
 			if (nick) {	/* XXX !!! */
 				char attr[2] = { ' ', 0 };
+				const int is_me = !xstrncmp(text, "/me ", 4);
 
 				if ((u = userlist_find_u(&(c->participants), nick))) {
 					jabber_userlist_private_t *up = jabber_userlist_priv_get(u);
@@ -1027,8 +1028,10 @@
 
 				} else debug_error("[MUC, MESSAGE] userlist_find_u(%s) failed\n", nick);
 
-				formatted = format_string(format_find(isour ? "jabber_muc_send" : "jabber_muc_recv"),
-						session_name(s), uid2, nick, text, attr);
+				formatted = format_string(format_find(
+							is_me ? ( isour ? "jabber_muc_me_sent" : "jabber_muc_me" )
+							      : ( isour ? "jabber_muc_send" : "jabber_muc_recv")),
+						session_name(s), uid2, nick, is_me ? text+4 : text, attr);
 			} else {
 				formatted = format_string(format_find("jabber_muc_notice"), session_name(s), uid+5, text);
 			}