Indicator Display Objects

Merge lp:~charlesk/ido/lp-964005 into lp:ido/12.10

  1. lp-964005
  2. Merge into trunk.12.10
Proposed by Charles Kerr
Status: Merged
Approved by: Lars Karlitski
Approved revision: 115
Merged at revision: 115
Proposed branch: lp:~charlesk/ido/lp-964005
Merge into: lp:ido/12.10
Diff against target: 13 lines (+2/-1)
1 file modified
src/idocalendarmenuitem.c (+2/-1)
To merge this branch: bzr merge lp:~charlesk/ido/lp-964005
Reviewer Review Type Date Requested Status
Lars Karlitski (community) Approve
jenkins (community) continuous-integration Approve
Review via email: mp+125409@code.launchpad.net

Commit message

the calendar widget shouldn't eat the ESC key.

Description of the change

A simple one-liner to not eat the ESC key.

To post a comment you must log in.
Revision history for this message
jenkins (martin-mrazik+qa) wrote :

PASSED: Continuous integration, rev:115
http://jenkins.qa.ubuntu.com/job/ido-ci/13/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ido-ci/./label=quantal/13/console

review: Approve (continuous-integration)
Revision history for this message
Lars Karlitski (larsu) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/idocalendarmenuitem.c'
2--- src/idocalendarmenuitem.c 2012-08-22 14:43:24 +0000
3+++ src/idocalendarmenuitem.c 2012-09-20 04:36:21 +0000
4@@ -172,7 +172,8 @@
5 gtk_widget_grab_focus (calendar);
6 }
7
8- return event->keyval != GDK_KEY_Return;
9+ return (event->keyval != GDK_KEY_Return) &&
10+ (event->keyval != GDK_KEY_Escape);
11 }
12
13 return FALSE;

Subscribers

People subscribed via source and target branches