[dualscreen] fix crash on ctrl+w and fix control window closing

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

diff --git a/properties/ev-properties-main.c b/properties/ev-properties-main.c
index a3c045b43ff8df8323fdcec646d029efcd0216a8..1a7cccd77bcbc52551e365a25eb992ffa6d7e519 100644 (file)
--- a/properties/ev-properties-main.c
+++ b/properties/ev-properties-main.c
@@ -6,7 +6,7 @@
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public
  * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
+ * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  * The Ev project hereby grant permission for non-gpl compatible GStreamer
  * plugins to be used and distributed together with GStreamer and Ev. This
@@ -89,7 +89,8 @@ ev_properties_get_pages (NautilusPropertyPageProvider *provider,
        EvDocument *document;
        GList *pages = NULL;
        NautilusFileInfo *file;
-       char *uri = NULL;
+       gchar *uri = NULL;
+       gchar *mime_type = NULL;
        GtkWidget *page, *label;
        NautilusPropertyPage *property_page;
 
@@ -100,16 +101,18 @@ ev_properties_get_pages (NautilusPropertyPageProvider *provider,
 
        /* okay, make the page */
        uri = nautilus_file_info_get_uri (file);
-       document = ev_document_factory_get_document (uri, &error);
+       mime_type = nautilus_file_info_get_mime_type (file);
+       
+       document = ev_backends_manager_get_document (mime_type);
+       if (!document)
+               goto end;
 
+       ev_document_load (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 (uri);
        ev_properties_view_set_info (EV_PROPERTIES_VIEW (page),
@@ -123,6 +126,8 @@ ev_properties_get_pages (NautilusPropertyPageProvider *provider,
 
 end:
        g_free (uri);
+       g_free (mime_type);
+       
        return pages;
 }
 
@@ -133,17 +138,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_backends_manager_init ();
+        ev_init ();
 }
 
 void
 nautilus_module_shutdown (void)
 {
-       ev_backends_manager_shutdown ();
+        ev_shutdown ();
 }
 
 void
@@ -156,4 +157,3 @@ nautilus_module_list_types (const GType **types,
        *types = type_list;
        *num_types = G_N_ELEMENTS (type_list);
 }
-