X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2Fmain.c;h=17e0f647f9fa9f95041982c9a942f4ea49d46dfb;hb=31b40f7679ff2bf455f493e101d5cbf521bb0d12;hp=72c43df0b1858685be360dde6977b6377e54a033;hpb=75d6ca169171f642ba7438e648b4529638bf90c3;p=evince.git diff --git a/shell/main.c b/shell/main.c index 72c43df0..17e0f647 100644 --- a/shell/main.c +++ b/shell/main.c @@ -24,44 +24,54 @@ #include #include -#include - -#if WITH_GNOME -#include -#include -#include -#include -#endif #ifdef ENABLE_DBUS +#include #include #endif #include "ev-application.h" #include "ev-backends-manager.h" #include "ev-debug.h" +#include "ev-init.h" #include "ev-file-helpers.h" -#include "ev-metadata-manager.h" #include "ev-stock-icons.h" +#include "eggsmclient.h" +#ifndef G_OS_WIN32 +#include "eggdesktopfile.h" +#endif static gchar *ev_page_label; static gchar *ev_find_string; static gboolean preview_mode = FALSE; -static gboolean fullscren_mode = FALSE; +static gboolean fullscreen_mode = FALSE; static gboolean presentation_mode = FALSE; static gboolean unlink_temp_file = FALSE; static gchar *print_settings; static const char **file_arguments = NULL; +static gboolean +option_version_cb (const gchar *option_name, + const gchar *value, + gpointer data, + GError **error) +{ + g_print ("%s %s\n", _("GNOME Document Viewer"), VERSION); + + exit (0); + return FALSE; +} + static const GOptionEntry goption_options[] = { { "page-label", 'p', 0, G_OPTION_ARG_STRING, &ev_page_label, N_("The page of the document to display."), N_("PAGE")}, - { "fullscreen", 'f', 0, G_OPTION_ARG_NONE, &fullscren_mode, N_("Run evince in fullscreen mode"), NULL }, + { "fullscreen", 'f', 0, G_OPTION_ARG_NONE, &fullscreen_mode, N_("Run evince in fullscreen mode"), NULL }, { "presentation", 's', 0, G_OPTION_ARG_NONE, &presentation_mode, N_("Run evince in presentation mode"), NULL }, { "preview", 'w', 0, G_OPTION_ARG_NONE, &preview_mode, N_("Run evince as a previewer"), NULL }, { "find", 'l', 0, G_OPTION_ARG_STRING, &ev_find_string, N_("The word or phrase to find in the document"), N_("STRING")}, { "unlink-tempfile", 'u', G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_NONE, &unlink_temp_file, NULL, NULL }, { "print-settings", 't', G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_FILENAME, &print_settings, NULL, NULL }, + { "version", 0, G_OPTION_FLAG_NO_ARG | G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_CALLBACK, option_version_cb, NULL, NULL }, { G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_FILENAME_ARRAY, &file_arguments, NULL, N_("[FILE...]") }, { NULL } }; @@ -145,7 +155,7 @@ arguments_parse (void) ev_page_label = NULL; } - if (fullscren_mode) + if (fullscreen_mode) mode = EV_WINDOW_MODE_FULLSCREEN; else if (presentation_mode) mode = EV_WINDOW_MODE_PRESENTATION; @@ -319,108 +329,69 @@ 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; GError *error = NULL; -#endif - context = g_option_context_new (_("GNOME Document Viewer")); + /* Init glib threads asap */ + if (!g_thread_supported ()) + g_thread_init (NULL); #ifdef ENABLE_NLS /* Initialize the i18n stuff */ - 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); + bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR); + bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); + textdomain (GETTEXT_PACKAGE); #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 + context = g_option_context_new (N_("GNOME Document Viewer")); + g_option_context_set_translation_domain(context, GETTEXT_PACKAGE); + g_option_context_add_main_entries (context, goption_options, GETTEXT_PACKAGE); + + g_option_context_add_group (context, egg_sm_client_get_option_group ()); g_option_context_add_group (context, gtk_get_option_group (TRUE)); + if (!g_option_context_parse (context, &argc, &argv, &error)) { - g_warning ("Cannot parse arguments: %s", error->message); + g_printerr ("Cannot parse arguments: %s", error->message); g_error_free (error); + g_option_context_free (context); + return 1; } g_option_context_free (context); - accel_filename = g_build_filename (ev_dot_dir (), "accels", NULL); - gtk_accel_map_load (accel_filename); -#endif - args = arguments_parse (); #ifdef ENABLE_DBUS 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 - - ev_debug_init (); - -#if WITH_GNOME - gnome_authentication_manager_init (); -#endif - - ev_backends_manager_init (); - - if (enable_metadata) { - ev_metadata_manager_init (); } +#endif /* ENABLE_DBUS */ - g_set_application_name (_("Evince Document Viewer")); + if (!ev_init ()) + return 1; - ev_file_helpers_init (); ev_stock_icons_init (); + +#ifdef G_OS_WIN32 + /* Manually set name and icon in win32 */ + g_set_application_name (_("Evince")); gtk_window_set_default_icon_name ("evince"); +#else + egg_set_desktop_file (GNOMEDATADIR "/applications/evince.desktop"); +#endif /* G_OS_WIN32 */ - 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 (); + ev_shutdown (); - if (enable_metadata) { - ev_metadata_manager_shutdown (); - } - - ev_backends_manager_shutdown (); - - ev_debug_shutdown (); - -#if WITH_GNOME - g_object_unref (program); -#endif - return 0; }