From acb11bda4b749bd5162c8b6ab24caef2cc631567 Mon Sep 17 00:00:00 2001 From: Moritz Lipp Date: Thu, 21 Jan 2010 10:57:49 +0100 Subject: [PATCH] Update README It seems that you have tu use newer versions of the libraries --- README | 5 +++-- zathura.c | 4 +++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/README b/README index fe384d6..ea68a92 100644 --- a/README +++ b/README @@ -4,9 +4,10 @@ zathura is a pdf viewer based on the poppler pdf rendering library Requirements ------------ -poppler-glib (0.10) +poppler-glib (0.12.3) cairo (1.8.8) -gtk2 (2.16) +gtk2 (2.18.6) +glib2 (2.22.4) Configuration ------------- diff --git a/zathura.c b/zathura.c index 4976624..2b18681 100644 --- a/zathura.c +++ b/zathura.c @@ -938,7 +938,9 @@ sc_search(Argument* argument) pthread_mutex_lock(&(Zathura.Lock.search_lock)); if(Zathura.Thread.search_thread_running) { - pthread_cancel(Zathura.Thread.search_thread); + if(pthread_cancel(Zathura.Thread.search_thread) == 0) + pthread_join(Zathura.Thread.search_thread, NULL); + Zathura.Thread.search_thread_running = FALSE; }