← Back to branch summary

~ubuntu-branches/ubuntu/trusty/gnome-control-center/trusty-updates

« back to all changes in this revision

Viewing changes to panels/region/gnome-region-panel-input.c

  • Committer: Package Import Robot
  • Author(s): Iain Lane, Iain Lane, William Hua
  • Date: 2013-10-18 12:47:01 UTC
  • Revision ID: package-import@ubuntu.com-20131018124701-ng8l9so2up2udcuu
Tags: 1:3.6.3-0ubuntu45
https://launchpad.net/bugs/1195481
https://launchpad.net/bugs/1218322
[ Iain Lane ]
* debian/patches/97_unity_power_ui.patch: Don't crash if indicator-power
  isn't installed. When deciding whether to display/not display the
  indicator-power options, use the presence of indicator-power instead of
  just checking if Unity is the DE in use. (LP: #1195481) 
* debian/control.in: Build-Depend on glib >= 2.31.2 for
  g_settings_schema_source_ref.
  
[ William Hua ]
* debian/patches/input-sources-text-entry.patch:
  - support modifier-only input-source switching (lp: #1218322)

Show diffs side-by-side

added added

removed removed

Lines of Context:
panels/region/gnome-region-panel-input.c
1392
1392
      return GTK_ENTRY_ACCEL_UPDATE;
1393
1393
    }
1394
1394
 
1395
 
  if (!gtk_accelerator_valid (*key, *mask))
 
1395
  if ((*mask & ~GDK_LOCK_MASK) == 0 &&
 
1396
      (*key == GDK_KEY_Tab ||
 
1397
       *key == GDK_KEY_KP_Tab ||
 
1398
       *key == GDK_KEY_ISO_Left_Tab ||
 
1399
       *key == GDK_KEY_3270_BackTab))
1396
1400
    return GTK_ENTRY_ACCEL_IGNORE;
1397
1401
 
1398
1402
  edited = keyboard_shortcuts_accel_edited (item,