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

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
=== modified file 'gtk/jockey-gtk.ui'
--- gtk/jockey-gtk.ui 2009-06-29 12:57:27 +0000
+++ gtk/jockey-gtk.ui 2009-09-05 09:37:12 +0000
@@ -388,7 +388,7 @@
388 <child>388 <child>
389 <object class="GtkProgressBar" id="progress">389 <object class="GtkProgressBar" id="progress">
390 <property name="visible">True</property>390 <property name="visible">True</property>
391 <property name="show_text">True</property>391 <property name="show_text">False</property>
392 <property name="pulse_step">0</property>392 <property name="pulse_step">0</property>
393 </object>393 </object>
394 <packing>394 <packing>
395395
=== modified file 'jockey/ui.py'
--- jockey/ui.py 2009-07-14 10:13:51 +0000
+++ jockey/ui.py 2009-09-17 16:50:07 +0000
@@ -612,7 +612,7 @@
612 self._('Trying to recover by restarting backend.')))612 self._('Trying to recover by restarting backend.')))
613 return False613 return False
614 except SystemError, e:614 except SystemError, e:
615 self.error_message('', str(e).splitlines()[-1])615 self.error_message('', str(e).strip().splitlines()[-1])
616 return False616 return False
617617
618 newstate = bool(self.backend().handler_info(handler_id)['enabled'])618 newstate = bool(self.backend().handler_info(handler_id)['enabled'])

Subscribers

People subscribed via source and target branches

to all changes:
to status/vote changes: