diff options
| author | Marco Peereboom <marco@conformal.com> | 2011-10-06 12:59:19 -0500 |
|---|---|---|
| committer | Marco Peereboom <marco@conformal.com> | 2011-10-06 12:59:19 -0500 |
| commit | f2fc48a9635306677f18f8ed31df4ee865f35999 (patch) | |
| tree | a6e8be7d2768e20f415238c65902ec406877b835 | |
| parent | 038e53d8c1a5b14d427e1e5beb302722d97d73c1 (diff) | |
| download | xombrero-f2fc48a9635306677f18f8ed31df4ee865f35999.tar.gz | |
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.
| -rw-r--r-- | Makefile | 5 | ||||
| -rw-r--r-- | 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); |