Merge branch 'develop'

config.mk

@@ -2,26 +2,27 @@
 
 VERSION_MAJOR = 0
 VERSION_MINOR = 2
-VERSION_REV = 0
+VERSION_REV = 1
 VERSION = ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_REV}
 
 # minimum required zathura version
 ZATHURA_MIN_VERSION = 0.2.0
 ZATHURA_VERSION_CHECK ?= $(shell pkg-config --atleast-version=$(ZATHURA_MIN_VERSION) zathura; echo $$?)
+ZATHURA_GTK_VERSION ?= $(shell pkg-config --variable=GTK_VERSION zathura)
 
 # paths
 PREFIX ?= /usr
 LIBDIR ?= ${PREFIX}/lib
 
 # libs
-GTK_INC ?= $(shell pkg-config --cflags gtk+-2.0)
-GTK_LIB ?= $(shell pkg-config --libs gtk+-2.0)
+GTK_INC ?= $(shell pkg-config --cflags gtk+-${ZATHURA_GTK_VERSION}.0)
+GTK_LIB ?= $(shell pkg-config --libs gtk+-${ZATHURA_GTK_VERSION}.0)
 
 PDF_INC ?= $(shell pkg-config --cflags poppler-glib)
 PDF_LIB ?= $(shell pkg-config --libs poppler-glib)
 
-GIRARA_INC ?= $(shell pkg-config --cflags girara-gtk2)
-GIRARA_LIB ?= $(shell pkg-config --libs girara-gtk2)
+GIRARA_INC ?= $(shell pkg-config --cflags girara-gtk${ZATHURA_GTK_VERSION})
+GIRARA_LIB ?= $(shell pkg-config --libs girara-gtk${ZATHURA_GTK_VERSION})
 
 ZATHURA_INC ?= $(shell pkg-config --cflags zathura)
 PLUGINDIR ?= $(shell pkg-config --variable=plugindir zathura)

pdf.c

@@ -30,10 +30,17 @@ poppler_link_to_zathura_link(PopplerDocument* poppler_document, PopplerAction*
   switch (poppler_action->type) {
     case POPPLER_ACTION_GOTO_DEST: {
       PopplerDest* poppler_destination = poppler_action->goto_dest.dest;
+      if (poppler_destination == NULL) {
+        return NULL;
+      }
+
       type = ZATHURA_LINK_GOTO_DEST;
 
       if (poppler_action->goto_dest.dest->type == POPPLER_DEST_NAMED) {
         poppler_destination = poppler_document_find_dest(poppler_document, poppler_destination->named_dest);
+        if (poppler_destination == NULL) {
+          return NULL;
+        }
       }
 
       PopplerPage* poppler_page = poppler_document_get_page(poppler_document, poppler_destination->page_num);