Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
pwmt
zathura
Commits
f4f24fe0
Commit
f4f24fe0
authored
Feb 08, 2012
by
Sebastian Ramacher
Browse files
Merge branch 'develop' of pwmt.org:zathura into develop
Conflicts: document.c
parents
e513cb55
7ca0f3b2
Changes
3
Hide whitespace changes
Inline
Side-by-side
Makefile
View file @
f4f24fe0
...
...
@@ -50,7 +50,7 @@ ${PROJECT}: ${OBJECTS}
clean
:
$(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
${PROJECT}-debug
:
${DOBJECTS}
...
...
@@ -87,6 +87,12 @@ dist: clean
doc
:
clean
$(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
$(ECHO)
installing executable file
$(QUIET)
mkdir
-p
${DESTDIR}${PREFIX}
/bin
...
...
document.c
View file @
f4f24fe0
...
...
@@ -275,6 +275,12 @@ zathura_document_open(zathura_t* zathura, const char* path, const char* password
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 */
girara_statusbar_item_set_text
(
zathura
->
ui
.
session
,
zathura
->
ui
.
statusbar
.
file
,
real_path
);
...
...
tests/config.mk
View file @
f4f24fe0
...
...
@@ -4,3 +4,6 @@ CHECK_INC ?= $(shell pkg-config --cflags check)
CHECK_LIB
?=
$(
shell
pkg-config
--libs
check
)
LIBS
+=
${CHECK_LIB}
CFLAGS
+=
-fprofile-arcs
-ftest-coverage
LDFLAGS
+=
-fprofile-arcs
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment