From fcca562280299b1c999e97ec489391b97ce20872 Mon Sep 17 00:00:00 2001 From: Sebastian Ramacher Date: Mon, 20 Feb 2012 20:17:16 +0100 Subject: [PATCH 1/2] use gdk_threads_enter and leave in file monitor callbacks --- callbacks.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/callbacks.c b/callbacks.c index 984c902..c35d50b 100644 --- a/callbacks.c +++ b/callbacks.c @@ -225,7 +225,9 @@ cb_file_monitor(GFileMonitor* monitor, GFile* file, GFile* UNUSED(other_file), G return; } + gdk_threads_enter(); sc_reload(session, NULL, NULL, 0); + gdk_threads_leave(); } static gboolean From 53deb6d15073160c932b641dad8ed9a97195f4d0 Mon Sep 17 00:00:00 2001 From: Sebastian Ramacher Date: Mon, 20 Feb 2012 22:23:11 +0100 Subject: [PATCH 2/2] add AUTHORS file --- AUTHORS | 12 ++++++++++++ Makefile | 9 ++++++--- 2 files changed, 18 insertions(+), 3 deletions(-) create mode 100644 AUTHORS diff --git a/AUTHORS b/AUTHORS new file mode 100644 index 0000000..2d7a1a9 --- /dev/null +++ b/AUTHORS @@ -0,0 +1,12 @@ +zathura is written by: + +Moritz Lipp +Sebastian Ramacher + +Other contributors are (in alphabetical order): + +Pavel Borzenkov +Ivan Sichmann Freitas +int3 +karottenreibe +Johannes Meng Johannes Meng diff --git a/Makefile b/Makefile index 6eb28c6..b809463 100644 --- a/Makefile +++ b/Makefile @@ -78,14 +78,17 @@ tests: ${OBJECTS} dist: clean $(QUIET)mkdir -p ${PROJECT}-${VERSION} - $(QUIET)cp -R LICENSE Makefile config.mk common.mk README Doxyfile \ - ${PROJECT}.1.rst ${PROJECT}rc.5.rst ${SOURCE} ${HEADER} ${PROJECT}.pc.in tests \ + $(QUIET)mkdir -p ${PROJECT}-${VERSION}/tests + $(QUIET)cp LICENSE Makefile config.mk common.mk README AUTHORS Doxyfile \ + ${PROJECT}.1.rst ${PROJECT}rc.5.rst ${SOURCE} ${HEADER} ${PROJECT}.pc.in \ ${PROJECT}-${VERSION} + $(QUIET)cp Makefile config.mk tests/*.c \ + ${PROJECT}-${VERSION}/tests $(QUIET)tar -cf ${PROJECT}-${VERSION}.tar ${PROJECT}-${VERSION} $(QUIET)gzip ${PROJECT}-${VERSION}.tar $(QUIET)rm -rf ${PROJECT}-${VERSION} -doc: clean +doc: $(QUIET)doxygen Doxyfile gcov: clean