X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=sidebyside;f=thumbnailer%2Fevince-thumbnailer.c;h=217210b651167fc4a10daf1129d97a066583ae2d;hb=b16d94919e61b0228950073ade43ace80fb1e1b0;hp=d55067427bb292e9ae50f12ac7da95c268e72136;hpb=31e16bd8f386dc292e60489d4a17227804bdc2e6;p=evince.git

diff --git a/thumbnailer/evince-thumbnailer.c b/thumbnailer/evince-thumbnailer.c
index d5506742..217210b6 100644
--- a/thumbnailer/evince-thumbnailer.c
+++ b/thumbnailer/evince-thumbnailer.c
@@ -16,17 +16,11 @@
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
-#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>
-#include <ev-async-renderer.h>
-#include <ev-document-factory.h>
-#include <ev-backends-manager.h>
+#include <config.h>
+
+#include <evince-document.h>
+
+#include <gio/gio.h>
 
 #include <stdlib.h>
 #include <string.h>
@@ -67,13 +61,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;
@@ -137,6 +135,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) {
@@ -159,25 +158,29 @@ 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 ();
+        if (!ev_init ())
+                return -1;
 
-	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) {
-		ev_backends_manager_shutdown ();
+		ev_shutdown ();
 		return -2;
 	}
 
 	if (!EV_IS_DOCUMENT_THUMBNAILS (document)) {
 		g_object_unref (document);
-		ev_backends_manager_shutdown ();
+		ev_shutdown ();
 		return -2;
 	}
 
@@ -196,19 +199,19 @@ main (int argc, char *argv[])
 		gtk_main ();
 
 		g_object_unref (document);
-		ev_backends_manager_shutdown ();
+		ev_shutdown ();
 
 		return data.success ? 0 : -2;
 	}
 
 	if (!evince_thumbnail_pngenc_get (document, output, size)) {
 		g_object_unref (document);
-		ev_backends_manager_shutdown ();
+		ev_shutdown ();
 		return -2;
 	}
 
 	g_object_unref (document);
-	ev_backends_manager_shutdown ();
+        ev_shutdown ();
 
 	return 0;
 }