[conduit/gsoc09_alexandre] Fixed duplicate categories when using module cache
- From: Alexandre Rosenfeld <arosenfeld src gnome org>
- To: svn-commits-list gnome org
- Subject: [conduit/gsoc09_alexandre] Fixed duplicate categories when using module cache
- Date: Sat, 27 Jun 2009 22:16:40 +0000 (UTC)
commit 2684321836a06b8b1c0f0c396591c3804e32ba11
Author: Alexandre Rosenfeld <airmind gmail com>
Date: Sat Jun 27 18:18:21 2009 -0300
Fixed duplicate categories when using module cache
conduit/ModuleWrapper.py | 4 ++++
conduit/dataproviders/__init__.py | 31 ++++++++++++++++++++++---------
2 files changed, 26 insertions(+), 9 deletions(-)
---
diff --git a/conduit/ModuleWrapper.py b/conduit/ModuleWrapper.py
index 402d367..1f6a385 100644
--- a/conduit/ModuleWrapper.py
+++ b/conduit/ModuleWrapper.py
@@ -1,3 +1,4 @@
+import conduit
import traceback
import logging
log = logging.getLogger("ModuleWrapper")
@@ -72,6 +73,9 @@ class ModuleWrapper:
self.out_type = ""
self.classname = ""
self.configurable = False
+
+ if isinstance(self.category, basestring):
+ self.category = conduit.dataproviders.CATEGORIES[self.category]
self.dndKey = None
self.enabled = True
diff --git a/conduit/dataproviders/__init__.py b/conduit/dataproviders/__init__.py
index ca55c62..6496bb5 100644
--- a/conduit/dataproviders/__init__.py
+++ b/conduit/dataproviders/__init__.py
@@ -1,12 +1,25 @@
import DataProviderCategory
#Default Categories for the DataProviders
-CATEGORY_FILES = DataProviderCategory.DataProviderCategory("Files and Folders", "computer")
-CATEGORY_NOTES = DataProviderCategory.DataProviderCategory("Notes", "tomboy")
-CATEGORY_PHOTOS = DataProviderCategory.DataProviderCategory("Photos", "image-x-generic")
-CATEGORY_OFFICE = DataProviderCategory.DataProviderCategory("Office", "applications-office")
-CATEGORY_SETTINGS = DataProviderCategory.DataProviderCategory("Settings", "applications-system")
-CATEGORY_MISC = DataProviderCategory.DataProviderCategory("Miscellaneous", "applications-accessories")
-CATEGORY_MEDIA = DataProviderCategory.DataProviderCategory("Media", "applications-multimedia")
-CATEGORY_BOOKMARKS = DataProviderCategory.DataProviderCategory("Bookmarks", "user-bookmarks")
-CATEGORY_TEST = DataProviderCategory.DataProviderCategory("Test")
+
+CATEGORY_FILES = 'CATEGORY_FILES'
+CATEGORY_NOTES = 'CATEGORY_NOTES'
+CATEGORY_PHOTOS = 'CATEGORY_PHOTOS'
+CATEGORY_OFFICE = 'CATEGORY_OFFICE'
+CATEGORY_SETTINGS = 'CATEGORY_SETTINGS'
+CATEGORY_MISC = 'CATEGORY_MISC'
+CATEGORY_MEDIA = 'CATEGORY_MEDIA'
+CATEGORY_BOOKMARKS = 'CATEGORY_BOOKMARKS'
+CATEGORY_TEST = 'CATEGORY_TEST'
+
+CATEGORIES = {
+ CATEGORY_FILES : DataProviderCategory.DataProviderCategory("Files and Folders", "computer"),
+ CATEGORY_NOTES : DataProviderCategory.DataProviderCategory("Notes", "tomboy"),
+ CATEGORY_PHOTOS : DataProviderCategory.DataProviderCategory("Photos", "image-x-generic"),
+ CATEGORY_OFFICE : DataProviderCategory.DataProviderCategory("Office", "applications-office"),
+ CATEGORY_SETTINGS : DataProviderCategory.DataProviderCategory("Settings", "applications-system"),
+ CATEGORY_MISC : DataProviderCategory.DataProviderCategory("Miscellaneous", "applications-accessories"),
+ CATEGORY_MEDIA : DataProviderCategory.DataProviderCategory("Media", "applications-multimedia"),
+ CATEGORY_BOOKMARKS : DataProviderCategory.DataProviderCategory("Bookmarks", "user-bookmarks"),
+ CATEGORY_TEST : DataProviderCategory.DataProviderCategory("Test")
+}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]