From c78f8062448581551a694935fec985568fb42b0c Mon Sep 17 00:00:00 2001
From: Bryan Schumaker <bjschuma@gmail.com>
Date: Sun, 30 Jan 2011 21:34:27 -0500
Subject: [PATCH] plugins: All plugins have a __NAME__ value

---
 ocarina/settings/plugin.py | 10 ++++++----
 plugins/lyrics.py          |  1 +
 plugins/notify.py          |  2 ++
 plugins/web_radio.py       |  2 ++
 plugins/web_server.py      |  2 ++
 plugins/wm_tweaks.py       |  2 ++
 6 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/ocarina/settings/plugin.py b/ocarina/settings/plugin.py
index 25b04362..527fbca4 100644
--- a/ocarina/settings/plugin.py
+++ b/ocarina/settings/plugin.py
@@ -24,10 +24,12 @@ class PluginView(gtk.TreeView):
 		self.col  = PluginColumn()
 
 		self.append_column(self.col)
-		keys = plugin.loaded.keys()
-		keys.sort()
-		for key in keys:
-			self.list.append([key])
+		names = []
+		for mod in plugin.loaded.values():
+			names.append(mod.__NAME__)
+		names.sort()
+		for name in names:
+			self.list.append([name])
 
 		self.set_model(self.list)
 		self.show_all()
diff --git a/plugins/lyrics.py b/plugins/lyrics.py
index 9af6ad44..9c75e21d 100644
--- a/plugins/lyrics.py
+++ b/plugins/lyrics.py
@@ -11,6 +11,7 @@ from libsaria import web
 from libsaria import xm
 from libsaria import cache
 
+__NAME__ = "Lyrics"
 gtk = ocarina.gtk
 
 lyrics = gtk.ScrolledWindow()
diff --git a/plugins/notify.py b/plugins/notify.py
index 5fbd2e63..608366e3 100644
--- a/plugins/notify.py
+++ b/plugins/notify.py
@@ -6,6 +6,8 @@ libsaria  = ocarina.libsaria
 get_attrs = libsaria.sources.get_attrs
 image = ocarina.components.image.Image()
 
+__NAME__ = "Notify"
+
 def notify(*args):
 	title, artist, art = get_attrs("title", "artist", "art")
 
diff --git a/plugins/web_radio.py b/plugins/web_radio.py
index eba6a826..505902b5 100644
--- a/plugins/web_radio.py
+++ b/plugins/web_radio.py
@@ -4,6 +4,8 @@ import ocarina
 import webkit
 from ocarina import body
 
+__NAME__ = "Web Radio"
+
 libsaria = ocarina.libsaria
 path     = libsaria.path
 audio    = libsaria.audio
diff --git a/plugins/web_server.py b/plugins/web_server.py
index bf9e0425..fa42f2cd 100644
--- a/plugins/web_server.py
+++ b/plugins/web_server.py
@@ -6,6 +6,8 @@ from libsaria.sources import library
 from libsaria import threads
 from libsaria import lastfm
 
+__NAME__ = "Web Server"
+
 path     = libsaria.path
 exists   = path.exists
 join     = path.join
diff --git a/plugins/wm_tweaks.py b/plugins/wm_tweaks.py
index ea137579..edbc253c 100644
--- a/plugins/wm_tweaks.py
+++ b/plugins/wm_tweaks.py
@@ -7,6 +7,8 @@ libsaria  = ocarina.libsaria
 get_attrs = libsaria.sources.get_attrs
 invite    = libsaria.event.invite
 
+__NAME__ = "Window Manager Tweaks"
+
 
 def tweak_icon(file):
 	if file == None: