summaryrefslogtreecommitdiff
path: root/src/fe-common/core
diff options
context:
space:
mode:
authorTimo Sirainen <cras@irssi.org>2002-09-14 23:23:57 +0000
committercras <cras@dbcabf3a-b0e7-0310-adc4-f8d773084564>2002-09-14 23:23:57 +0000
commit3dda9ab2dfdde389c516e2a35f4d7f56f90b6a37 (patch)
tree6e3a9c6615ef2981112de79d24472fbe64d2482d /src/fe-common/core
parenta83366069fd5e31a123bd402a92d25ad62fed11e (diff)
downloadirssi-3dda9ab2dfdde389c516e2a35f4d7f56f90b6a37.zip
statusbar is now also updated for connecting-servers.
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@2922 dbcabf3a-b0e7-0310-adc4-f8d773084564
Diffstat (limited to 'src/fe-common/core')
-rw-r--r--src/fe-common/core/themes.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/src/fe-common/core/themes.c b/src/fe-common/core/themes.c
index d9aac5e2..baa1d3e5 100644
--- a/src/fe-common/core/themes.c
+++ b/src/fe-common/core/themes.c
@@ -253,10 +253,11 @@ static int data_is_empty(const char **data)
{
/* since we don't know the real argument list, assume there's always
an argument in them */
- char *arglist[] = {
+ static char *arglist[] = {
"x", "x", "x", "x", "x", "x","x", "x", "x", "x",
NULL
};
+ SERVER_REC *server;
const char *p;
char *ret;
int free_ret, empty;
@@ -277,8 +278,12 @@ static int data_is_empty(const char **data)
/* variable - check if it's empty */
p++;
- ret = parse_special((char **) &p,
- active_win == NULL ? NULL : active_win->active_server,
+
+ server = active_win == NULL ? NULL :
+ active_win->active_server != NULL ?
+ active_win->active_server : active_win->connect_server;
+
+ ret = parse_special((char **) &p, server,
active_win == NULL ? NULL : active_win->active,
arglist, &free_ret, NULL, 0);
p++;