X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2Fev-application.c;h=88a2ee983f331bad22ce8f1dc12d50f0860f8de1;hb=25d98b033dd862161a97eb91c25723cef772c65e;hp=eed7be8b7cfd5596af9f9452f0a8150f71effc96;hpb=d8264ef4e6ab48b5d203093bb1c66ae2ae1ad9e0;p=evince.git diff --git a/shell/ev-application.c b/shell/ev-application.c index eed7be8b..88a2ee98 100644 --- a/shell/ev-application.c +++ b/shell/ev-application.c @@ -26,8 +26,8 @@ #include "ev-application.h" #include "ev-utils.h" -#include "ev-document-types.h" #include "ev-file-helpers.h" +#include "ev-document-factory.h" #include #include @@ -46,20 +46,22 @@ G_DEFINE_TYPE (EvApplication, ev_application, G_TYPE_OBJECT); -#define EV_APPLICATION_GET_PRIVATE(object) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((object), EV_TYPE_APPLICATION, EvApplicationPrivate)) - #define APPLICATION_SERVICE_NAME "org.gnome.evince.ApplicationService" #ifdef ENABLE_DBUS gboolean ev_application_register_service (EvApplication *application) { - DBusGConnection *connection; + static DBusGConnection *connection = NULL; DBusGProxy *driver_proxy; GError *err = NULL; guint request_name_result; + if (connection) { + g_warning ("Service already registered."); + return FALSE; + } + connection = dbus_g_bus_get (DBUS_BUS_STARTER, &err); if (connection == NULL) { g_warning ("Service registration failed."); @@ -73,13 +75,25 @@ ev_application_register_service (EvApplication *application) DBUS_PATH_DBUS, DBUS_INTERFACE_DBUS); +#if DBUS_VERSION >= 60 if (!org_freedesktop_DBus_request_name (driver_proxy, APPLICATION_SERVICE_NAME, + DBUS_NAME_FLAG_DO_NOT_QUEUE, + &request_name_result, &err)) { + g_warning ("Service registration failed."); + g_clear_error (&err); + } +#else + if (!org_freedesktop_DBus_request_name (driver_proxy, + APPLICATION_SERVICE_NAME, 0, &request_name_result, &err)) { g_warning ("Service registration failed."); g_clear_error (&err); } +#endif + g_object_unref (driver_proxy); + if (request_name_result == DBUS_REQUEST_NAME_REPLY_EXISTS) { return FALSE; } @@ -169,13 +183,8 @@ ev_application_open_window (EvApplication *application, gtk_widget_show (new_window); -#ifdef HAVE_GTK_WINDOW_PRESENT_WITH_TIME gtk_window_present_with_time (GTK_WINDOW (new_window), timestamp); -#else - gtk_window_present (GTK_WINDOW (new_window)); -#endif - return TRUE; } @@ -214,7 +223,7 @@ ev_application_get_uri_window (EvApplication *application, const char *uri) EvWindow *window = EV_WINDOW (l->data); const char *window_uri = ev_window_get_uri (window); - if (window_uri && strcmp (window_uri, uri) == 0) { + if (window_uri && strcmp (window_uri, uri) == 0 && !ev_window_is_empty (window)) { uri_window = window; break; } @@ -226,26 +235,25 @@ ev_application_get_uri_window (EvApplication *application, const char *uri) return uri_window; } -gboolean -ev_application_open_uri (EvApplication *application, - const char *uri, - const char *page_label, - guint timestamp, - GError **error) +void +ev_application_open_uri_at_dest (EvApplication *application, + const char *uri, + EvLinkDest *dest, + EvWindowRunMode mode, + guint timestamp) { EvWindow *new_window; - g_return_val_if_fail (uri != NULL, FALSE); + g_return_if_fail (uri != NULL); new_window = ev_application_get_uri_window (application, uri); if (new_window != NULL) { -#ifdef HAVE_GTK_WINDOW_PRESENT_WITH_TIME gtk_window_present_with_time (GTK_WINDOW (new_window), timestamp); -#else - gtk_window_present (GTK_WINDOW (new_window)); -#endif - return TRUE; + if (dest) + ev_window_goto_dest (new_window, dest); + + return; } new_window = ev_application_get_empty_window (application); @@ -256,20 +264,45 @@ ev_application_open_uri (EvApplication *application, /* We need to load uri before showing the window, so we can restore window size without flickering */ - ev_window_open_uri (new_window, uri); + ev_window_open_uri (new_window, uri, dest, mode); gtk_widget_show (GTK_WIDGET (new_window)); -#ifdef HAVE_GTK_WINDOW_PRESENT_WITH_TIME gtk_window_present_with_time (GTK_WINDOW (new_window), timestamp); -#else - gtk_window_present (GTK_WINDOW (new_window)); -#endif +} - if (page_label != NULL) { - ev_window_open_page_label (new_window, page_label); +gboolean +ev_application_open_uri (EvApplication *application, + const char *uri, + GHashTable *args, + guint timestamp, + GError **error) +{ + EvLinkDest *dest = NULL; + EvWindowRunMode mode = EV_WINDOW_MODE_NORMAL; + + if (args) { + GValue *value = NULL; + + value = g_hash_table_lookup (args, "page-label"); + if (value) { + const gchar *page_label; + + page_label = g_value_get_string (value); + dest = ev_link_dest_new_page_label (page_label); + } + + value = g_hash_table_lookup (args, "mode"); + if (value) { + mode = g_value_get_uint (value); + } } + + ev_application_open_uri_at_dest (application, uri, dest, mode, timestamp); + + if (dest) + g_object_unref (dest); return TRUE; } @@ -283,9 +316,7 @@ ev_application_open_uri_list (EvApplication *application, for (l = uri_list; l != NULL; l = l->next) { ev_application_open_uri (application, (char *)l->data, - NULL, - timestamp, - NULL); + NULL, timestamp, NULL); } } @@ -299,12 +330,16 @@ ev_application_shutdown (EvApplication *application) application->toolbars_file = NULL; } +#ifndef HAVE_GTK_RECENT if (application->recent_model) { g_object_unref (application->recent_model); application->recent_model = NULL; } - +#endif + + g_free (application->last_chooser_uri); g_object_unref (application); + gtk_main_quit (); } @@ -323,15 +358,19 @@ ev_application_init (EvApplication *ev_application) ev_application->toolbars_file = g_build_filename (ev_dot_dir (), "evince_toolbar.xml", NULL); - if (!egg_toolbars_model_load (ev_application->toolbars_model, - ev_application->toolbars_file)) { - egg_toolbars_model_load (ev_application->toolbars_model, - DATADIR"/evince-toolbar.xml"); + egg_toolbars_model_load_names (ev_application->toolbars_model, + DATADIR "/evince-toolbar.xml"); + + if (!egg_toolbars_model_load_toolbars (ev_application->toolbars_model, + ev_application->toolbars_file)) { + egg_toolbars_model_load_toolbars (ev_application->toolbars_model, + DATADIR"/evince-toolbar.xml"); } egg_toolbars_model_set_flags (ev_application->toolbars_model, 0, EGG_TB_MODEL_NOT_REMOVABLE); - + +#ifndef HAVE_GTK_RECENT ev_application->recent_model = egg_recent_model_new (EGG_RECENT_MODEL_SORT_MRU); /* FIXME we should add a mime type filter but current eggrecent has only a varargs style api which does not work well when @@ -339,6 +378,7 @@ ev_application_init (EvApplication *ev_application) egg_recent_model_set_limit (ev_application->recent_model, 5); egg_recent_model_set_filter_groups (ev_application->recent_model, "Evince", NULL); +#endif /* HAVE_GTK_RECENT */ } GList * @@ -365,15 +405,27 @@ EggToolbarsModel *ev_application_get_toolbars_model (EvApplication *application) return application->toolbars_model; } +#ifndef HAVE_GTK_RECENT EggRecentModel *ev_application_get_recent_model (EvApplication *application) { return application->recent_model; } +#endif void ev_application_save_toolbars_model (EvApplication *application) { - egg_toolbars_model_save (application->toolbars_model, - application->toolbars_file, "1.0"); + egg_toolbars_model_save_toolbars (application->toolbars_model, + application->toolbars_file, "1.0"); +} + +void ev_application_set_chooser_uri (EvApplication *application, const gchar *uri) +{ + g_free (application->last_chooser_uri); + application->last_chooser_uri = g_strdup (uri); } +const gchar* ev_application_get_chooser_uri (EvApplication *application) +{ + return application->last_chooser_uri; +}