[pitivi: 1/3] Do not load effects icons when running with no UI.

[Edward Hervey <edwardrv src gnome org>]

commit 15dd2a191db6074c1a0baa98abff34bbb0e2d9c0
Author: Thibault Saunier <thibault saunier collabora co uk>
Date:   Fri Jan 21 09:39:55 2011 +0100

    Do not load effects icons when running with no UI.

 pitivi/effects.py       |    3 +--
 pitivi/ui/effectlist.py |    9 +++++----
 2 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/pitivi/effects.py b/pitivi/effects.py
index 3f7b36a..7e85bf9 100644
--- a/pitivi/effects.py
+++ b/pitivi/effects.py
@@ -133,8 +133,7 @@ class EffectsHandler(object):
                 effect = EffectFactory(name, name,
                                    self._getEffectCategories(name),
                                    self._getEffectName(element_factory),
-                                   self._getEffectDescripton(element_factory),
-                                   icon = self.getEffectIcon(name))
+                                   self._getEffectDescripton(element_factory))
                 added = self.addStreams(element_factory, effect)
 
                 if added is True:
diff --git a/pitivi/ui/effectlist.py b/pitivi/ui/effectlist.py
index 6b68949..cd42017 100644
--- a/pitivi/ui/effectlist.py
+++ b/pitivi/ui/effectlist.py
@@ -234,9 +234,10 @@ class EffectList(gtk.VBox, Loggable):
             name =element.get_name()
             effect = self.app.effects.getFactoryFromName(name)
             self.storemodel.append([ effect.getHumanName(),
-                                     effect.getDescription(), effectType, effect.getCategories(),\
-                                     effect, element.get_name(), effect.icon])
-
+                                     effect.getDescription(), effectType,
+                                     effect.getCategories(),
+                                     effect, name,
+                                     self.app.effects.getEffectIcon(name)])
             self.storemodel.set_sort_column_id(COL_NAME_TEXT, gtk.SORT_ASCENDING)
 
     def show_categories(self, effectType):
@@ -384,7 +385,7 @@ class EffectList(gtk.VBox, Loggable):
         name = self.modelFilter.get_value(context[2], COL_ELEMENT_NAME)
         if self._current_effect_name != name:
             self._current_effect_name = name
-            icon = self.app.effects.getEffectIcon(name)
+            icon = self.modelFilter.get_value(context[2], COL_ICON)
             self._current_tooltip_icon = icon
 
         longname = escape(self.modelFilter.get_value(context[2],