mirrors/zathura
1
0
Fork 0
mirror of https://git.pwmt.org/pwmt/zathura.git synced 2024-11-14 08:23:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of pwmt.org:zathura into develop

Browse Source 
Conflicts:
	document.c
This commit is contained in:
Sebastian Ramacher 2012-02-08 22:33:10 +01:00
commit f4f24fe0cc
3 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -50,7 +50,7 @@ ${PROJECT}: ${OBJECTS}
clean: clean:
$(QUIET)rm -rf ${PROJECT} ${OBJECTS} ${PROJECT}-${VERSION}.tar.gz \ $(QUIET)rm -rf ${PROJECT} ${OBJECTS} ${PROJECT}-${VERSION}.tar.gz \
${DOBJECTS} ${PROJECT}-debug .depend ${PROJECT}.pc doc ${DOBJECTS} ${PROJECT}-debug .depend ${PROJECT}.pc doc *gcda *gcno $(PROJECT).info gcov
$(QUIET)make -C tests clean $(QUIET)make -C tests clean
${PROJECT}-debug: ${DOBJECTS} ${PROJECT}-debug: ${DOBJECTS}
@ -87,6 +87,12 @@ dist: clean
doc: clean doc: clean
$(QUIET)doxygen Doxyfile $(QUIET)doxygen Doxyfile
gcov: clean
$(QUIET)CFLAGS+="-fprofile-arcs -ftest-coverage" LDFLAGS+="-fprofile-arcs" $(MAKE) $(PROJECT)
$(QUIET)make -C tests
$(QUIET)lcov --directory . --capture --output-file $(PROJECT).info
$(QUIET)genhtml --output-directory gcov $(PROJECT).info
install: all ${PROJECT}.pc install: all ${PROJECT}.pc
$(ECHO) installing executable file $(ECHO) installing executable file
$(QUIET)mkdir -p ${DESTDIR}${PREFIX}/bin $(QUIET)mkdir -p ${DESTDIR}${PREFIX}/bin

6
document.c
View File

@ -275,6 +275,12 @@ zathura_document_open(zathura_t* zathura, const char* path, const char* password
goto error_free; goto error_free;
} }
/* check current page number */
if (document->current_page_number < 1 || document->current_page_number >= document->number_of_pages) {
girara_warning("document info: '%s' has an invalid page number", document->file_path);
document->current_page_number = 1;
}
/* update statusbar */ /* update statusbar */
girara_statusbar_item_set_text(zathura->ui.session, zathura->ui.statusbar.file, real_path); girara_statusbar_item_set_text(zathura->ui.session, zathura->ui.statusbar.file, real_path);

3
tests/config.mk
View File

@ -4,3 +4,6 @@ CHECK_INC ?= $(shell pkg-config --cflags check)
CHECK_LIB ?= $(shell pkg-config --libs check) CHECK_LIB ?= $(shell pkg-config --libs check)
LIBS += ${CHECK_LIB} LIBS += ${CHECK_LIB}
CFLAGS += -fprofile-arcs -ftest-coverage
LDFLAGS += -fprofile-arcs