The Sync Menu

Merge lp://qastaging/~charlesk/indicator-sync/lp-1218536 into lp://qastaging/indicator-sync/13.10

lp-1218536
Merge into trunk.13.10

Proposed by Charles Kerr on 2013-09-10

Status:

Merged

Approved by:

Ted Gould on 2013-09-10

Approved revision:

Merged at revision:

Proposed branch:

lp://qastaging/~charlesk/indicator-sync/lp-1218536

Merge into:

lp://qastaging/indicator-sync/13.10

Diff against target:

123 lines (+64/-30)

1 file modified

src/service/app-menu-item.c (+64/-30)

To merge this branch:

bzr merge lp://qastaging/~charlesk/indicator-sync/lp-1218536

High

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Approve on 2013-09-10
Ted Gould (community)		2013-09-10	Approve on 2013-09-10
Review via email: mp+184876@code.qastaging.launchpad.net

Commit message

Fix client icon issues in indicator-sync-service.

Description of the change

Cleans up the sync clients' icon code:

1. Previously it looked for a "X-Ayatana-Sync-Menu-Icon" line in the [Desktop Entry] of the .desktop file so a menuitem-sized icon could be specified. This change still uses that key but also uses "Icon" as a fallback.

2. If we find a themed icon, the code tried to precede the icon's name with $(name)-symbolic so symbolic icons could override the .desktop-provided one. A bug in that code clobbered the old name, simply replacing $(name) with $(name)-symbolic. This change fixes that bug.

3. Item #2 wasn't found sooner because it wasn't applied to icons found under the X-Ayatana-Sync-Menu-Icon key. This change lets -symbolic override any GThemedIcon, regardless of its source.

Revision history for this message