From f2fc48a9635306677f18f8ed31df4ee865f35999 Mon Sep 17 00:00:00 2001
From: Marco Peereboom <marco@conformal.com>
Date: Thu, 6 Oct 2011 12:59:19 -0500
Subject: get rid of threads altogether

it was a mistake to introduce threads for the color bar so simply get
rid of threads altogether and pretend it never happened.
---
 Makefile  | 5 +++--
 xxxterm.c | 7 +++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index c4716ef..1a00e70 100644
--- a/Makefile
+++ b/Makefile
@@ -14,10 +14,11 @@ LIBS+= gtk+-2.0
 LIBS+= webkit-1.0
 LIBS+= libsoup-2.4
 LIBS+= gnutls
+LIBS+= gthread-2.0
 GTK_CFLAGS!= pkg-config --cflags $(LIBS)
 GTK_LDFLAGS!= pkg-config --libs $(LIBS)
-CFLAGS+= $(GTK_CFLAGS) -Wall -pthread
-LDFLAGS+= $(GTK_LDFLAGS) -pthread
+CFLAGS+= $(GTK_CFLAGS) -Wall
+LDFLAGS+= $(GTK_LDFLAGS)
 BUILDVERSION != sh "${.CURDIR}/buildver.sh"
 .if !${BUILDVERSION} == ""
 CPPFLAGS+= -DXXXTERM_BUILDSTR=\"$(BUILDVERSION)\"
diff --git a/xxxterm.c b/xxxterm.c
index 9902c60..a435ed8 100644
--- a/xxxterm.c
+++ b/xxxterm.c
@@ -6392,7 +6392,7 @@ color_address_bar(gpointer p)
 
 	col_str = NULL;
 done:
-	return (FALSE /* kill thread */);
+	return (FALSE);
 }
 
 void
@@ -6422,8 +6422,8 @@ show_ca_status(struct tab *t, const char *uri)
 	    !g_str_has_prefix(uri, "https://"))
 		goto done;
 
-	/* thread the coloring of the address bar */
-	g_thread_create((GThreadFunc)color_address_bar, t, FALSE, NULL);
+	color_address_bar(t);
+
 	return;
 
 done:
@@ -10094,7 +10094,6 @@ main(int argc, char *argv[])
 
 	/* prepare gtk */
 	gtk_init(&argc, &argv);
-	g_thread_init(NULL);
 
 	strlcpy(named_session, XT_SAVED_TABS_FILE, sizeof named_session);
 
-- 
cgit 1.4.1-2-gfad0