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

This commit is contained in:
Moritz Lipp 2015-01-20 21:38:10 +01:00
commit 676005ad99
2 changed files with 3 additions and 2 deletions

View file

@ -1,3 +1,4 @@
If GDK_NATIVE_WINDOWS is enabled you will experience problems with large If GDK_NATIVE_WINDOWS is enabled you will experience problems with large
documents. In this case zathura might crash or pages cannot be rendered documents. In this case zathura might crash or pages cannot be rendered
properly. Disabling GDK_NATIVE_WINDOWS fixes this issue. properly. Disabling GDK_NATIVE_WINDOWS fixes this issue. The same issue may
appear, if overlay-scrollbar is enabled in GTK_MODULES.

View file

@ -828,7 +828,7 @@ document_open(zathura_t* zathura, const char* path, const char* password,
/* bookmarks */ /* bookmarks */
if (zathura->database != NULL) { if (zathura->database != NULL) {
if (zathura_bookmarks_load(zathura, file_path) == false) { if (zathura_bookmarks_load(zathura, file_path) == false) {
girara_warning("Failed to loads bookmarks."); girara_debug("Failed to load bookmarks.");
} }
/* jumplist */ /* jumplist */