Jockey

Merge lp://staging/~and471/jockey/fix-386375 into lp://staging/jockey

  1. fix-386375
  2. Merge into trunk
Proposed by Andrew
Status: Merged
Merged at revision: not available
Proposed branch: lp://staging/~and471/jockey/fix-386375
Merge into: lp://staging/jockey
Diff against target: None lines
To merge this branch: bzr merge lp://staging/~and471/jockey/fix-386375
Reviewer Review Type Date Requested Status
Registry Administrators Pending
Review via email: mp+11990@code.staging.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'gtk/jockey-gtk.ui'
2--- gtk/jockey-gtk.ui 2009-06-29 12:57:27 +0000
3+++ gtk/jockey-gtk.ui 2009-09-05 09:37:12 +0000
4@@ -388,7 +388,7 @@
5 <child>
6 <object class="GtkProgressBar" id="progress">
7 <property name="visible">True</property>
8- <property name="show_text">True</property>
9+ <property name="show_text">False</property>
10 <property name="pulse_step">0</property>
11 </object>
12 <packing>
13
14=== modified file 'jockey/ui.py'
15--- jockey/ui.py 2009-07-14 10:13:51 +0000
16+++ jockey/ui.py 2009-09-17 16:50:07 +0000
17@@ -612,7 +612,7 @@
18 self._('Trying to recover by restarting backend.')))
19 return False
20 except SystemError, e:
21- self.error_message('', str(e).splitlines()[-1])
22+ self.error_message('', str(e).strip().splitlines()[-1])
23 return False
24
25 newstate = bool(self.backend().handler_info(handler_id)['enabled'])

Subscribers

People subscribed via source and target branches

to all changes:
to status/vote changes: