[conduit/gsoc09_alexandre: 125/125] Left over files from merge

[Alexandre Rosenfeld <arosenfeld src gnome org>]

commit f99787c73fc2e868240b9b35c5ae0b8d7bf500d6
Author: Alexandre Rosenfeld <alexandre rosenfeld gmail com>
Date:   Thu Sep 23 22:08:44 2010 -0300

    Left over files from merge

 conduit/ModuleWrapper.py |    2 +-
 conduit/SyncSet.py       |    4 ----
 conduit/gtkui/UI.py      |    2 --
 3 files changed, 1 insertions(+), 7 deletions(-)
---
diff --git a/conduit/ModuleWrapper.py b/conduit/ModuleWrapper.py
index 65ddfcc..b294fb6 100644
--- a/conduit/ModuleWrapper.py
+++ b/conduit/ModuleWrapper.py
@@ -209,7 +209,7 @@ class ModuleWrapper:
                     info = gtk.icon_theme_get_default().lookup_icon(self.icon_name, size, gtk.ICON_LOOKUP_GENERIC_FALLBACK)
                     self.icon[size] = info.load_icon()
                     self.icon_path = info.get_filename()
-                else:
+                except:
                     self.icon[size] = None
                     log.warn("Could not load icon %s for %s" % (self.icon_name, self.name))
                     #Last resort: Try the non icon-naming-spec compliant icon
diff --git a/conduit/SyncSet.py b/conduit/SyncSet.py
index 70608e8..b84eddf 100644
--- a/conduit/SyncSet.py
+++ b/conduit/SyncSet.py
@@ -46,7 +46,6 @@ class SyncSet(gobject.GObject):
         # FIXME: temporary hack - need to let factories know about this factory :-\!
         self.moduleManager.emit("syncset-added", self)
         
-<<<<<<< HEAD
     def _unitialize_dataproviders(self, cond):
         for dp in cond.get_all_dataproviders():
             if dp.module:
@@ -56,9 +55,6 @@ class SyncSet(gobject.GObject):
                     log.warn("Could not uninitialize %s" % dp, exc_info=True)
                 
     def _restore_dataprovider(self, cond, wrapperKey, dpName="", dpxml="", xml_version="2", trySourceFirst=True):
-=======
-    def _restore_dataprovider(self, cond, wrapperKey, dpName="", dpxml="", trySourceFirst=True):
->>>>>>> master
         """
         Adds the dataprovider back onto the canvas at the specifed
         location and configures it with the given settings
diff --git a/conduit/gtkui/UI.py b/conduit/gtkui/UI.py
index d956b88..f7c092a 100644
--- a/conduit/gtkui/UI.py
+++ b/conduit/gtkui/UI.py
@@ -47,7 +47,6 @@ for module in (gettext,):
     if hasattr(module, 'bind_textdomain_codeset'):
         module.bind_textdomain_codeset('conduit','UTF-8')
 
-<<<<<<< HEAD
 class Error(Exception):
     ''' Generic error for the UI'''
     pass
@@ -518,7 +517,6 @@ class MainWindow:
             gtk.icon_theme_get_default().prepend_search_path(i)
         gtk.window_set_default_icon_name("conduit")
 
-<<<<<<< HEAD
         self.conduitApplication = conduitApplication
         self.gladeFile = os.path.join(conduit.SHARED_DATA_DIR, "conduit_ui.glade")
         self.widgets = gtk.Builder()