diff options
Diffstat (limited to 'shell/ev-window.c')
| -rw-r--r-- | shell/ev-window.c | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/shell/ev-window.c b/shell/ev-window.c index e6bee902..112cbadb 100644 --- a/shell/ev-window.c +++ b/shell/ev-window.c @@ -390,20 +390,13 @@ static gdouble get_screen_dpi (EvWindow *window) { GdkScreen *screen; -#if GTK_CHECK_VERSION (3, 22, 0) GdkMonitor *monitor; GdkDisplay *display; -#else - gint monitor; -#endif screen = gtk_window_get_screen (GTK_WINDOW (window)); -#if GTK_CHECK_VERSION (3, 22, 0) display = gdk_screen_get_display (screen); monitor = gdk_display_get_primary_monitor (display); -#else - monitor = gdk_screen_get_primary_monitor (screen); -#endif + return ev_document_misc_get_screen_dpi (screen, monitor); } @@ -4924,17 +4917,11 @@ ev_window_cmd_help_contents (GtkAction *action, EvWindow *ev_window) { GError *error = NULL; -#if GTK_CHECK_VERSION (3, 22, 0) gtk_show_uri_on_window (GTK_WINDOW (ev_window), EV_HELP, gtk_get_current_event_time (), &error); -#else - gtk_show_uri (gtk_window_get_screen (GTK_WINDOW (ev_window)), - EV_HELP, - gtk_get_current_event_time (), - &error); -#endif + if (error) { ev_window_error_message (ev_window, error, "%s", _("There was an error displaying help")); |