Merge lp:~dobey/ubuntuone-client/idle-icon-fixups into lp:ubuntuone-client

[dobey]

Use -idle icon where appropriate
Override set_icon_from_name so we can fallback from -idle properly

[Elliot Murphy (statik)]

review: Approve

=== modified file 'bin/ubuntuone-client-applet'
--- bin/ubuntuone-client-applet	2009-10-12 20:13:56 +0000
+++ bin/ubuntuone-client-applet	2009-10-13 17:30:23 +0000
@@ -433,6 +433,7 @@
 
             self.__managed_dir = None
 
+            self.__size = 24
             self.__theme = gtk.icon_theme_get_default()
             iconpath = os.path.abspath(os.path.join(
                         os.path.split(os.path.dirname(__file__))[0],
@@ -449,7 +450,6 @@
             self.connect("popup-menu", self.__popup_menu)
             self.connect("activate", self.__do_action)
 
-            self.__size = 24
             self.__size_changed(self, self.__size)
 
             self.__litems = {}
@@ -498,6 +498,12 @@
 
             gobject.idle_add(self.__get_root)
 
+      def set_from_icon_name(self, icon):
+            """Handle fallbacks for setting our icon."""
+            pixbuf = self.__theme.load_icon(icon, self.__size,
+                                            gtk.ICON_LOOKUP_GENERIC_FALLBACK)
+            self.set_from_pixbuf(pixbuf)
+
       def set_visibility_config(self, visibility):
             """Update the visibility configuration."""
             self.__show_when = int(visibility)
@@ -517,7 +523,7 @@
             label = self.__litems["status"].get_child()
             if done:
                   self.set_tooltip(_("Files updated."))
-                  self.set_from_icon_name("ubuntuone-client")
+                  self.set_from_icon_name("ubuntuone-client-idle")
                   label.set_text(_("Your files are up to date."))
             else:
                   label.set_markup("<i>%s</i>" % text)
@@ -722,13 +728,13 @@
 
             else:
                   self.__connected = True
-                  self.set_from_icon_name("ubuntuone-client")
+                  self.set_from_icon_name("ubuntuone-client-idle")
                   if state.startswith("CONNECTING") or \
                             state.startswith("START_CONNECTING") or \
                             state.startswith("AUTHENTICATING") or \
                             state.startswith("CONNECTED") or \
                             state.startswith("START_CONNECTED"):
-                        self.set_from_icon_name("ubuntuone-client")
+                        self.set_from_icon_name("ubuntuone-client-idle")
                         self.set_tooltip(_("Connecting"))
                         self.__visible = True