From 2d8aad40e1916911b773f1cfdd93c961feabf807 Mon Sep 17 00:00:00 2001
From: Christian Persch <chpe@src.gnome.org>
Date: Fri, 30 Jan 2009 18:40:17 +0000
Subject: A libdocument/ev-init.[ch]: Add single init/shutdown method. Bug #569117.

	* evince-document.h:
	* libdocument/Makefile.am:
	A libdocument/ev-init.[ch]: Add single init/shutdown method. Bug
	#569117.

	* libdocument/ev-backends-manager.c: (_ev_backends_manager_init):
	* libdocument/ev-backends-manager.h:
	* libdocument/ev-debug.c: (_ev_debug_init), (_ev_debug_shutdown):
	* libdocument/ev-debug.h:
	* libdocument/ev-file-helpers.c: (_ev_file_helpers_init),
	(_ev_file_helpers_shutdown):
	* libdocument/ev-file-helpers.h: Make these init/shutdown methods
	private.

	* properties/ev-properties-main.c: (nautilus_module_initialize),
	(nautilus_module_shutdown):
	* shell/main.c: (main):
	* thumbnailer/evince-thumbnailer.c: (main): Use the new single
	init/shutdown method.

svn path=/trunk/; revision=3391
---
(limited to 'thumbnailer')

diff --git a/thumbnailer/evince-thumbnailer.c b/thumbnailer/evince-thumbnailer.c
index ec72f16..217210b 100644
--- a/thumbnailer/evince-thumbnailer.c
+++ b/thumbnailer/evince-thumbnailer.c
@@ -163,7 +163,8 @@ main (int argc, char *argv[])
 	if (!g_thread_supported ())
 		g_thread_init (NULL);
 
-	ev_backends_manager_init ();
+        if (!ev_init ())
+                return -1;
 
 	file = g_file_new_for_commandline_arg (input);
 	uri = g_file_get_uri (file);
@@ -173,13 +174,13 @@ main (int argc, char *argv[])
 	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;
 	}
 
@@ -198,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;
 }
--
cgit v0.9.1