From 13c49bea656a4f495e2c4baedab130eab367ae4f Mon Sep 17 00:00:00 2001
From: Marco Pesenti Gritti <mpg@redhat.com>
Date: Mon, 11 Jul 2005 17:38:35 +0000
Subject: Allow to enable/disable the pixbuf backend. Default to off for now. If we

2005-07-11  Marco Pesenti Gritti  <mpg@redhat.com>

        * Makefile.am:
        * backend/Makefile.am:
        * backend/ev-document-factory.c: (ev_document_type_get_from_mime):
        * configure.ac:
        * shell/ev-document-types.c: (ev_document_types_add_filters):

        Allow to enable/disable the pixbuf backend.
        Default to off for now. If we want it enabled we should
        really put mime types in the desktop, implement properties etc.

        * properties/evince-properties.c:

        Initialize error to NULL.
        Check error is not NULL before freeing.
---
(limited to 'properties/ev-properties-main.c')

diff --git a/properties/ev-properties-main.c b/properties/ev-properties-main.c
index c92a804..2e566d5 100644
--- a/properties/ev-properties-main.c
+++ b/properties/ev-properties-main.c
@@ -82,7 +82,7 @@ static GList *
 ev_properties_get_pages (NautilusPropertyPageProvider *provider,
 			 GList *files)
 {
-	GError *error;
+	GError *error = NULL;
 	char *mime;
 	EvDocument *document;
 	GList *pages = NULL;
@@ -106,7 +106,9 @@ ev_properties_get_pages (NautilusPropertyPageProvider *provider,
 
 	uri = nautilus_file_info_get_uri (file);
 	if (!ev_document_load (document, uri, &error)) {
-		g_error_free (error);
+		if (error) {
+			g_error_free (error);
+		}
 		goto end;
 	}
 	label = gtk_label_new (_("Document"));
--
cgit v0.9.1