X-Git-Url: http://git.silcnet.org/gitweb/?a=blobdiff_plain;f=apps%2Firssi%2Fsrc%2Ffe-text%2Fterminfo-core.c;h=530050c2a4200c66a10b2792d5d6299449930daf;hb=63ca577177f9f5db8e553372a9793b0c85f10715;hp=524fb9d0156502a3da1effd07416386284562e64;hpb=60c165f23f8d5553bd8b4fd43366fbf5f24c2832;p=crypto.git

diff --git a/apps/irssi/src/fe-text/terminfo-core.c b/apps/irssi/src/fe-text/terminfo-core.c
index 524fb9d0..530050c2 100644
--- a/apps/irssi/src/fe-text/terminfo-core.c
+++ b/apps/irssi/src/fe-text/terminfo-core.c
@@ -416,23 +416,23 @@ void terminfo_setup_colors(TERM_REC *term, int force)
 	terminfo_colors_deinit(term);
         term->has_colors = term->TI_setf || term->TI_setaf;
 
-	if (term->TI_setf) {
-		for (i = 0; i < 8; i++)
-                        term->TI_fg[i] = g_strdup(tparm(term->TI_setf, i, 0));
-	} else if (term->TI_setaf) {
+	if (term->TI_setaf) {
 		for (i = 0; i < 8; i++)
                         term->TI_fg[i] = g_strdup(tparm(term->TI_setaf, ansitab[i], 0));
+	} else if (term->TI_setf) {
+		for (i = 0; i < 8; i++)
+                        term->TI_fg[i] = g_strdup(tparm(term->TI_setf, i, 0));
 	} else if (force) {
 		for (i = 0; i < 8; i++)
                         term->TI_fg[i] = g_strdup_printf("\033[%dm", 30+ansitab[i]);
 	}
 
-	if (term->TI_setb) {
-		for (i = 0; i < 8; i++)
-                        term->TI_bg[i] = g_strdup(tparm(term->TI_setb, i, 0));
-	} else if (term->TI_setab) {
+	if (term->TI_setab) {
 		for (i = 0; i < 8; i++)
                         term->TI_bg[i] = g_strdup(tparm(term->TI_setab, ansitab[i], 0));
+	} else if (term->TI_setb) {
+		for (i = 0; i < 8; i++)
+                        term->TI_bg[i] = g_strdup(tparm(term->TI_setb, i, 0));
 	} else if (force) {
 		for (i = 0; i < 8; i++)
                         term->TI_bg[i] = g_strdup_printf("\033[%dm", 40+ansitab[i]);
@@ -530,7 +530,7 @@ static int term_setup(TERM_REC *term)
 	if (tgetent(term->buffer1, term_env) < 1)
 	{
 		fprintf(term->out, "Termcap not found for TERM=%s\n", term_env);
-		return -1;
+		return 0;
 	}
 #endif