~ubuntu-branches/ubuntu/precise/evince/precise-updates

« back to all changes in this revision

Viewing changes to debian/patches/11_grip_gestures.patch

  • Committer: Bazaar Package Importer
  • Author(s): Chase Douglas
  • Date: 2011-10-17 11:57:56 UTC
  • Revision ID: james.westby@ubuntu.com-20111017115756-pes7pb02kyx2t7fd
Tags: 3.2.1-0ubuntu2
Fix --disable-gestures/-g option (LP: #873866)

Show diffs side-by-side

added added

removed removed

Lines of Context:
250
250
        default:
251
251
                G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
252
252
                break;
253
 
@@ -4691,6 +4833,36 @@
 
253
@@ -4691,6 +4833,41 @@
254
254
                view->vscroll_policy = g_value_get_enum (value);
255
255
                gtk_widget_queue_resize (GTK_WIDGET (view));
256
256
                break;
258
258
+       case PROP_ENABLE_GESTURES:
259
259
+               view->enable_gestures = g_value_get_boolean (value);
260
260
+
261
 
+               grip_gesture_manager_register_window (grip_gesture_manager_get(),
262
 
+                                                     GTK_WIDGET (view),
263
 
+                                                     GRIP_GESTURE_PINCH,
264
 
+                                                     GRIP_DEVICE_ALL,
265
 
+                                                     2,
266
 
+                                                     _utouch_ev_gesture_callback,
267
 
+                                                     NULL, NULL);
268
 
+
269
 
+               grip_gesture_manager_register_window (grip_gesture_manager_get(),
270
 
+                                                     GTK_WIDGET (view),
271
 
+                                                     GRIP_GESTURE_DRAG,
272
 
+                                                     GRIP_DEVICE_TOUCHSCREEN,
273
 
+                                                     2,
274
 
+                                                     _utouch_ev_gesture_callback,
275
 
+                                                     NULL, NULL);
276
 
+
277
 
+               grip_gesture_manager_register_window (grip_gesture_manager_get(),
278
 
+                                                     GTK_WIDGET (view),
279
 
+                                                     GRIP_GESTURE_ROTATE,
280
 
+                                                     GRIP_DEVICE_ALL,
281
 
+                                                     2,
282
 
+                                                     _utouch_ev_gesture_callback,
283
 
+                                                     NULL, NULL);
 
261
+               if (view->enable_gestures) {
 
262
+                       grip_gesture_manager_register_window (
 
263
+                               grip_gesture_manager_get(),
 
264
+                               GTK_WIDGET (view),
 
265
+                               GRIP_GESTURE_PINCH,
 
266
+                               GRIP_DEVICE_ALL,
 
267
+                               2,
 
268
+                               _utouch_ev_gesture_callback,
 
269
+                               NULL, NULL);
 
270
+
 
271
+                       grip_gesture_manager_register_window (
 
272
+                               grip_gesture_manager_get(),
 
273
+                               GTK_WIDGET (view),
 
274
+                               GRIP_GESTURE_DRAG,
 
275
+                               GRIP_DEVICE_TOUCHSCREEN,
 
276
+                               2,
 
277
+                               _utouch_ev_gesture_callback,
 
278
+                               NULL, NULL);
 
279
+
 
280
+                       grip_gesture_manager_register_window (
 
281
+                               grip_gesture_manager_get(),
 
282
+                               GTK_WIDGET (view),
 
283
+                               GRIP_GESTURE_ROTATE,
 
284
+                               GRIP_DEVICE_ALL,
 
285
+                               2,
 
286
+                               _utouch_ev_gesture_callback,
 
287
+                               NULL, NULL);
 
288
+               }
284
289
+
285
290
+               break;
286
291
+#endif
287
292
        default:
288
293
                G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
289
294
                break;
290
 
@@ -4899,6 +5071,17 @@
 
295
@@ -4899,6 +5076,16 @@
291
296
                         G_TYPE_NONE, 0,
292
297
                         G_TYPE_NONE);
293
298
 
298
303
+                                                              "Enable gestures",
299
304
+                                                              "Whether to enable gestures",
300
305
+                                                              TRUE,
301
 
+                                                              G_PARAM_WRITABLE |
302
 
+                                                              G_PARAM_CONSTRUCT_ONLY));
 
306
+                                                              G_PARAM_WRITABLE));
303
307
+#endif
304
308
+
305
309
        binding_set = gtk_binding_set_by_class (class);