← Back to branch summary

~ps-jenkins/ubuntu-push/ubuntu-vivid-proposed

« back to all changes in this revision

Viewing changes to click/click.go

  • Committer: Roberto Alsina
  • Date: 2014-10-24 14:05:51 UTC
  • mfrom: (91.179.41 automatic)
  • mto: This revision was merged to the branch mainline in revision 136.
  • Revision ID: roberto.alsina@canonical.com-20141024140551-tsdz3xggo2rbwlqj
Merge from automatic

Show diffs side-by-side

added added

removed removed

Lines of Context:
click/click.go
146
146
var symbolic = _symbolic
147
147
 
148
148
func (app *AppId) SymbolicIcon() string {
 
149
        symbolicIcon := cappinfo.AppSymbolicIconFromDesktopId(app.DesktopId())
 
150
        if symbolicIcon != "" {
 
151
                return symbolicIcon
 
152
        }
149
153
        return symbolic(app.Icon())
150
154
}
151
155