#include "ev-application.h"
#include "ev-metadata-manager.h"
+#include "ev-debug.h"
#include <glib/gi18n.h>
#include <gdk/gdkx.h>
#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
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;
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;
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);
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,
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;
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);
}
#endif
+ ev_debug_init ();
+
#if WITH_GNOME
gnome_authentication_manager_init ();
#endif