Bug 558064 – build with single includes

[evince.git] / shell / ev-window.c

diff --git a/shell/ev-window.c b/shell/ev-window.c
index 44a68c66f4d68b7067905b81d97684a470362658..0205bc45b5e43faae3612d31f251d5e976e27559 100644 (file)
--- a/shell/ev-window.c
+++ b/shell/ev-window.c
@@ -37,7 +37,7 @@
 #include <glib/gi18n.h>
 #include <gio/gio.h>
 #include <gtk/gtk.h>
-#include <gtk/gtkprintunixdialog.h>
+#include <gtk/gtkunixprint.h>
 #include <gconf/gconf-client.h>
 
 #include "egg-editable-toolbar.h"
@@ -3053,8 +3053,6 @@ ev_window_cmd_view_presentation (GtkAction *action, EvWindow *window)
        presentation = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action));
        if (presentation) {
                ev_window_run_presentation (window);
-       } else {
-               ev_window_stop_presentation (window, TRUE);
        }
 }
 
@@ -4902,7 +4900,8 @@ launch_external_uri (EvWindow *window, EvLinkAction *action)
                                              GDK_CURRENT_TIME);
 #endif
 
-       if (!g_strstr_len (uri, strlen (uri), "://")) {
+       if (!g_strstr_len (uri, strlen (uri), "://") &&
+           !g_str_has_prefix (uri, "mailto:")) {
                gchar *http;
                
                /* Not a valid uri, assuming it's http */