Merge lp:~bratsche/oif/disable-gestures into lp:~oif-team/oif/evince-gestures-trunk

[Cody Russell]

[Mohamed IKBEL Boulabiar (boulabiar)]

Tested and works fine.

review: Approve

=== modified file 'shell/ev-application.c'
--- shell/ev-application.c	2010-07-26 13:34:18 +0000
+++ shell/ev-application.c	2010-11-18 14:51:58 +0000
@@ -72,6 +72,8 @@
 
 	gchar *filechooser_open_uri;
 	gchar *filechooser_save_uri;
+
+        gboolean gestures_enabled;
 };
 
 struct _EvApplicationClass {
@@ -126,6 +128,18 @@
 	return instance;
 }
 
+gboolean
+ev_application_get_gestures_enabled (EvApplication  *application)
+{
+  return application->gestures_enabled;
+}
+
+void
+ev_application_set_gestures_enabled (EvApplication  *application, gboolean enabled)
+{
+  application->gestures_enabled = enabled;
+}
+
 /* Session */
 gboolean
 ev_application_load_session (EvApplication *application)

=== modified file 'shell/ev-application.h'
--- shell/ev-application.h	2010-07-12 18:13:15 +0000
+++ shell/ev-application.h	2010-11-18 14:51:58 +0000
@@ -81,6 +81,8 @@
 const gchar      *ev_application_get_dot_dir         (EvApplication   *application,
                                                       gboolean         create);
 const gchar      *ev_application_get_data_dir        (EvApplication   *application);
+gboolean          ev_application_get_gestures_enabled (EvApplication  *application);
+void              ev_application_set_gestures_enabled (EvApplication  *application, gboolean enabled);
 
 G_END_DECLS
 

=== modified file 'shell/ev-window.c'
--- shell/ev-window.c	2010-10-12 18:00:39 +0000
+++ shell/ev-window.c	2010-11-18 14:51:58 +0000
@@ -5537,31 +5537,34 @@
 	IdoGestureManager *manager;
 
 	window = GTK_WINDOW (widget);
-	manager = ido_gesture_manager_get ();
-
-	ido_gesture_manager_register_window (manager,
-					     window,
-					     IDO_GESTURE_PINCH,
-					     2,
-					     ev_pinch_gesture_start,
-					     ev_pinch_gesture_update,
-					     ev_pinch_gesture_end);
-
-	ido_gesture_manager_register_window (manager,
-					     window,
-					     IDO_GESTURE_DRAG,
-					     2,
-					     ev_drag_gesture_start,
-					     ev_drag_gesture_update,
-					     ev_drag_gesture_end);
-
-	ido_gesture_manager_register_window (manager,
-					     window,
-					     IDO_GESTURE_ROTATE,
-					     2,
-					     ev_rotate_gesture_start,
-					     ev_rotate_gesture_update,
-					     ev_rotate_gesture_end);
+
+	if (ev_application_get_gestures_enabled (EV_APP)) {
+		manager = ido_gesture_manager_get ();
+
+		ido_gesture_manager_register_window (manager,
+						     window,
+						     IDO_GESTURE_PINCH,
+						     2,
+						     ev_pinch_gesture_start,
+						     ev_pinch_gesture_update,
+						     ev_pinch_gesture_end);
+
+		ido_gesture_manager_register_window (manager,
+						     window,
+						     IDO_GESTURE_DRAG,
+						     2,
+						     ev_drag_gesture_start,
+						     ev_drag_gesture_update,
+						     ev_drag_gesture_end);
+
+		ido_gesture_manager_register_window (manager,
+						     window,
+						     IDO_GESTURE_ROTATE,
+						     2,
+						     ev_rotate_gesture_start,
+						     ev_rotate_gesture_update,
+						     ev_rotate_gesture_end);
+	}
 }
 
 static void

=== modified file 'shell/main.c'
--- shell/main.c	2010-07-26 13:34:18 +0000
+++ shell/main.c	2010-11-18 14:51:58 +0000
@@ -58,7 +58,7 @@
 static gboolean unlink_temp_file = FALSE;
 static gchar   *print_settings;
 static const char **file_arguments = NULL;
-
+static gboolean disable_gestures = FALSE;
 
 static gboolean
 option_version_cb (const gchar *option_name,
@@ -82,6 +82,7 @@
 	{ "find", 'l', 0, G_OPTION_ARG_STRING, &ev_find_string, N_("The word or phrase to find in the document"), N_("STRING")},
 	{ "unlink-tempfile", 'u', G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_NONE, &unlink_temp_file, NULL, NULL },
 	{ "print-settings", 't', G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_FILENAME, &print_settings, NULL, NULL },
+	{ "disable-gestures", 'g', G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_NONE, &disable_gestures, NULL, NULL },
 	{ "version", 0, G_OPTION_FLAG_NO_ARG | G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_CALLBACK, option_version_cb, NULL, NULL },
 	{ G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_FILENAME_ARRAY, &file_arguments, NULL, N_("[FILE…]") },
 	{ NULL }
@@ -312,6 +313,7 @@
 #endif /* WITH_SMCLIENT && GDK_WINDOWING_X11 */
 
 	ev_application_load_session (EV_APP);
+	ev_application_set_gestures_enabled (EV_APP, !disable_gestures);
 	load_files (file_arguments);
 
 	/* Change directory so we don't prevent unmounting in case the initial cwd