X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=sidebyside;f=shell%2Fmain.c;h=04aa5ea18ce76b4f58e6f45edbf765f9282964d4;hb=f343927df4325959193353c52cff1ea4b20b2286;hp=e4c2d1b7e7f4a4ea9517a54f97fd658315962d67;hpb=31e16bd8f386dc292e60489d4a17227804bdc2e6;p=evince.git

diff --git a/shell/main.c b/shell/main.c
index e4c2d1b7..04aa5ea1 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -21,6 +21,7 @@
 
 #include "ev-application.h"
 #include "ev-metadata-manager.h"
+#include "ev-debug.h"
 
 #include <glib/gi18n.h>
 #include <gdk/gdkx.h>
@@ -35,9 +36,6 @@
 #include <libgnomeui/gnome-authentication-manager.h>
 #endif
 
-#include <libgnomevfs/gnome-vfs-init.h>
-#include <libgnomevfs/gnome-vfs-utils.h>
-
 #ifdef ENABLE_DBUS
 #include <dbus/dbus-glib-bindings.h>
 #endif
@@ -203,10 +201,13 @@ load_files (const char **files,
 		char   *uri;
 		char   *label;
 		GValue *old = NULL;
+		GFile  *file;
 
-		uri = gnome_vfs_make_uri_from_shell_arg (files[i]);
+		file = g_file_new_for_commandline_arg (files[i]);
+		uri = g_file_get_uri (file);
+		g_object_unref (file);
 		
-		label = strchr (uri, GNOME_VFS_URI_MAGIC_CHR);
+		label = strchr (uri, '#');
 
 		if (label) {
 			GValue *new;
@@ -251,7 +252,7 @@ load_files_remote (const char **files,
 	connection = dbus_g_bus_get (DBUS_BUS_STARTER, &error);
 
 	if (connection == NULL) {
-		g_warning (error->message);
+		g_warning ("%s", error->message);
 		g_error_free (error);	
 
 		return FALSE;
@@ -267,7 +268,7 @@ load_files_remote (const char **files,
 					G_TYPE_UINT, timestamp,
 					G_TYPE_INVALID,
 					G_TYPE_INVALID)) {
-			g_warning (error->message);
+			g_warning ("%s", error->message);
 			g_clear_error (&error);
 			g_object_unref (remote_object);
 			dbus_g_connection_unref (connection);
@@ -282,9 +283,13 @@ load_files_remote (const char **files,
 
 	for (i = 0; files[i]; i++) {
 		const char *page_label;
+		GFile *file;
 		char *uri;
 
-		uri = gnome_vfs_make_uri_from_shell_arg (files[i]);
+		file = g_file_new_for_commandline_arg (files[i]);
+		uri = g_file_get_uri (file);
+		g_object_unref (file);
+
 		page_label = ev_page_label ? ev_page_label : "";
 
 		if (!dbus_g_proxy_call (remote_object, "OpenURI", &error,
@@ -293,7 +298,7 @@ load_files_remote (const char **files,
 					G_TYPE_UINT, timestamp,
 					G_TYPE_INVALID,
 					G_TYPE_INVALID)) {
-			g_warning (error->message);
+			g_warning ("%s", error->message);
 			g_clear_error (&error);
 			g_free (uri);
 			continue;
@@ -353,8 +358,6 @@ main (int argc, char *argv[])
 		return 1;
 	}
 	g_option_context_free (context);
-	
-	gnome_vfs_init ();
 
 	accel_filename = g_build_filename (ev_dot_dir (), "accels", NULL);
 	gtk_accel_map_load (accel_filename);
@@ -376,6 +379,8 @@ main (int argc, char *argv[])
 	}
 #endif
 
+	ev_debug_init ();
+	
 #if WITH_GNOME	
 	gnome_authentication_manager_init ();
 #endif