[ekg2-commit] r4123 - in trunk: ekg plugins/irc plugins/ncurses: trunk/ekg/windows.c trunk/ekg/windows.h trunk/plugins/irc/misc.c trunk/plugins/ncurses/old.c

[SVN commit]

Author: wiechu
Date: 2008-07-17 22:46:38 +0200 (Thu, 17 Jul 2008)
New Revision: 4123

Modified:
   trunk/ekg/windows.c
   trunk/ekg/windows.h
   trunk/plugins/irc/misc.c
   trunk/plugins/ncurses/old.c
Log:
    - add window->alias
    - display nice irc !channel name in statusbar


Modified: trunk/ekg/windows.c
===================================================================
--- trunk/ekg/windows.c	2008-07-17 19:15:50 UTC (rev 4122)
+++ trunk/ekg/windows.c	2008-07-17 20:46:38 UTC (rev 4123)
@@ -49,7 +49,7 @@
 window_t *windows = NULL;		/* lista okien */
 
 static LIST_ADD_COMPARE(window_new_compare, window_t *) { return data1->id - data2->id; }
-static LIST_FREE_ITEM(list_window_free, window_t *) { xfree(data->target);  userlists_destroy(&(data->userlist)); }
+static LIST_FREE_ITEM(list_window_free, window_t *) { xfree(data->target); xfree(data->alias); userlists_destroy(&(data->userlist)); }
 
 static __DYNSTUFF_LIST_ADD_SORTED(windows, window_t, window_new_compare);			/* windows_add() */
 static __DYNSTUFF_LIST_UNLINK(windows, window_t);						/* windows_unlink() */

Modified: trunk/ekg/windows.h
===================================================================
--- trunk/ekg/windows.h	2008-07-17 19:15:50 UTC (rev 4122)
+++ trunk/ekg/windows.h	2008-07-17 20:46:38 UTC (rev 4123)
@@ -49,6 +49,7 @@
 
 	unsigned short id;		/* numer okna */
 	char *target;			/* nick query albo inna nazwa albo NULL */
+	char *alias;			/* name for display */
 	session_t *session;		/* której sesji dotyczy okno */
 
 	unsigned short left, top;	/* pozycja (x, y) względem początku ekranu */

Modified: trunk/plugins/irc/misc.c
===================================================================
--- trunk/plugins/irc/misc.c	2008-07-17 19:15:50 UTC (rev 4122)
+++ trunk/plugins/irc/misc.c	2008-07-17 20:46:38 UTC (rev 4123)
@@ -1263,7 +1263,7 @@
 	window_t	*newwin;
 	people_t	*person;
 	int		me = 0;
-	char		*irc_nick;
+	char		*irc_nick, *tmp;
 
 	/* irc channels are said to be case insensitive, so I think
 	 * we can do it 'in place', without a copy
@@ -1278,6 +1278,13 @@
 	me = !xstrcmp(j->nick, param[0]+1); /* We join ? */
 	if (me) {
 		newwin = window_new(ekg2_channel, s, 0);
+
+		tmp = xstrdup(irc_channel);
+		clean_channel_name(s, tmp);
+		if (xstrcmp(irc_channel, tmp))
+			newwin->alias = xstrdup(tmp);	/* ?WO? format for alias here??? */
+		xfree(tmp);
+
 		window_switch(newwin->id);
 		debug("[irc] c_join() %08X\n", newwin);
 		ischan = irc_add_channel(s, j , irc_channel, newwin);

Modified: trunk/plugins/ncurses/old.c
===================================================================
--- trunk/plugins/ncurses/old.c	2008-07-17 19:15:50 UTC (rev 4122)
+++ trunk/plugins/ncurses/old.c	2008-07-17 20:46:38 UTC (rev 4123)
@@ -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 && q->nickname) ? 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->alias ? window_current->alias : window_current->target);
 	__add_format("query", tmp);
 
 	__add_format_emp("debug", (!window_current->id));