[zathura] upstream requested we backport cdece5922982b06e1a86dfb7dfc8cf3d225f06f0 as well

[François Cami]

commit 98eaf8df9b6ab59c1aeee369d8ec0a0ec957fa21
Author: François Cami <fcami at fedoraproject.org>
Date:   Tue May 28 21:34:38 2013 +0200

    upstream requested we backport cdece5922982b06e1a86dfb7dfc8cf3d225f06f0 as well

 zathura-0.2.3-missing-or-unknown-file-type.patch |   47 +++++++--------------
 zathura.spec                                     |    5 ++-
 2 files changed, 20 insertions(+), 32 deletions(-)
---
diff --git a/zathura-0.2.3-missing-or-unknown-file-type.patch b/zathura-0.2.3-missing-or-unknown-file-type.patch
index f943563..8c1557c 100644
--- a/zathura-0.2.3-missing-or-unknown-file-type.patch
+++ b/zathura-0.2.3-missing-or-unknown-file-type.patch
@@ -1,18 +1,7 @@
-From cf96d52790bc8d05a9e556e33af0b6fec1a4cb0e Mon Sep 17 00:00:00 2001
-From: Moritz Lipp <mlq at pwmt.org>
-Date: Tue, 28 May 2013 17:00:37 +0200
-Subject: [PATCH 1/1] Report missing plugin/unsupported file type
-
----
- document.c |    1 +
- zathura.c  |    3 +++
- 2 files changed, 4 insertions(+)
-
-diff --git a/document.c b/document.c
-index 2e6e557..7ca21ff 100644
---- a/document.c
-+++ b/document.c
-@@ -110,6 +110,7 @@ zathura_document_open(zathura_plugin_manager_t* plugin_manager, const char*
+diff -rU3 zathura-0.2.3/document.c zathura-0.2.3-patched/document.c
+--- zathura-0.2.3/document.c	2013-05-12 23:28:52.000000000 +0200
++++ zathura-0.2.3-patched/document.c	2013-05-28 21:24:19.585439351 +0200
+@@ -110,6 +110,7 @@
  
    if (plugin == NULL) {
      girara_error("unknown file type\n");
@@ -20,20 +9,16 @@ index 2e6e557..7ca21ff 100644
      goto error_free;
    }
  
-diff --git a/zathura.c b/zathura.c
-index cdf4eac..a0a8f57 100644
---- a/zathura.c
-+++ b/zathura.c
-@@ -562,6 +562,9 @@ document_open(zathura_t* zathura, const char* path, const char* password,
-   zathura_document_t* document = zathura_document_open(zathura->plugins.manager, path, password, &error);
- 
-   if (document == NULL) {
-+    if (error == NULL ) {
-+      girara_notify(zathura->ui.session, GIRARA_ERROR, _("Unsupported file type. Please install the necessary plugin."), false, NULL, NULL, NULL);
+diff -rU3 zathura-0.2.3/zathura.c zathura-0.2.3-patched/zathura.c
+--- zathura-0.2.3/zathura.c	2013-05-12 23:28:52.000000000 +0200
++++ zathura-0.2.3-patched/zathura.c	2013-05-28 21:24:25.955414704 +0200
+@@ -578,6 +578,9 @@
+       }
+       goto error_out;
+     }
++    if (error == ZATHURA_ERROR_OK ) {
++      girara_notify(zathura->ui.session, GIRARA_ERROR, _("Unsupported file type. Please install the necessary plugin."));
 +    }
-     if (error == ZATHURA_ERROR_INVALID_PASSWORD) {
-       zathura_password_dialog_info_t* password_dialog_info = malloc(sizeof(zathura_password_dialog_info_t));
-       if (password_dialog_info != NULL) {
--- 
-1.7.10.4
-
+     goto error_out;
+   }
+ 
diff --git a/zathura.spec b/zathura.spec
index 30e4735..6bd49d3 100644
--- a/zathura.spec
+++ b/zathura.spec
@@ -1,6 +1,6 @@
 Name:           zathura
 Version:        0.2.3
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        A lightweight document viewer
 Group:          Applications/Publishing
 License:        zlib
@@ -97,6 +97,9 @@ update-desktop-database &> /dev/null || :
 %files plugins-all
 
 %changelog
+* Tue May 28 2013 François Cami <fcami at fedoraproject.org> - 0.2.3-6
+- backport cdece5922982b06e1a86dfb7dfc8cf3d225f06f0
+
 * Tue May 28 2013 François Cami <fcami at fedoraproject.org> - 0.2.3-5
 - backport cf96d52790bc8d05a9e556e33af0b6fec1a4cb0e