"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "shell/ev-window.c" between
evince-40.1.tar.xz and evince-40.2.tar.xz

About: Evince is a document viewer for multiple document formats. It currently supports PDF, Postscript, DjVu, TIFF, DVI, XPS, SyncTex and optionally some Comics formats (requires poppler and ghostview; GNOME).

ev-window.c  (evince-40.1.tar.xz):ev-window.c  (evince-40.2.tar.xz)
skipping to change at line 242 skipping to change at line 242
gchar *dbus_object_path; gchar *dbus_object_path;
#endif #endif
guint presentation_mode_inhibit_id; guint presentation_mode_inhibit_id;
/* Caret navigation */ /* Caret navigation */
GtkWidget *ask_caret_navigation_check; GtkWidget *ask_caret_navigation_check;
/* Send to */ /* Send to */
gboolean has_mailto_handler; gboolean has_mailto_handler;
gboolean password_view_cancelled;
} EvWindowPrivate; } EvWindowPrivate;
#define GET_PRIVATE(o) ev_window_get_instance_private (o) #define GET_PRIVATE(o) ev_window_get_instance_private (o)
#define EV_WINDOW_IS_PRESENTATION(priv) (priv->presentation_view != NULL) #define EV_WINDOW_IS_PRESENTATION(priv) (priv->presentation_view != NULL)
#define GS_LOCKDOWN_SCHEMA_NAME "org.gnome.desktop.lockdown" #define GS_LOCKDOWN_SCHEMA_NAME "org.gnome.desktop.lockdown"
#define GS_LOCKDOWN_SAVE "disable-save-to-disk" #define GS_LOCKDOWN_SAVE "disable-save-to-disk"
#define GS_LOCKDOWN_PRINT "disable-printing" #define GS_LOCKDOWN_PRINT "disable-printing"
#define GS_LOCKDOWN_PRINT_SETUP "disable-print-setup" #define GS_LOCKDOWN_PRINT_SETUP "disable-print-setup"
skipping to change at line 1807 skipping to change at line 1809
ev_window_password_view_unlock (EvWindow *ev_window) ev_window_password_view_unlock (EvWindow *ev_window)
{ {
EvWindowPrivate *priv = GET_PRIVATE (ev_window); EvWindowPrivate *priv = GET_PRIVATE (ev_window);
const gchar *password; const gchar *password;
g_assert (priv->load_job); g_assert (priv->load_job);
password = ev_password_view_get_password (EV_PASSWORD_VIEW (priv->passwor d_view)); password = ev_password_view_get_password (EV_PASSWORD_VIEW (priv->passwor d_view));
ev_job_load_set_password (EV_JOB_LOAD (priv->load_job), password); ev_job_load_set_password (EV_JOB_LOAD (priv->load_job), password);
ev_job_scheduler_push_job (priv->load_job, EV_JOB_PRIORITY_NONE); ev_job_scheduler_push_job (priv->load_job, EV_JOB_PRIORITY_NONE);
priv->password_view_cancelled = FALSE;
} }
static void static void
ev_window_clear_load_job (EvWindow *ev_window) ev_window_clear_load_job (EvWindow *ev_window)
{ {
EvWindowPrivate *priv = GET_PRIVATE (ev_window); EvWindowPrivate *priv = GET_PRIVATE (ev_window);
if (priv->load_job != NULL) { if (priv->load_job != NULL) {
if (!ev_job_is_finished (priv->load_job)) if (!ev_job_is_finished (priv->load_job))
ev_job_cancel (priv->load_job); ev_job_cancel (priv->load_job);
g_signal_handlers_disconnect_by_func (priv->load_job, ev_window_l oad_job_cb, ev_window); g_signal_handlers_disconnect_by_func (priv->load_job, ev_window_l oad_job_cb, ev_window);
g_object_unref (priv->load_job); g_object_unref (priv->load_job);
priv->load_job = NULL; priv->load_job = NULL;
} }
} }
static void static void
ev_window_password_view_cancelled (EvWindow *ev_window)
{
EvWindowPrivate *priv = GET_PRIVATE (ev_window);
priv->password_view_cancelled = TRUE;
if (ev_window_is_recent_view (ev_window)) {
ev_window_clear_load_job (ev_window);
ev_application_clear_uri (EV_APP);
}
}
static void
ev_window_clear_reload_job (EvWindow *ev_window) ev_window_clear_reload_job (EvWindow *ev_window)
{ {
EvWindowPrivate *priv = GET_PRIVATE (ev_window); EvWindowPrivate *priv = GET_PRIVATE (ev_window);
if (priv->reload_job != NULL) { if (priv->reload_job != NULL) {
if (!ev_job_is_finished (priv->reload_job)) if (!ev_job_is_finished (priv->reload_job))
ev_job_cancel (priv->reload_job); ev_job_cancel (priv->reload_job);
g_signal_handlers_disconnect_by_func (priv->reload_job, ev_window _reload_job_cb, ev_window); g_signal_handlers_disconnect_by_func (priv->reload_job, ev_window _reload_job_cb, ev_window);
g_object_unref (priv->reload_job); g_object_unref (priv->reload_job);
skipping to change at line 2398 skipping to change at line 2413
EvWindowPrivate *priv = GET_PRIVATE (ev_window); EvWindowPrivate *priv = GET_PRIVATE (ev_window);
GFile *source_file; GFile *source_file;
priv->in_reload = FALSE; priv->in_reload = FALSE;
g_clear_pointer (&priv->search_string, g_free); g_clear_pointer (&priv->search_string, g_free);
priv->search_string = search_string ? priv->search_string = search_string ?
g_strdup (search_string) : NULL; g_strdup (search_string) : NULL;
if (priv->uri && if (priv->uri &&
g_ascii_strcasecmp (priv->uri, uri) == 0) { g_ascii_strcasecmp (priv->uri, uri) == 0 &&
!priv->password_view_cancelled) {
if (ev_window_check_document_modified (ev_window, EV_WINDOW_ACTIO N_RELOAD)) if (ev_window_check_document_modified (ev_window, EV_WINDOW_ACTIO N_RELOAD))
return; return;
ev_window_reload_document (ev_window, dest); ev_window_reload_document (ev_window, dest);
return; return;
} }
if (priv->monitor) { if (priv->monitor) {
g_object_unref (priv->monitor); g_object_unref (priv->monitor);
priv->monitor = NULL; priv->monitor = NULL;
} }
skipping to change at line 3293 skipping to change at line 3309
GAppInfo *app = NULL; GAppInfo *app = NULL;
GdkAppLaunchContext *context; GdkAppLaunchContext *context;
GdkDisplay *display; GdkDisplay *display;
GdkScreen *screen; GdkScreen *screen;
GFile *file; GFile *file;
GList list; GList list;
GError *error = NULL; GError *error = NULL;
app = g_app_info_get_default_for_type ("inode/directory", FALSE); app = g_app_info_get_default_for_type ("inode/directory", FALSE);
file = g_file_new_for_uri (priv->uri); file = g_file_new_for_uri (priv->uri);
if (!g_file_is_native (file)) {
g_object_unref (file);
file = g_file_new_for_uri (ev_document_get_uri (priv->document));
}
if (app == NULL) { if (app == NULL) {
dzl_file_manager_show (file, &error); dzl_file_manager_show (file, &error);
if (error) { if (error) {
gchar *uri; gchar *uri;
uri = g_file_get_uri (file); uri = g_file_get_uri (file);
g_warning ("Could not show containing folder for \"%s\": %s", g_warning ("Could not show containing folder for \"%s\": %s",
uri, error->message); uri, error->message);
g_error_free (error); g_error_free (error);
g_free (uri); g_free (uri);
skipping to change at line 7640 skipping to change at line 7660
page_cache_mb = g_settings_get_uint (ev_window_ensure_settings (ev_window ), page_cache_mb = g_settings_get_uint (ev_window_ensure_settings (ev_window ),
GS_PAGE_CACHE_SIZE); GS_PAGE_CACHE_SIZE);
ev_view_set_page_cache_size (EV_VIEW (priv->view), ev_view_set_page_cache_size (EV_VIEW (priv->view),
(gsize) page_cache_mb * 1024 * 1024); (gsize) page_cache_mb * 1024 * 1024);
allow_links_change_zoom = g_settings_get_boolean (ev_window_ensure_settin gs (ev_window), allow_links_change_zoom = g_settings_get_boolean (ev_window_ensure_settin gs (ev_window),
GS_ALLOW_LINKS_CHANGE_ZOOM); GS_ALLOW_LINKS_CHANGE_ZOOM);
ev_view_set_allow_links_change_zoom (EV_VIEW (priv->view), ev_view_set_allow_links_change_zoom (EV_VIEW (priv->view),
allow_links_change_zoom); allow_links_change_zoom);
ev_view_set_model (EV_VIEW (priv->view), priv->model); ev_view_set_model (EV_VIEW (priv->view), priv->model);
priv->password_view_cancelled = FALSE;
priv->password_view = ev_password_view_new (GTK_WINDOW (ev_window)); priv->password_view = ev_password_view_new (GTK_WINDOW (ev_window));
g_signal_connect_swapped (priv->password_view, g_signal_connect_swapped (priv->password_view,
"unlock", "unlock",
G_CALLBACK (ev_window_password_view_unlock), G_CALLBACK (ev_window_password_view_unlock),
ev_window); ev_window);
g_signal_connect_swapped (priv->password_view,
"cancelled",
G_CALLBACK (ev_window_password_view_cancelled),
ev_window);
g_signal_connect_object (priv->view, "focus_in_event", g_signal_connect_object (priv->view, "focus_in_event",
G_CALLBACK (view_actions_focus_in_cb), G_CALLBACK (view_actions_focus_in_cb),
ev_window, 0); ev_window, 0);
g_signal_connect_swapped (priv->view, "external-link", g_signal_connect_swapped (priv->view, "external-link",
G_CALLBACK (view_external_link_cb), G_CALLBACK (view_external_link_cb),
ev_window); ev_window);
g_signal_connect_object (priv->view, "handle-link", g_signal_connect_object (priv->view, "handle-link",
G_CALLBACK (view_handle_link_cb), G_CALLBACK (view_handle_link_cb),
ev_window, 0); ev_window, 0);
g_signal_connect_object (priv->view, "popup", g_signal_connect_object (priv->view, "popup",
 End of changes. 7 change blocks. 
1 lines changed or deleted 26 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)