← Back to branch summary

~ubuntu-branches/ubuntu/lucid/software-center/lucid

« back to all changes in this revision

Viewing changes to softwarecenter/app.py

  • Committer: Bazaar Package Importer
  • Author(s): Michael Vogt, Gary Lasker, Michael Vogt
  • Date: 2010-03-11 16:58:00 UTC
  • Revision ID: james.westby@ubuntu.com-20100311165800-t1x7nerqb5dxjyeq
Tags: 1.1.17
https://launchpad.net/bugs/531689
https://launchpad.net/bugs/531780
https://launchpad.net/bugs/531820
https://launchpad.net/bugs/531694
https://launchpad.net/bugs/531798
http://bugs.debian.org/572941
[ Gary Lasker ]
* softwarecenter/view/navhistory.py:
  - unescape the nav button label text (LP: #531689)
  - fix up and just use a single __str__ method (LP: #531780)
* softwarecenter/view/availablepane.py,
  softwarecenter/view/channelpane.py:
  - fix intermittent AttributeError when a previous
    model does not exist when refreshing the apps view
    (LP: #531820)

[ Michael Vogt ]
* merged lp:~mpt/software-center/bug-499893 (thanks)
* merged lp:~mpt/software-center/categorization (thanks)
* merged lp:~michaelforrest/software-center/ui-changes (thanks)
* data/icons/scalable/apps/partner.svg:
  - add partner icon (LP: #531694)
* softwarecenter/view/catview.py:
  - do not show header in subsection view
* softwarecenter/view/availablepane.py:
  - fix race in initial part creation (LP: #531798)
* debian/control:
  - add gnome-app-install transitional package (closes: #572941)

Show diffs side-by-side

added added

removed removed

Lines of Context:
softwarecenter/app.py
140
140
        # additional icons come from app-install-data
141
141
        self.icons = gtk.icon_theme_get_default()
142
142
        self.icons.append_search_path(ICON_PATH)
143
 
        self.icons.append_search_path(SOFTWARE_CENTER_ICON_PATH)
 
143
        self.icons.append_search_path(os.path.join(datadir,"icons"))
 
144
        self.icons.append_search_path(os.path.join(datadir,"emblems"))
144
145
        # HACK: make it more friendly for local installs (for mpt)
145
146
        self.icons.append_search_path(datadir+"/icons/32x32/status")
146
147
        gtk.window_set_default_icon_name("softwarecenter")