X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=properties%2Fev-properties-main.c;h=6af16f36ad7301ecc9fcff69eee13c019a084c08;hb=841369ba5c77e58a6fa19723b33d04720a7d4fec;hp=2e566d5505763b5397f4641f27f95162088434b5;hpb=13c49bea656a4f495e2c4baedab130eab367ae4f;p=evince.git

diff --git a/properties/ev-properties-main.c b/properties/ev-properties-main.c
index 2e566d55..6af16f36 100644
--- a/properties/ev-properties-main.c
+++ b/properties/ev-properties-main.c
@@ -27,16 +27,19 @@
  *
  */
 
-#include "ev-properties-view.h"
-#include "ev-document-factory.h"
-
 #include <config.h>
+
 #include <string.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 <evince-document.h>
+#include "ev-properties-view.h"
+
 static GType epp_type = 0;
 static void property_page_provider_iface_init
 	(NautilusPropertyPageProviderIface *iface);
@@ -46,7 +49,7 @@ static GList *ev_properties_get_pages
 static void
 ev_properties_plugin_register_type (GTypeModule *module)
 {
-	static const GTypeInfo info = {
+	const GTypeInfo info = {
 		sizeof (GObjectClass),
 		(GBaseInitFunc) NULL,
 		(GBaseFinalizeFunc) NULL,
@@ -57,7 +60,7 @@ ev_properties_plugin_register_type (GTypeModule *module)
 		0,
 		(GInstanceInitFunc) NULL
 	};
-	static const GInterfaceInfo property_page_provider_iface_info = {
+	const GInterfaceInfo property_page_provider_iface_info = {
 		(GInterfaceInitFunc)property_page_provider_iface_init,
 		NULL,
 		NULL
@@ -83,7 +86,6 @@ ev_properties_get_pages (NautilusPropertyPageProvider *provider,
 			 GList *files)
 {
 	GError *error = NULL;
-	char *mime;
 	EvDocument *document;
 	GList *pages = NULL;
 	NautilusFileInfo *file;
@@ -97,22 +99,19 @@ ev_properties_get_pages (NautilusPropertyPageProvider *provider,
 	file = files->data;
 
 	/* okay, make the page */
-	mime = nautilus_file_info_get_mime_type (file);
-	document = ev_document_factory_get_document (mime);
-	g_free (mime);
-
-	if (document == NULL)
-		goto end;
-
 	uri = nautilus_file_info_get_uri (file);
-	if (!ev_document_load (document, uri, &error)) {
-		if (error) {
-			g_error_free (error);
-		}
+	document = ev_document_factory_get_document (uri, &error);
+
+	if (error) {
+		g_error_free (error);
 		goto end;
 	}
+	
+	if (!document)
+		goto end;
+
 	label = gtk_label_new (_("Document"));
-	page = ev_properties_view_new ();
+	page = ev_properties_view_new (uri);
 	ev_properties_view_set_info (EV_PROPERTIES_VIEW (page),
 				     ev_document_get_info (document));
 	gtk_widget_show (page);
@@ -134,14 +133,13 @@ nautilus_module_initialize (GTypeModule *module)
 	ev_properties_plugin_register_type (module);
 	ev_properties_view_register_type (module);
 
-	/* set up translation catalog */
-	bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
-	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+        ev_init ();
 }
 
 void
 nautilus_module_shutdown (void)
 {
+        ev_shutdown ();
 }
 
 void
@@ -154,4 +152,3 @@ nautilus_module_list_types (const GType **types,
 	*types = type_list;
 	*num_types = G_N_ELEMENTS (type_list);
 }
-