X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2Fmain.c;h=ff8eafa297d28f30a0b1b936a2675efefaf43d97;hb=f675370b1c2f1e29dfb3a3b97eda5d46f6a4a4ae;hp=e4c2d1b7e7f4a4ea9517a54f97fd658315962d67;hpb=31e16bd8f386dc292e60489d4a17227804bdc2e6;p=evince.git diff --git a/shell/main.c b/shell/main.c index e4c2d1b7..ff8eafa2 100644 --- a/shell/main.c +++ b/shell/main.c @@ -19,33 +19,24 @@ #include "config.h" -#include "ev-application.h" -#include "ev-metadata-manager.h" - -#include -#include -#include #include #include -#if WITH_GNOME -#include -#include -#include -#include -#endif - -#include -#include +#include +#include +#include #ifdef ENABLE_DBUS #include #endif -#include "ev-stock-icons.h" -#include "ev-job-queue.h" -#include "ev-file-helpers.h" +#include "ev-application.h" #include "ev-backends-manager.h" +#include "ev-debug.h" +#include "ev-file-helpers.h" +#include "ev-metadata-manager.h" +#include "ev-stock-icons.h" +#include "eggsmclient.h" static gchar *ev_page_label; static gchar *ev_find_string; @@ -203,10 +194,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 +245,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 +261,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 +276,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 +291,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; @@ -315,50 +313,41 @@ load_files_remote (const char **files, int main (int argc, char *argv[]) { - gboolean enable_metadata = FALSE; GOptionContext *context; GHashTable *args; -#if WITH_GNOME - GnomeProgram *program; -#else - char *accel_filename; + gboolean enable_metadata = FALSE; GError *error = NULL; -#endif + + /* Init glib threads asap */ + if (!g_thread_supported ()) + g_thread_init (NULL); context = g_option_context_new (_("GNOME Document Viewer")); #ifdef ENABLE_NLS /* Initialize the i18n stuff */ - bindtextdomain(GETTEXT_PACKAGE, GNOMELOCALEDIR); - bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8"); - textdomain(GETTEXT_PACKAGE); + bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR); + bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); + textdomain (GETTEXT_PACKAGE); g_option_context_add_main_entries (context, goption_options, GETTEXT_PACKAGE); g_option_context_set_translation_domain(context, GETTEXT_PACKAGE); #else g_option_context_add_main_entries (context, goption_options, NULL); -#endif - -#if WITH_GNOME - program = gnome_program_init (PACKAGE, VERSION, - LIBGNOMEUI_MODULE, argc, argv, - GNOME_PARAM_GOPTION_CONTEXT, context, - GNOME_PARAM_HUMAN_READABLE_NAME, _("Evince"), - GNOME_PARAM_APP_DATADIR, GNOMEDATADIR, - NULL); -#else +#endif /* ENABLE_NLS */ + + g_option_context_add_group (context, egg_sm_client_get_option_group ()); g_option_context_add_group (context, gtk_get_option_group (TRUE)); + + gtk_init (&argc, &argv); + if (!g_option_context_parse (context, &argc, &argv, &error)) { g_warning ("Cannot parse arguments: %s", error->message); g_error_free (error); + g_option_context_free (context); + 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 args = arguments_parse (); @@ -366,45 +355,31 @@ main (int argc, char *argv[]) if (!ev_application_register_service (EV_APP)) { if (load_files_remote (file_arguments, args)) { g_hash_table_destroy (args); -#if WITH_GNOME - g_object_unref (program); -#endif + return 0; } } else { enable_metadata = TRUE; } -#endif - -#if WITH_GNOME - gnome_authentication_manager_init (); -#endif +#endif /* ENABLE_DBUS */ + ev_debug_init (); ev_backends_manager_init (); if (enable_metadata) { ev_metadata_manager_init (); } - ev_job_queue_init (); - g_set_application_name (_("Evince Document Viewer")); - ev_file_helpers_init (); ev_stock_icons_init (); gtk_window_set_default_icon_name ("evince"); - load_files (file_arguments, args); + if (!ev_application_load_session (EV_APP)) + load_files (file_arguments, args); g_hash_table_destroy (args); gtk_main (); -#if WITH_GNOME - gnome_accelerators_sync (); -#else - gtk_accel_map_save (accel_filename); - g_free (accel_filename); -#endif - ev_file_helpers_shutdown (); if (enable_metadata) { @@ -413,9 +388,7 @@ main (int argc, char *argv[]) ev_backends_manager_shutdown (); -#if WITH_GNOME - g_object_unref (program); -#endif - + ev_debug_shutdown (); + return 0; }