From 77333229f969f808e1559fe798020185d71abac9 Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Sat, 16 Aug 2008 13:04:49 +0000
Subject: Merge commit 'v0.82.0' into upstream

---
diff --git a/NEWS b/NEWS
index fb43853..be61a11 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,31 @@
+sugar-presence-service 0.82.0 (2008-08-06)
+==========================================
+
+The "Woo I'm stable!" release.
+
+No code change since 0.81.4, the point of this release is to sync
+version number with Sucrose 0.82.0.
+
+sugar-presence-service 0.81.4 (2008-07-22)
+==========================================
+
+The "Oooops I'm late" release.
+
+Fixes:
+
+* dev.laptop.org #7451: Presence Service should start even with no interfaces up
+
+
+sugar-presence-service 0.81.3 (2008-07-08)
+==========================================
+
+The "Change the Channel" release.
+
+Enhancements:
+
+* dev.laptop.org #4757: Add ListChannels from Telepathy
+
+
 sugar-presence-service 0.81.2 (2008-06-20)
 ==========================================
 
@@ -13,5 +41,5 @@ sugar-presence-service 0.81.1 (2008-05-21)
 
 The "I'm full of Glucose" release.
 
-- No code change since 0.79.3, the point of this release is to sync
+No code change since 0.79.3, the point of this release is to sync
 version number with Sucrose.
diff --git a/configure.ac b/configure.ac
index 6c3f5e4..8ffeedc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([Sugar Presence Service],[0.81.2],[],[sugar-presence-service])
+AC_INIT([Sugar Presence Service],[0.82.0],[],[sugar-presence-service])
 
 AC_PREREQ([2.59])
 
diff --git a/src/activity.py b/src/activity.py
index ec20536..12f3ac2 100644
--- a/src/activity.py
+++ b/src/activity.py
@@ -583,6 +583,39 @@ class Activity(ExportedGObject):
         return self.get_channels()
 
     @dbus.service.method(_ACTIVITY_INTERFACE,
+                        in_signature="", out_signature="soa(osuu)")
+    def ListChannels(self):
+        """D-Bus method to get the list of channels associated with this
+        activity.
+
+        :Returns:
+            - the D-Bus well-known service name of the connection
+              (FIXME: this is redundant; in Telepathy it can be derived
+              from that of the connection)
+            - the D-Bus object path of the connection
+            - a list of tuples containing for each channel associated
+              with this activity:
+                - a D-Bus object path for the channel object
+                - a D-Bus interface name representing the channel type
+                - an integer representing the handle type this channel
+                  communicates with, or zero
+                - an integer handle representing the contact, room or
+                  list this channel communicates with, or zero
+        """
+        conn = self._tp.get_connection()
+        # XXX add other channels as necessary
+        channels = []
+        if self._text_channel is not None:
+            channels.append((self._text_channel.object_path,
+                CHANNEL_TYPE_TEXT, HANDLE_TYPE_ROOM, self._room))
+
+        if self._tubes_channel is not None:
+            channels.append((self._tubes_channel.object_path,
+                CHANNEL_TYPE_TUBES, HANDLE_TYPE_ROOM, self._room))
+
+        return (str(conn.service_name), conn.object_path, channels)
+
+    @dbus.service.method(_ACTIVITY_INTERFACE,
                          in_signature='a{sv}', out_signature='')
     def SetProperties(self, new_props):
         """D-Bus method to update the activity's properties.
diff --git a/src/psutils.py b/src/psutils.py
index f7c6db7..630d39c 100644
--- a/src/psutils.py
+++ b/src/psutils.py
@@ -284,7 +284,7 @@ class IP4AddressMonitor(gobject.GObject):
         import commands
         (s, o) = commands.getstatusoutput("/sbin/route -n")
         if s != 0:
-            return
+            return None, None
         for line in o.split('\n'):
             fields = line.split(" ")
             if fields[0] == "0.0.0.0":
--
cgit v0.9.1