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

Proposed by Charles Kerr on 2012-09-24
Status: Merged
Approved by: Lars Karlitski on 2012-09-25
Approved revision: 20
Merged at revision: 21
Proposed branch: lp:~charlesk/indicator-sync/lp-1043379
Merge into: lp:indicator-sync/12.10
Diff against target: 27 lines (+4/-4)
1 file modified
src/indicator/indicator-sync.c (+4/-4)
To merge this branch: bzr merge lp:~charlesk/indicator-sync/lp-1043379
Reviewer Review Type Date Requested Status
Lars Karlitski (community) 2012-09-24 Approve on 2012-09-25
jenkins (community) continuous-integration Approve on 2012-09-24
Review via email: mp+126080@code.launchpad.net

Commit message

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

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 'src/indicator/indicator-sync.c'
2--- src/indicator/indicator-sync.c 2012-09-17 05:18:18 +0000
3+++ src/indicator/indicator-sync.c 2012-09-24 19:45:24 +0000
4@@ -264,19 +264,19 @@
5
6 if (state == SYNC_MENU_STATE_ERROR)
7 {
8- icon_name = "sync-error";
9+ icon_name = "ubuntuone-client-error";
10 }
11 else if (state == SYNC_MENU_STATE_SYNCING)
12 {
13- icon_name = "sync-syncing";
14+ icon_name = "ubuntuone-client-updating";
15 }
16 else if (paused)
17 {
18- icon_name = "sync-paused";
19+ icon_name = "ubuntuone-client-paused";
20 }
21 else
22 {
23- icon_name = "sync-idle";
24+ icon_name = "ubuntuone-client-idle";
25 }
26
27 return icon_name;

Subscribers

People subscribed via source and target branches

to all changes: