Ubuntu One Control Panel

Merge lp:~ralsina/ubuntuone-control-panel/control-c-means-quit into lp:ubuntuone-control-panel

  1. control-c-means-quit
  2. Merge into trunk
Proposed by Roberto Alsina on 2012-03-01
Status: Merged
Approved by: dobey on 2012-03-01
Approved revision: 271
Merged at revision: 270
Proposed branch: lp:~ralsina/ubuntuone-control-panel/control-c-means-quit
Merge into: lp:ubuntuone-control-panel
Diff against target: 17 lines (+2/-0)
1 file modified
bin/ubuntuone-control-panel-qt (+2/-0)
To merge this branch: bzr merge lp:~ralsina/ubuntuone-control-panel/control-c-means-quit
Reviewer Review Type Date Requested Status
Diego Sarmentero (community) Approve on 2012-03-01
dobey (community) 2012-03-01 Approve on 2012-03-01
Review via email: mp+95424@code.launchpad.net

Commit Message

- Reset the signal handler so that ctrl+c works (LP: #944012).

Description of the Change

Reset the signal handler so that ctrl+c works.

To test IRL:

* start ubuntu-one-control-panel-qt from this branch
* Press Ctrl+C
* See? No more control panel.

To post a comment you must log in.
dobey (dobey) :
review: Approve
Diego Sarmentero (diegosarmentero) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/ubuntuone-control-panel-qt'
2--- bin/ubuntuone-control-panel-qt 2012-02-28 16:44:42 +0000
3+++ bin/ubuntuone-control-panel-qt 2012-03-01 17:51:22 +0000
4@@ -19,6 +19,7 @@
5
6 # Invalid name "ubuntuone-control-panel-qt", pylint: disable=C0103
7
8+import signal
9 import sys
10
11 if sys.platform == 'win32':
12@@ -29,4 +30,5 @@
13
14
15 if __name__ == "__main__":
16+ signal.signal(signal.SIGINT, signal.SIG_DFL)
17 main.main(sys.argv)

Subscribers

People subscribed via source and target branches