The Sync Menu

Merge lp://qastaging/~charlesk/indicator-sync/lp-1059591 into lp://qastaging/indicator-sync/12.10

  1. lp-1059591
  2. Merge into trunk
Proposed by Charles Kerr
Status: Merged
Approved by: Lars Karlitski
Approved revision: 22
Merged at revision: 23
Proposed branch: lp://qastaging/~charlesk/indicator-sync/lp-1059591
Merge into: lp://qastaging/indicator-sync/12.10
Diff against target: 353 lines (+169/-26)
14 files modified
configure.ac (+2/-3)
data/icons/22x22/status/Makefile.am (+5/-5)
data/icons/22x22/status/sync-client-error.svg (+15/-0)
data/icons/22x22/status/sync-client-idle.svg (+15/-0)
data/icons/22x22/status/sync-client-paused.svg (+15/-0)
data/icons/22x22/status/sync-client-updating.svg (+15/-0)
data/icons/24x24/Makefile.am (+1/-0)
data/icons/24x24/status/Makefile.am (+10/-0)
data/icons/24x24/status/sync-client-error.svg (+15/-0)
data/icons/24x24/status/sync-client-idle.svg (+15/-0)
data/icons/24x24/status/sync-client-paused.svg (+15/-0)
data/icons/24x24/status/sync-client-updating.svg (+15/-0)
data/icons/Makefile.am (+6/-5)
src/indicator/indicator-sync.c (+25/-13)
To merge this branch: bzr merge lp://qastaging/~charlesk/indicator-sync/lp-1059591
Reviewer Review Type Date Requested Status
Lars Karlitski (community) Approve
jenkins (community) continuous-integration Needs Fixing
Review via email: mp+127632@code.qastaging.launchpad.net

Description of the change

This renames the fallback client icons to use a similar naming scheme to the ubuntuone icons. It follows indicator-messages' behavior of installing into $(datadir)/icons/hicolor instead of using the libindicator icon directory.

In the code, look for both the ubuntuone-client-* icons and the sync-client-* icons.

To post a comment you must log in.
Revision history for this message
jenkins (martin-mrazik+qa) wrote :

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Lars Karlitski (larsu) wrote :

Cool!

Shouldn't the ubuntuone-* icons be specified before the generic ones?

review: Needs Information
Revision history for this message
Charles Kerr (charlesk) wrote :

Next cycle we're going to ticket the icons to be renamed from ubuntuone-* to sync-*. They're functional as-is but it represents a bit of rot, they should be renamed to the sync- abstraction level. For example a user could be using spideroak or dropbox but not ubuntuone.

Revision history for this message
Lars Karlitski (larsu) wrote :

That makes total sense, thanks.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: