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

Proposed by Charles Kerr
Status: Merged
Approved by: Lars Karlitski
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) Approve
jenkins (community) continuous-integration Approve
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.
Revision history for this message
jenkins (martin-mrazik+qa) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
jenkins (martin-mrazik+qa) wrote :
review: Approve (continuous-integration)
Revision history for this message
Lars Karlitski (larsu) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
264264
265 if (state == SYNC_MENU_STATE_ERROR)265 if (state == SYNC_MENU_STATE_ERROR)
266 {266 {
267 icon_name = "sync-error";267 icon_name = "ubuntuone-client-error";
268 }268 }
269 else if (state == SYNC_MENU_STATE_SYNCING)269 else if (state == SYNC_MENU_STATE_SYNCING)
270 {270 {
271 icon_name = "sync-syncing";271 icon_name = "ubuntuone-client-updating";
272 }272 }
273 else if (paused)273 else if (paused)
274 {274 {
275 icon_name = "sync-paused";275 icon_name = "ubuntuone-client-paused";
276 }276 }
277 else277 else
278 {278 {
279 icon_name = "sync-idle";279 icon_name = "ubuntuone-client-idle";
280 }280 }
281281
282 return icon_name;282 return icon_name;

Subscribers

People subscribed via source and target branches

to all changes: