← Back to branch summary

~ubuntu-branches/ubuntu/precise/vte/precise

« back to all changes in this revision

Viewing changes to src/vte.c

  • Committer: Bazaar Package Importer
  • Author(s): Michael Vogt
  • Date: 2011-06-16 17:59:49 UTC
  • mfrom: (1.1.65 upstream) (3.1.14 sid)
  • Revision ID: james.westby@ubuntu.com-20110616175949-dexr6gu2dxiifi00
Tags: 1:0.28.1-1ubuntu1
* Merge from debian unstable.  Remaining changes:
  - Add 93_add_alt_screen_scroll_toggle.patch: Handle scrolling differently
    when using alternate screen or scrolling is restricted.
  - Add lp246701_scroll_region_updates.patch: Bug fix. (LP #246701)
  - 91_keep_fds.patch:
    vte-2.90 does not yet support G_SPAWN_LEAVE_DESCRIPTORS_OPEN
    when calling vte_terminal_fork_command_full() until that is
    fixed we need to keep this patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/vte.c
11378
11378
 
11379
11379
        vte_terminal_read_modifiers (terminal, (GdkEvent*) event);
11380
11380
 
 
11381
#if GTK_CHECK_VERSION (2, 90, 8)
 
11382
        /* Do not intercept Alt+scroll, let the GtkNotebook handle it to switch tabs.
 
11383
           Requires a fixed GTK+, see https://bugzilla.gnome.org/show_bug.cgi?id=145244 */
 
11384
        if (event->state & GDK_MOD1_MASK)
 
11385
                return FALSE;
 
11386
#endif
 
11387
 
11381
11388
        _VTE_DEBUG_IF(VTE_DEBUG_EVENTS)
11382
11389
                switch (event->direction) {
11383
11390
                case GDK_SCROLL_UP: