From 614b002d8bbde8a068150806d5928f5415796349 Mon Sep 17 00:00:00 2001 From: Calum Lind Date: Sun, 26 Feb 2012 23:00:06 +0000 Subject: [PATCH] Fix plugins not showing enabled in webui --- deluge/plugins/AutoAdd/setup.py | 2 +- deluge/plugins/Blocklist/setup.py | 2 +- deluge/plugins/Extractor/setup.py | 6 ++++++ deluge/plugins/Feeder/setup.py | 2 +- deluge/plugins/Toggle/setup.py | 2 +- 5 files changed, 10 insertions(+), 4 deletions(-) diff --git a/deluge/plugins/AutoAdd/setup.py b/deluge/plugins/AutoAdd/setup.py index 764c4bfe4..62ff199f4 100644 --- a/deluge/plugins/AutoAdd/setup.py +++ b/deluge/plugins/AutoAdd/setup.py @@ -68,7 +68,7 @@ setup( %s = deluge.plugins.%s:CorePlugin [deluge.plugin.gtkui] %s = deluge.plugins.%s:GtkUIPlugin - [deluge.plugin.webui] + [deluge.plugin.web] %s = deluge.plugins.%s:WebUIPlugin """ % ((__plugin_name__, __plugin_name__.lower())*3) ) diff --git a/deluge/plugins/Blocklist/setup.py b/deluge/plugins/Blocklist/setup.py index d43edc2bd..67b894a89 100644 --- a/deluge/plugins/Blocklist/setup.py +++ b/deluge/plugins/Blocklist/setup.py @@ -63,7 +63,7 @@ setup( %s = deluge.plugins.%s:CorePlugin [deluge.plugin.gtkui] %s = deluge.plugins.%s:GtkUIPlugin - [deluge.plugin.webui] + [deluge.plugin.web] %s = deluge.plugins.%s:WebUIPlugin """ % ((__plugin_name__, __plugin_name__.lower())*3) ) diff --git a/deluge/plugins/Extractor/setup.py b/deluge/plugins/Extractor/setup.py index e72031fee..d4558f893 100644 --- a/deluge/plugins/Extractor/setup.py +++ b/deluge/plugins/Extractor/setup.py @@ -67,8 +67,14 @@ setup( [deluge.plugin.core] %s = deluge.plugins.%s:CorePlugin [deluge.plugin.gtkui] +<<<<<<< HEAD:deluge/plugins/Extractor/setup.py %s = deluge.plugins.%s:GtkUIPlugin [deluge.plugin.web] %s = deluge.plugins.%s:WebUIPlugin +======= + %s = %s:GtkUIPlugin + [deluge.plugin.web] + %s = %s:WebUIPlugin +>>>>>>> fa7edd0... Fix plugins not showing enabled in webui:deluge/plugins/extractor/setup.py """ % ((__plugin_name__, __plugin_name__.lower())*3) ) diff --git a/deluge/plugins/Feeder/setup.py b/deluge/plugins/Feeder/setup.py index 5c3d41c29..585672f80 100644 --- a/deluge/plugins/Feeder/setup.py +++ b/deluge/plugins/Feeder/setup.py @@ -65,7 +65,7 @@ setup( %s = deluge.plugins.%s:CorePlugin [deluge.plugin.gtkui] %s = deluge.plugins.%s:GtkUIPlugin - [deluge.plugin.webui] + [deluge.plugin.web] %s = deluge.plugins.%s:WebUIPlugin """ % ((__plugin_name__, __plugin_name__.lower())*3) ) diff --git a/deluge/plugins/Toggle/setup.py b/deluge/plugins/Toggle/setup.py index c772d22e1..37ef7e12e 100644 --- a/deluge/plugins/Toggle/setup.py +++ b/deluge/plugins/Toggle/setup.py @@ -68,7 +68,7 @@ setup( %s = deluge.plugins.%s:CorePlugin [deluge.plugin.gtkui] %s = deluge.plugins.%s:GtkUIPlugin - [deluge.plugin.webui] + [deluge.plugin.web] %s = deluge.plugins.%s:WebUIPlugin """ % ((__plugin_name__, __plugin_name__.lower())*3) )