[ekg2-commit] r3982 - in trunk: ekg plugins/ncurses: trunk/ekg/commands.c trunk/plugins/ncurses/old.c

[SVN commit]

Author: wiechu
Date: 2008-04-05 19:23:51 +0200 (Sat, 05 Apr 2008)
New Revision: 3982

Modified:
   trunk/ekg/commands.c
   trunk/plugins/ncurses/old.c
Log:
    - Fix command /ignore
    - Fix display of ignored or blocked user.

Modified: trunk/ekg/commands.c
===================================================================
--- trunk/ekg/commands.c	2008-04-04 21:15:35 UTC (rev 3981)
+++ trunk/ekg/commands.c	2008-04-05 17:23:51 UTC (rev 3982)
@@ -1275,13 +1275,16 @@
 		} else
 			flags = IGNORE_ALL;
 
-		if (modified)
+		if (modified) {
+			uid = xstrdup(uid);
 			ignored_remove(session, uid);
+		}
 
                 if (!ignored_add(session, uid, flags)) {
-                        if (modified)
+                        if (modified) {
                                 printq("ignored_modified", format_user(session, uid));
-                        else
+                                xfree(uid);
+                        } else
                                 printq("ignored_added", format_user(session, uid));
                         config_changed = 1;
                 }

Modified: trunk/plugins/ncurses/old.c
===================================================================
--- trunk/plugins/ncurses/old.c	2008-04-04 21:15:35 UTC (rev 3981)
+++ trunk/plugins/ncurses/old.c	2008-04-05 17:23:51 UTC (rev 3982)
@@ -1611,7 +1611,7 @@
 	__add_format_dup("session", (sess), (sess->alias) ? sess->alias : sess->uid);
 	__add_format_dup("descr", (sess && sess->descr && session_connected_get(sess)), sess->descr);
 
-	tmp = (sess && q) ? saprintf("%s/%s", q->nickname, q->uid) : xstrdup(window_current->target);
+	tmp = (sess && q && q->nickname) ? saprintf("%s/%s", q->nickname, q->uid) : xstrdup(window_current->target);
 	__add_format("query", tmp);
 
 	__add_format_emp("debug", (!window_current->id));