← Back to branch summary

~gary-lasker/software-center/launcher-integration-for-p

« back to all changes in this revision

Viewing changes to softwarecenter/ui/gtk/app.py

  • Committer: Michael Vogt
  • Date: 2011-09-13 12:45:56 UTC
  • Revision ID: michael.vogt@ubuntu.com-20110913124556-x2unce5rmp16o040
https://launchpad.net/bugs/631457
* softwarecenter/ui/gtk3/app.py, debian/control:
  - renenable plugin loader 
  - add conflict against older oneconf as the old oneconf plugin
    will crash softwarecenter because of mixing pygtk with pygi
  - load plugins from $SOFTWARE_CENTER_PLUGINS_DIR, 
    /usr/share/software-center/plugins, 
    ~/.local/share/software-center/plugins (LP: #631457)
* doc/example_plugin.py:
  - updated to the gtk3 version

Show diffs side-by-side

added added

removed removed

Lines of Context:
softwarecenter/ui/gtk/app.py
54
54
                                  SOFTWARE_CENTER_SSO_DESCRIPTION,
55
55
                                 )
56
56
 
57
 
from softwarecenter.paths import SOFTWARE_CENTER_PLUGIN_DIR, ICON_PATH
 
57
from softwarecenter.paths import SOFTWARE_CENTER_PLUGIN_DIRS, ICON_PATH
58
58
from softwarecenter.utils import (clear_token_from_ubuntu_sso,
59
59
                                  wait_for_apt_cache_ready)
60
60
from softwarecenter.version import VERSION
358
358
        self.status_box.add(self.label_status)
359
359
 
360
360
        # open plugin manager and load plugins
361
 
        self.plugin_manager = PluginManager(self, SOFTWARE_CENTER_PLUGIN_DIR)
 
361
        self.plugin_manager = PluginManager(self, SOFTWARE_CENTER_PLUGIN_DIRS)
362
362
        self.plugin_manager.load_plugins()
363
363
        
364
364
        # make the local cache directory if it doesn't already exist