Merge lp:~rafalcieslak256/ubuntu-accomplishments-system/daemon-fails into lp:~jonobacon/ubuntu-accomplishments-system/trophyinfo

Proposed by Rafał Cieślak
Status: Merged
Merged at revision: 103
Proposed branch: lp:~rafalcieslak256/ubuntu-accomplishments-system/daemon-fails
Merge into: lp:~jonobacon/ubuntu-accomplishments-system/trophyinfo
Diff against target: 17 lines (+6/-1)
1 file modified
accomplishments/gui/TrophyinfoWindow.py (+6/-1)
To merge this branch: bzr merge lp:~rafalcieslak256/ubuntu-accomplishments-system/daemon-fails
Reviewer Review Type Date Requested Status
Jono Bacon Pending
Review via email: mp+101081@code.launchpad.net

Description of the change

Fixes #974994, as described in the bug report.

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 'accomplishments/gui/TrophyinfoWindow.py'
2--- accomplishments/gui/TrophyinfoWindow.py 2012-04-06 03:54:35 +0000
3+++ accomplishments/gui/TrophyinfoWindow.py 2012-04-06 10:06:18 +0000
4@@ -257,7 +257,12 @@
5 self.statusbox.hide()
6
7 if self.connected is False:
8- self.ask_to_start_daemon()
9+ #Either failed to start the daemon, or failed to connect to
10+ #It may either be not installed, or may have crashed on startup
11+ self.statusbar.set_text("Failed to connect to the daemon.")
12+ self.spinner.hide()
13+ self.statusbox.show()
14+ GObject.timeout_add(10000,self.run_daemon)
15 else:
16 #successfully started and connected
17 self.populate_opp_combos()

Subscribers

People subscribed via source and target branches