/b-gtk/fix-viz

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz

« back to all changes in this revision

Viewing changes to window.py

  • Committer: Vincent Ladeuil
  • Date: 2009-12-02 11:12:51 UTC
  • Revision ID: v.ladeuil+lp@free.fr-20091202111251-sh0xqyqtuvitonne
Fix regressions in tests about merge being more strict by default.

* tests/test_commit.py:
(TestPendingRevisions.test_pending_revisions_multi_merge)
(TestCommitDialog.test_pending_multiple): Since there are pending
merges, we should force the merge to avoid the UncommittedChanges
exception.

Show diffs side-by-side

added added

removed removed

Lines of Context:
window.py
7
7
    def __init__(self, parent=None):
8
8
        gtk.Window.__init__(self, gtk.WINDOW_TOPLEVEL)
9
9
        self._parent = parent
10
 
        
 
10
 
11
11
        self.connect('key-press-event', self._on_key_press)
12
 
        
 
12
 
13
13
    def _on_key_press(self, widget, event):
14
14
        keyname = gtk.gdk.keyval_name(event.keyval)
15
15
        if event.state & gtk.gdk.CONTROL_MASK: