Merge lp:~charlesk/indicator-sync/lp-1043379 into lp:indicator-sync/12.10

[Charles Kerr]

use the ubuntuone-client-* icons for the sync menu's icon

[jenkins (martin-mrazik+qa)]

FAILED: Continuous integration, rev:20
http://jenkins.qa.ubuntu.com/job/indicator-sync-ci/20/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-sync-ci/./build=pbuilder,distribution=quantal,flavor=amd64/20/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sync-ci/./build=pbuilder,distribution=quantal,flavor=i386/20/console

review: Needs Fixing (continuous-integration)

[jenkins (martin-mrazik+qa)]

PASSED: Continuous integration, rev:20
http://jenkins.qa.ubuntu.com/job/indicator-sync-ci/21/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sync-ci/./build=pbuilder,distribution=quantal,flavor=i386/21/console

review: Approve (continuous-integration)

[Lars Karlitski (larsu)]

review: Approve

=== modified file 'src/indicator/indicator-sync.c'
--- src/indicator/indicator-sync.c	2012-09-17 05:18:18 +0000
+++ src/indicator/indicator-sync.c	2012-09-24 19:45:24 +0000
@@ -264,19 +264,19 @@
 
   if (state == SYNC_MENU_STATE_ERROR)
     {
-      icon_name = "sync-error";
+      icon_name = "ubuntuone-client-error";
     }
   else if (state == SYNC_MENU_STATE_SYNCING)
     {
-      icon_name = "sync-syncing";
+      icon_name = "ubuntuone-client-updating";
     }
   else if (paused)
     {
-      icon_name = "sync-paused";
+      icon_name = "ubuntuone-client-paused";
     }
   else
     {
-      icon_name = "sync-idle";
+      icon_name = "ubuntuone-client-idle";
     }
 
   return icon_name;