[conduit] code clean, provate functionss listed before publin ones

[John Stowers <jstowers src gnome org>]

commit 74733c92e3b3575f7b5d49fc784f832dbd81eccb
Author: John Stowers <john stowers gmail com>
Date:   Thu Jan 7 16:51:27 2010 +0100

    code clean, provate functionss listed before publin ones

 conduit/gtkui/Canvas.py |   24 ++++++++++++------------
 conduit/gtkui/UI.py     |   22 +++++++++++-----------
 2 files changed, 23 insertions(+), 23 deletions(-)
---
diff --git a/conduit/gtkui/Canvas.py b/conduit/gtkui/Canvas.py
index 6f94e7e..ef35f61 100644
--- a/conduit/gtkui/Canvas.py
+++ b/conduit/gtkui/Canvas.py
@@ -380,18 +380,6 @@ class Canvas(goocanvas.Canvas, _StyleMixin):
         self.selectedDataproviderItem = selected_dataprovider
         self.selectedConduitItem = selected_conduit
 
-    def get_selected_conduit(self):
-        if self.selectedConduitItem:
-            return self.selectedConduitItem.model
-        else:
-            return None
-    
-    def get_selected_dataprovider(self):
-        if self.selectedDataproviderItem:
-            return self.selectedDataproviderItem.model        
-        else:
-            return None
-
     def _on_conduit_button_press(self, view, target, event):
         """
         Handle button clicks on conduits
@@ -511,6 +499,18 @@ class Canvas(goocanvas.Canvas, _StyleMixin):
             else:
                 dp.set_status(DataProvider.STATUS_DONE_SYNC_NOT_CONFIGURED)
 
+    def get_selected_conduit(self):
+        if self.selectedConduitItem:
+            return self.selectedConduitItem.model
+        else:
+            return None
+
+    def get_selected_dataprovider(self):
+        if self.selectedDataproviderItem:
+            return self.selectedDataproviderItem.model
+        else:
+            return None
+
     def on_conduit_removed(self, sender, conduitRemoved):
         for item in self._get_child_conduit_canvas_items():
             if item.model == conduitRemoved:
diff --git a/conduit/gtkui/UI.py b/conduit/gtkui/UI.py
index 38ef529..1367276 100644
--- a/conduit/gtkui/UI.py
+++ b/conduit/gtkui/UI.py
@@ -69,9 +69,6 @@ class _PreconfiguredConduitMenu:
         else:
             self.item.set_sensitive(False)
 
-    def set_sync_set(self, syncSet):    
-        self.syncSet = syncSet  
-        
     def _create(self, menu, sok, sik, w):
         self.syncSet.create_preconfigured_conduit(sok,sik,w)
         
@@ -84,6 +81,9 @@ class _PreconfiguredConduitMenu:
     def _dp_removed(self, manager, dpw):
         self.menu.remove(self._items[dpw])
 
+    def set_sync_set(self, syncSet):
+        self.syncSet = syncSet
+
 class _GtkBuilderWrapper(gtk.Builder):
     def __init__(self, *path):
         gtk.Builder.__init__(self)
@@ -758,14 +758,6 @@ class StatusIcon(gtk.StatusIcon):
             self.cancelButton.set_property("sensitive", False)
             return False
 
-    def on_conduit_added(self, syncset, cond):
-        cond.connect("sync-started", self._on_sync_started)
-        cond.connect("sync-completed", self._on_sync_completed)
-        cond.connect("sync-conflict", self._on_sync_conflict)
-        
-    def on_conduit_removed(self, syncset, cond):
-        pass
-
     def _on_sync_started(self, cond):
         if not self.animating:
             self.animating = True
@@ -780,6 +772,14 @@ class StatusIcon(gtk.StatusIcon):
     def _on_sync_conflict(self, cond, conflict):
         self.conflict = True
 
+    def on_conduit_added(self, syncset, cond):
+        cond.connect("sync-started", self._on_sync_started)
+        cond.connect("sync-completed", self._on_sync_completed)
+        cond.connect("sync-conflict", self._on_sync_conflict)
+
+    def on_conduit_removed(self, syncset, cond):
+        pass
+
     def on_synchronize(self, data):
         self.conduitApplication.Synchronize()