Fixes bug #542924. Makes enums static to fix Solaris build.

[evince.git] / thumbnailer / evince-thumbnailer.c

diff --git a/thumbnailer/evince-thumbnailer.c b/thumbnailer/evince-thumbnailer.c
index b192d26e7ac18bb1a2f3c9f322b7efd470bc137c..b3c8285ee3d83debba1e41578b18f0f4a7a21124 100644 (file)
--- a/thumbnailer/evince-thumbnailer.c
+++ b/thumbnailer/evince-thumbnailer.c
@@ -17,11 +17,6 @@
 */
 
 #include <config.h>
-#include <libgnomevfs/gnome-vfs-mime-utils.h>
-#include <libgnomevfs/gnome-vfs-uri.h>
-#include <libgnomevfs/gnome-vfs-utils.h>
-#include <libgnomevfs/gnome-vfs-init.h>
-#include <libgnomevfs/gnome-vfs-ops.h>
 
 #include <ev-document.h>
 #include <ev-document-thumbnails.h>
@@ -29,6 +24,8 @@
 #include <ev-document-factory.h>
 #include <ev-backends-manager.h>
 
+#include <gio/gio.h>
+
 #include <stdlib.h>
 #include <string.h>
 
@@ -68,13 +65,17 @@ evince_thumbnail_pngenc_get (EvDocument *document, const char *thumbnail, int si
        EvRenderContext *rc;
        double width, height;
        GdkPixbuf *pixbuf;
+       EvPage *page;
 
-       ev_document_get_page_size (document, 0, &width, &height);
+       page = ev_document_get_page (document, 0);
+       
+       ev_document_get_page_size (document, page, &width, &height);
 
-       rc = ev_render_context_new (0, 0, size / width);
+       rc = ev_render_context_new (page, 0, size / width);
        pixbuf = ev_document_thumbnails_get_thumbnail (EV_DOCUMENT_THUMBNAILS (document),
                                                       rc, FALSE);
        g_object_unref (rc);
+       g_object_unref (page);
        
        if (pixbuf != NULL) {
                const char *overlaid_icon_name = NULL;
@@ -138,6 +139,7 @@ main (int argc, char *argv[])
        const char *output;
        int         size;
        char       *uri;
+       GFile      *file;
 
        if (argc <= 2 || argc > 5 || strcmp (argv[1], "-h") == 0 ||
            strcmp (argv[1], "--help") == 0) {
@@ -160,15 +162,18 @@ main (int argc, char *argv[])
                return -1;
        }
 
+       g_type_init ();
+
        if (!g_thread_supported ())
                g_thread_init (NULL);
-       
-       gnome_vfs_init ();
 
        ev_backends_manager_init ();
 
-       uri = gnome_vfs_make_uri_from_shell_arg (input);
+       file = g_file_new_for_commandline_arg (input);
+       uri = g_file_get_uri (file);
        document = evince_thumbnailer_get_document (uri);
+
+       g_object_unref (file);
        g_free (uri);
 
        if (!document) {