Rename error as mdvi_error to avoid symbol conflicts with the libc error.

[evince.git] / properties / ev-properties-main.c

diff --git a/properties/ev-properties-main.c b/properties/ev-properties-main.c
index 32677fc1839c0c5e1b3e3acd89d6a44ffa1c9cc8..b25df9ea011a632f718a351ae0ddf99056be708d 100644 (file)
--- a/properties/ev-properties-main.c
+++ b/properties/ev-properties-main.c
@@ -27,16 +27,20 @@
  *
  */
 
  *
  */
 

-#include "ev-properties-view.h"
-#include "ev-document-factory.h"
-

 #include <config.h>
 #include <config.h>

+

 #include <string.h>
 #include <string.h>

+

 #include <glib/gi18n-lib.h>
 #include <glib/gi18n-lib.h>

-#include <gtk/gtklabel.h>
+#include <gtk/gtk.h>
+

 #include <libnautilus-extension/nautilus-extension-types.h>
 #include <libnautilus-extension/nautilus-property-page-provider.h>
 
 #include <libnautilus-extension/nautilus-extension-types.h>
 #include <libnautilus-extension/nautilus-property-page-provider.h>
 

+#include "ev-properties-view.h"
+#include "ev-backends-manager.h"
+#include "ev-document-factory.h"
+

 static GType epp_type = 0;
 static void property_page_provider_iface_init
        (NautilusPropertyPageProviderIface *iface);
 static GType epp_type = 0;
 static void property_page_provider_iface_init
        (NautilusPropertyPageProviderIface *iface);


@@ -89,7 +93,7 @@ ev_properties_get_pages (NautilusPropertyPageProvider *provider,
        char *uri = NULL;
        GtkWidget *page, *label;
        NautilusPropertyPage *property_page;
        char *uri = NULL;
        GtkWidget *page, *label;
        NautilusPropertyPage *property_page;

-       
+

        /* only add properties page if a single file is selected */
        if (files == NULL || files->next != NULL)
                goto end;
        /* only add properties page if a single file is selected */
        if (files == NULL || files->next != NULL)
                goto end;


@@ -103,6 +107,9 @@ ev_properties_get_pages (NautilusPropertyPageProvider *provider,
                g_error_free (error);
                goto end;
        }
                g_error_free (error);
                goto end;
        }

+       
+       if (!document)
+               goto end;

 
        label = gtk_label_new (_("Document"));
        page = ev_properties_view_new ();
 
        label = gtk_label_new (_("Document"));
        page = ev_properties_view_new ();


@@ -130,11 +137,14 @@ nautilus_module_initialize (GTypeModule *module)
        /* set up translation catalog */
        bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
        bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
        /* set up translation catalog */
        bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
        bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");

+
+       ev_backends_manager_init ();

 }
 
 void
 nautilus_module_shutdown (void)
 {
 }
 
 void
 nautilus_module_shutdown (void)
 {

+       ev_backends_manager_shutdown ();

 }
 
 void
 }
 
 void