svn path=/trunk/; revision=3469

[evince.git] / backend / pdf / ev-poppler.cc

diff --git a/backend/pdf/ev-poppler.cc b/backend/pdf/ev-poppler.cc
index 2e48df9d7d650a6357cfacd4c083fdaeaba2c2b2..841706ead130de392cbe9b01f7a497f545dcf80d 100644 (file)
--- a/backend/pdf/ev-poppler.cc
+++ b/backend/pdf/ev-poppler.cc
@@ -228,6 +228,7 @@ static void
 convert_error (GError  *poppler_error,
               GError **error)
 {
+       g_return_if_fail (poppler_error != NULL);
        if (poppler_error == NULL)
                return;
 
@@ -239,12 +240,12 @@ convert_error (GError  *poppler_error,
                else if (poppler_error->code == POPPLER_ERROR_ENCRYPTED)
                        code = EV_DOCUMENT_ERROR_ENCRYPTED;
                        
+               g_set_error_literal (error,
+                                     EV_DOCUMENT_ERROR,
+                                     code,
+                                     poppler_error->message);
 
-               g_set_error (error,
-                            EV_DOCUMENT_ERROR,
-                            code,
-                            poppler_error->message,
-                            NULL);
+               g_error_free (poppler_error);
        } else {
                g_propagate_error (error, poppler_error);
        }