tags 451303 patch thanks If this doesn't get fixed soon, then there won't be any of hope of shipping exaile with Lenny.
The attached patch: * Eliminates the "Available Plugins" tab of the management dialog. * Removes the "Uninstall" button from the "Installed Plugins" tab. * Installs the plugins to /usr/lib/exaile/plugins, (except updates.py). * Adjusts the installed plugins search path to /usr/lib/exaile/plugins. François, how do you feel about this as an interim solution until 0.3 is released? -- Eric Evans [EMAIL PROTECTED]
diff --git a/Makefile b/Makefile
index d7281c4..1d5ddea 100644
--- a/Makefile
+++ b/Makefile
@@ -38,6 +38,7 @@ make-install-dirs:
mkdir -p $(DESTDIR)$(PREFIX)/share/exaile/xl/plugins
mkdir -p $(DESTDIR)$(PREFIX)/share/locale
mkdir -p $(DESTDIR)$(PREFIX)/share/man/man1
+ mkdir -p $(DESTDIR)$(PREFIX)$(LIBDIR)/exaile/plugins
install: make-install-dirs
install -m 644 exaile.1 $(DESTDIR)$(PREFIX)/share/man/man1
@@ -78,6 +79,8 @@ install: make-install-dirs
install -D -m 644 $$f \
`echo $$f | sed "s|^po|$(DESTDIR)$(PREFIX)/share/locale|"` ; \
done
+ cp -a plugins/* $(DESTDIR)$(PREFIX)$(LIBDIR)/exaile/plugins
+ rm $(DESTDIR)$(PREFIX)$(LIBDIR)/exaile/plugins/updates.py
clean:
rm -f mmkeys.so
diff --git a/xl/path.py b/xl/path.py
index ba17a11..0fd687b 100644
--- a/xl/path.py
+++ b/xl/path.py
@@ -63,6 +63,8 @@ def get_config(*path_elems):
print "WARNING: get_config called for 'cache', use get_cache instead"
import traceback
traceback.print_stack()
+ if path_elems[0] == 'plugins':
+ return os.path.join('/usr/lib/exaile/plugins')
return os.path.join(_configdir, *path_elems)
def get_data(*path_elems):
diff --git a/xl/plugins/gui.py b/xl/plugins/gui.py
index 414c426..50c63f3 100644
--- a/xl/plugins/gui.py
+++ b/xl/plugins/gui.py
@@ -67,8 +67,10 @@ class PluginManager(object):
self.plugin_install_button = self.xml.get_widget('plugin_install_button')
self.plugin_install_button.connect('clicked',
self.install_plugin)
- self.xml.get_widget('plugin_uninstall_button').connect('clicked',
- self.uninstall_plugin)
+
+ # Get rid of the uninstall button and plugin installation page.
+ self.xml.get_widget('plugin_uninstall_button').destroy()
+ self.plugin_nb.remove_page(1)
pb = gtk.CellRendererPixbuf()
text = gtk.CellRendererText()
@@ -102,11 +104,6 @@ class PluginManager(object):
selection.select_path(0)
self.fetched = False
- if avail_url:
- self.setup_avail_tab()
- self.avail_url = avail_url
- self.plugin_nb.connect('switch-page', self.check_fetch_avail)
-
def load_plugin_list(self):
self.model.clear()
list = []
signature.asc
Description: Digital signature
