Ubuntu One Client

Merge lp:~dobey/ubuntuone-client/always-connecting into lp:ubuntuone-client

  1. always-connecting
  2. Merge into trunk
Proposed by dobey
Status: Merged
Approved by: John Lenton
Approved revision: 206
Merged at revision: not available
Proposed branch: lp:~dobey/ubuntuone-client/always-connecting
Merge into: lp:ubuntuone-client
Diff against target: None lines
To merge this branch: bzr merge lp:~dobey/ubuntuone-client/always-connecting
Reviewer Review Type Date Requested Status
John Lenton (community) Approve
Rick McBride (community) Approve
Review via email: mp+11552@code.launchpad.net

Commit message

Show Disconnected status when disconnected, and Ubuntu One by default otherwise

To post a comment you must log in.
Revision history for this message
Rick McBride (rmcbride) wrote :

Looks good!

review: Approve
Revision history for this message
John Lenton (chipaca) wrote :

OK.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/ubuntuone-client-applet'
2--- bin/ubuntuone-client-applet 2009-09-08 13:28:01 +0000
3+++ bin/ubuntuone-client-applet 2009-09-10 19:17:04 +0000
4@@ -534,6 +534,8 @@
5
6 state = status['name']
7
8+ self.set_tooltip("Ubuntu One")
9+
10 if self.__fatal_error and state != "UNKNOWN_ERROR":
11 # Just blow your nose, and it's fixed, isn't it.
12 self.__fatal_error = False
13@@ -543,6 +545,7 @@
14 if state == "OFFLINE" or state.startswith("INIT") or \
15 state.startswith("READY"):
16 self.set_from_icon_name("ubuntuone-client-offline")
17+ self.set_tooltip(_("Disconnected")
18 self.__connected = False
19 self.__visible = True
20

Subscribers

People subscribed via source and target branches