diff options
Diffstat (limited to 'shell')
-rw-r--r-- | shell/Makefile.am | 2 | ||||
-rw-r--r-- | shell/ev-print-operation.c | 5 | ||||
-rw-r--r-- | shell/ev-window.c | 69 |
3 files changed, 4 insertions, 72 deletions
diff --git a/shell/Makefile.am b/shell/Makefile.am index 65d3ffa..737fccf 100644 --- a/shell/Makefile.am +++ b/shell/Makefile.am @@ -8,7 +8,6 @@ INCLUDES= \ -I$(top_srcdir)/cut-n-paste/totem-screensaver/ \ -I$(top_srcdir)/cut-n-paste/gedit-message-area/ \ -I$(top_srcdir)/cut-n-paste/gimpcellrenderertoggle/ \ - -I$(top_srcdir)/cut-n-paste/evmountoperation/ \ -I$(top_srcdir)/cut-n-paste/smclient/ \ -I$(top_srcdir)/libdocument \ -I$(top_builddir)/libdocument \ @@ -92,7 +91,6 @@ evince_LDADD= \ $(top_builddir)/cut-n-paste/totem-screensaver/libtotemscrsaver.la \ $(top_builddir)/cut-n-paste/gedit-message-area/libgeditmsgarea.la \ $(top_builddir)/cut-n-paste/gimpcellrenderertoggle/libgimpcellrenderertoggle.la \ - $(top_builddir)/cut-n-paste/evmountoperation/libevmountoperation.la \ $(top_builddir)/cut-n-paste/smclient/libsmclient.la \ $(top_builddir)/properties/libevproperties.la \ $(top_builddir)/libdocument/libevdocument.la \ diff --git a/shell/ev-print-operation.c b/shell/ev-print-operation.c index 74962bf..3b9aa3a 100644 --- a/shell/ev-print-operation.c +++ b/shell/ev-print-operation.c @@ -21,12 +21,7 @@ #include "ev-print-operation.h" -#if GTK_CHECK_VERSION (2, 14, 0) #include <gtk/gtkunixprint.h> -#else -#include <gtk/gtkprintunixdialog.h> -#endif - #include <glib/gi18n.h> #include <glib/gstdio.h> #include <unistd.h> diff --git a/shell/ev-window.c b/shell/ev-window.c index 909272b..0ce2bef 100644 --- a/shell/ev-window.c +++ b/shell/ev-window.c @@ -38,11 +38,8 @@ #include <glib/gi18n.h> #include <gio/gio.h> #include <gtk/gtk.h> -#if GTK_CHECK_VERSION (2, 14, 0) #include <gtk/gtkunixprint.h> -#else -#include <gtk/gtkprintunixdialog.h> -#endif + #ifdef WITH_GCONF #include <gconf/gconf-client.h> #endif @@ -73,7 +70,6 @@ #include "ev-jobs.h" #include "ev-message-area.h" #include "ev-metadata-manager.h" -#include "ev-mount-operation.h" #include "ev-navigation-action.h" #include "ev-open-recent-action.h" #include "ev-page-action.h" @@ -1692,7 +1688,7 @@ window_open_file_copy_ready_cb (GFile *source, if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_NOT_MOUNTED)) { GMountOperation *operation; - operation = ev_mount_operation_new (GTK_WINDOW (ev_window)); + operation = gtk_mount_operation_new (GTK_WINDOW (ev_window)); g_file_mount_enclosing_volume (source, G_MOUNT_MOUNT_NONE, operation, NULL, @@ -3793,7 +3789,6 @@ ev_window_cmd_view_autoscroll (GtkAction *action, EvWindow *ev_window) ev_view_autoscroll_start (EV_VIEW (ev_window->priv->view)); } -#if GTK_CHECK_VERSION (2, 14, 0) static void ev_window_cmd_help_contents (GtkAction *action, EvWindow *ev_window) { @@ -3809,56 +3804,6 @@ ev_window_cmd_help_contents (GtkAction *action, EvWindow *ev_window) g_error_free (error); } } -#else /* !GTK_CHECK_VERSION (2, 14, 0) */ -static void -ev_window_cmd_help_contents (GtkAction *action, EvWindow *ev_window) -{ - GError *error = NULL; - GdkScreen *screen; - char *command; - const char *lang; - char *uri = NULL; - - int i; - - const char * const * langs = g_get_language_names (); - - for (i = 0; langs[i]; i++) { - lang = langs[i]; - if (strchr (lang, '.')) { - continue; - } - - uri = g_build_filename(GNOMEDATADIR, - "/gnome/help/" PACKAGE, - lang, - "/evince.xml", - NULL); - - if (g_file_test (uri, G_FILE_TEST_EXISTS)) { - break; - } - g_free (uri); - uri = NULL; - } - - if (uri == NULL) { - g_warning ("Cannot find help"); - return; - } - - command = g_strconcat ("gnome-help ghelp://", uri, NULL); - g_free (uri); - - screen = gtk_widget_get_screen (GTK_WIDGET (ev_window)); - gdk_spawn_command_line_on_screen (screen, command, &error); - if (error != NULL) { - g_warning ("%s", error->message); - g_error_free (error); - } - g_free (command); -} -#endif /* GTK_CHECK_VERSION (2, 14, 0) */ static void ev_window_cmd_leave_fullscreen (GtkAction *action, EvWindow *window) @@ -5250,7 +5195,7 @@ launch_action (EvWindow *window, EvLinkAction *action) GAppInfo *app_info; GFile *file; GList file_list = {NULL}; - GAppLaunchContext *context = NULL; + GAppLaunchContext *context; GError *error = NULL; if (filename == NULL) @@ -5281,12 +5226,10 @@ launch_action (EvWindow *window, EvLinkAction *action) return; } -#if GTK_CHECK_VERSION (2, 14, 0) context = G_APP_LAUNCH_CONTEXT (gdk_app_launch_context_new ()); gdk_app_launch_context_set_screen (GDK_APP_LAUNCH_CONTEXT (context), gtk_window_get_screen (GTK_WINDOW (window))); gdk_app_launch_context_set_timestamp (GDK_APP_LAUNCH_CONTEXT (context), GDK_CURRENT_TIME); -#endif file_list.data = file; if (!g_app_info_launch (app_info, &file_list, context, &error)) { @@ -5309,17 +5252,13 @@ launch_external_uri (EvWindow *window, EvLinkAction *action) const gchar *uri = ev_link_action_get_uri (action); GError *error = NULL; gboolean ret; -#if GTK_CHECK_VERSION (2, 14, 0) - GAppLaunchContext *context = NULL; -#endif + GAppLaunchContext *context; -#if GTK_CHECK_VERSION (2, 14, 0) context = G_APP_LAUNCH_CONTEXT (gdk_app_launch_context_new ()); gdk_app_launch_context_set_screen (GDK_APP_LAUNCH_CONTEXT (context), gtk_window_get_screen (GTK_WINDOW (window))); gdk_app_launch_context_set_timestamp (GDK_APP_LAUNCH_CONTEXT (context), GDK_CURRENT_TIME); -#endif if (!g_strstr_len (uri, strlen (uri), "://") && !g_str_has_prefix (uri, "mailto:")) { |