[telepathy-ashes/master] misc bugfixes/refactoring

[David Laban]

---
 ashes/tools/bases.py        |    5 ++---
 ashes/tools/groups.py       |   17 ++++++++++-------
 ashes/tools/media_echoer.py |    6 +++---
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/ashes/tools/bases.py b/ashes/tools/bases.py
index 851997b..cf75dbc 100644
--- a/ashes/tools/bases.py
+++ b/ashes/tools/bases.py
@@ -58,9 +58,8 @@ class ObjectListener(object):
         which can be used as a callback.
         """
         def printer(*args, **kwargs):
-            print "Signal emitted: %s.%s(%s, %s)" % (iface_name, function_name,
-                    ', '.join(map(str, args)),
-                    ', '.join('%s=%s' % (k, v) for (k, v) in kwargs.items()))
+            print "Signal emitted: %s.%s(%s)" % (iface_name, function_name,
+                    ', '.join(map(str, args)))
         return printer
 
 
diff --git a/ashes/tools/groups.py b/ashes/tools/groups.py
index 4dc73b9..5a090df 100644
--- a/ashes/tools/groups.py
+++ b/ashes/tools/groups.py
@@ -2,7 +2,7 @@
 import telepathy
 
 from bases import ChannelListener
-from helper_functions import get_property, printer
+from helper_functions import get_property, printer, green
 
 class ContactAcceptor(ChannelListener):
     """Automatically accepts local_pending members of groups."""
@@ -20,20 +20,23 @@ class ContactAcceptor(ChannelListener):
 
     def local_pending(self, pending):
         for handle, actor, reason, message in pending:
-            print "Allowing members to join", self.id, handle, actor, reason, message
-            self.channel[telepathy.CHANNEL_INTERFACE_GROUP].AddMembers([handle], '')
+            self.MembersChanged(message, [], [], [handle], [], actor, reason)
 
     def MembersChanged(self, message, added, removed, local_pending, remote_pending,
                 actor, reason):
         if added:
-            print "Members added to", self.id
+            print green("Members added to "+self.id), added,
+            print actor, reason, message
         if removed:
-            print "Members removed from", self.id
+            print green("Members removed from "+self.id), removed,
+            print actor, reason, message
         if local_pending:
-            print "Allowing members to join", self.id
+            print green("Allowing members to join "+self.id), local_pending,
+            print actor, reason, message
             self.channel[telepathy.CHANNEL_INTERFACE_GROUP].AddMembers(local_pending, '')
         if remote_pending:
-            print 'members invited to', self.id
+            print green('Members invited to '+self.id), remote_pending,
+            print actor, reason, message
 
     def MembersChangedDetailed(self, Added, Removed, Local_Pending, Remote_Pending, Details):
         pass
\ No newline at end of file
diff --git a/ashes/tools/media_echoer.py b/ashes/tools/media_echoer.py
index 57d0967..c6175af 100644
--- a/ashes/tools/media_echoer.py
+++ b/ashes/tools/media_echoer.py
@@ -129,9 +129,9 @@ class MediaChannelEchoer(ContactAcceptor):
         print green("Adding conference to the pipeline")
         self.pipeline.add(conference)
         self.pipeline.set_state(gst.STATE_PLAYING)
-        notifier = farsight.ElementAddedNotifier()
-        notifier.connect("element-added", self.element_added_cb)
-        notifier.add(self.pipeline)
+        #notifier = farsight.ElementAddedNotifier()
+        #notifier.connect("element-added", self.element_added_cb)
+        #notifier.add(self.pipeline)
 
     def element_added_cb(self, notifier, bin, element):
         if element.get_factory().get_name() == "x264enc":
-- 
1.5.6.5