evince r3584 - in trunk: . cut-n-paste cut-n-paste/evmountoperation po shell

[carlosgc svn gnome org]

Author: carlosgc
Date: Wed Apr  8 15:42:49 2009
New Revision: 3584
URL: http://svn.gnome.org/viewvc/evince?rev=3584&view=rev

Log:
2009-04-08  Carlos Garcia Campos  <carlosgc gnome org>

	* configure.ac:
	* cut-n-paste/Makefile.am:
	* cut-n-paste/evmountoperation/*: Removed
	* po/POTFILES.in:
	* shell/Makefile.am:
	* shell/ev-print-operation.c:
	* shell/ev-window.c: (window_open_file_copy_ready_cb),
	(ev_window_cmd_help_contents), (launch_action),
	(launch_external_uri):

	Bump GTK+ requirement to 2.14.

Removed:
   trunk/cut-n-paste/evmountoperation/Makefile.am
   trunk/cut-n-paste/evmountoperation/ev-mount-operation.c
   trunk/cut-n-paste/evmountoperation/ev-mount-operation.h
Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/cut-n-paste/Makefile.am
   trunk/po/POTFILES.in
   trunk/shell/Makefile.am
   trunk/shell/ev-print-operation.c
   trunk/shell/ev-window.c

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Wed Apr  8 15:42:49 2009
@@ -108,7 +108,7 @@
 # SHELL_LIBS
 
 DBUS_GLIB_REQUIRED=0.70
-GTK_REQUIRED=2.12.0
+GTK_REQUIRED=2.14.0
 GLIB_REQUIRED=2.18.0
 KEYRING_REQUIRED=2.22.0
 AC_SUBST([GLIB_REQUIRED])
@@ -590,7 +590,6 @@
 backend/ps/Makefile
 backend/tiff/Makefile
 cut-n-paste/Makefile
-cut-n-paste/evmountoperation/Makefile
 cut-n-paste/gedit-message-area/Makefile
 cut-n-paste/gimpcellrenderertoggle/Makefile
 cut-n-paste/smclient/Makefile

Modified: trunk/cut-n-paste/Makefile.am
==============================================================================
--- trunk/cut-n-paste/Makefile.am	(original)
+++ trunk/cut-n-paste/Makefile.am	Wed Apr  8 15:42:49 2009
@@ -1 +1 @@
-SUBDIRS = zoom-control toolbar-editor totem-screensaver gedit-message-area evmountoperation smclient gimpcellrenderertoggle
+SUBDIRS = zoom-control toolbar-editor totem-screensaver gedit-message-area smclient gimpcellrenderertoggle

Modified: trunk/po/POTFILES.in
==============================================================================
--- trunk/po/POTFILES.in	(original)
+++ trunk/po/POTFILES.in	Wed Apr  8 15:42:49 2009
@@ -17,7 +17,6 @@
 backend/tiff/tiff-document.c
 libdocument/ev-attachment.c
 libdocument/ev-document-factory.c
-cut-n-paste/evmountoperation/ev-mount-operation.c
 cut-n-paste/smclient/eggdesktopfile.c
 cut-n-paste/smclient/eggsmclient.c
 cut-n-paste/toolbar-editor/egg-editable-toolbar.c

Modified: trunk/shell/Makefile.am
==============================================================================
--- trunk/shell/Makefile.am	(original)
+++ trunk/shell/Makefile.am	Wed Apr  8 15:42:49 2009
@@ -8,7 +8,6 @@
 	-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 @@
 	$(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					\

Modified: trunk/shell/ev-print-operation.c
==============================================================================
--- trunk/shell/ev-print-operation.c	(original)
+++ trunk/shell/ev-print-operation.c	Wed Apr  8 15:42:49 2009
@@ -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>

Modified: trunk/shell/ev-window.c
==============================================================================
--- trunk/shell/ev-window.c	(original)
+++ trunk/shell/ev-window.c	Wed Apr  8 15:42:49 2009
@@ -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 @@
 	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_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 @@
 		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 @@
 	GAppInfo *app_info;
 	GFile *file;
 	GList file_list = {NULL};
-	GAppLaunchContext *context = NULL;
+	GAppLaunchContext *context;
 	GError *error = NULL;
 
 	if (filename == NULL)
@@ -5281,12 +5226,10 @@
 		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 @@
 	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:";)) {