[conduit] Icon cleanup

[John Stowers <jstowers src gnome org>]

commit 001f5c3200110c730d82e50d6d445fbafe4b9598
Author: John Stowers <john stowers gmail com>
Date:   Wed Sep 22 18:13:19 2010 +1200

    Icon cleanup
    
    	* Use evolution icons
    	* Ship a note icon

 conduit/modules/EvolutionModule/EvolutionModule.py |   33 +++++++++++---------
 conduit/modules/iPodModule/iPodModule.py           |    2 +-
 data/Makefile.am                                   |    3 +-
 data/evolution-memos.png                           |  Bin 964 -> 0 bytes
 data/evolution-tasks.png                           |  Bin 1132 -> 0 bytes
 data/note.png                                      |  Bin 0 -> 2644 bytes
 6 files changed, 20 insertions(+), 18 deletions(-)
---
diff --git a/conduit/modules/EvolutionModule/EvolutionModule.py b/conduit/modules/EvolutionModule/EvolutionModule.py
index fdc37a9..f4809fc 100644
--- a/conduit/modules/EvolutionModule/EvolutionModule.py
+++ b/conduit/modules/EvolutionModule/EvolutionModule.py
@@ -13,21 +13,24 @@ import conduit.datatypes.Event as Event
 import conduit.datatypes.Note as Note
 
 MODULES = {}
-try:
-    import evolution
-    if evolution.__version__ >= (0,0,4):
-        MODULES = {
-                "EvoContactTwoWay"  : { "type": "dataprovider" },
-                "EvoCalendarTwoWay" : { "type": "dataprovider" },
-                "EvoTasksTwoWay"    : { "type": "dataprovider" },
-                "EvoMemoTwoWay"     : { "type": "dataprovider" },
-        }
-        log.info("Module Information: %s" % Utils.get_module_information(evolution, '__version__'))
-    if evolution.__version__ <= (2,2,2):
-        #Work around bug #561354
-        import bonobo
-except ImportError:
-    log.info("Evolution support disabled")
+if Utils.program_installed("evolution"):
+    try:
+        import evolution
+        if evolution.__version__ >= (0,0,4):
+            MODULES = {
+                    "EvoContactTwoWay"  : { "type": "dataprovider" },
+                    "EvoCalendarTwoWay" : { "type": "dataprovider" },
+                    "EvoTasksTwoWay"    : { "type": "dataprovider" },
+                    "EvoMemoTwoWay"     : { "type": "dataprovider" },
+            }
+            log.info("Module Information: %s" % Utils.get_module_information(evolution, '__version__'))
+        if evolution.__version__ <= (2,2,2):
+            #Work around bug #561354
+            import bonobo
+    except ImportError:
+        log.info("Evolution support disabled (please install evolution bindings)")
+else:
+    log.info("Evolution not installed")
 
 class EvoBase(DataProvider.TwoWay):
     _configurable_ = True
diff --git a/conduit/modules/iPodModule/iPodModule.py b/conduit/modules/iPodModule/iPodModule.py
index 6b72885..48dcc3b 100644
--- a/conduit/modules/iPodModule/iPodModule.py
+++ b/conduit/modules/iPodModule/iPodModule.py
@@ -181,7 +181,7 @@ class IPodNoteTwoWay(IPodBase):
     _module_type_ = "twoway"
     _in_type_ = "note"
     _out_type_ = "note"
-    _icon_ = "tomboy"
+    _icon_ = "note"
 
     # datatypes.Note doesn't care about encoding,
     # lets be naive and assume that all notes are utf-8
diff --git a/data/Makefile.am b/data/Makefile.am
index c6b7a91..b78f63d 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -36,8 +36,6 @@ resourcesdir = $(pkgdatadir)
 resources_DATA = \
 	conduit.ui \
 	backpack.png \
-	evolution-tasks.png \
-	evolution-memos.png \
 	conduit-splash.png \
 	facebook.png \
 	feed.png \
@@ -48,6 +46,7 @@ resources_DATA = \
 	shutterfly.png \
 	youtube.png \
 	zoto.png \
+	note.png \
 	windows.png
 
 conduitbindir = $(libdir)/conduit
diff --git a/data/note.png b/data/note.png
new file mode 100644
index 0000000..8bdc4b4
Binary files /dev/null and b/data/note.png differ