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

[dobey]

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

[Rick McBride (rmcbride)]

Looks good!

review: Approve

[John Lenton (chipaca)]

OK.

review: Approve

=== modified file 'bin/ubuntuone-client-applet'
--- bin/ubuntuone-client-applet	2009-09-08 13:28:01 +0000
+++ bin/ubuntuone-client-applet	2009-09-10 19:17:04 +0000
@@ -534,6 +534,8 @@
 
             state = status['name']
 
+            self.set_tooltip("Ubuntu One")
+
             if self.__fatal_error and state != "UNKNOWN_ERROR":
                   # Just blow your nose, and it's fixed, isn't it.
                   self.__fatal_error = False
@@ -543,6 +545,7 @@
             if state == "OFFLINE" or state.startswith("INIT") or \
                       state.startswith("READY"):
                   self.set_from_icon_name("ubuntuone-client-offline")
+                  self.set_tooltip(_("Disconnected")
                   self.__connected = False
                   self.__visible = True