Merge branch 'upstream-git' into upstream

Conflicts (merged manually):

	NEWS
	configure.ac

4 files changed, 17 insertions, 7 deletions

diff --git a/NEWS b/NEWS
index 2cbd6a2..fb43853 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,13 @@
+sugar-presence-service 0.81.2 (2008-06-20)
+==========================================
+
+The "Features on ice" release.
+
+Enhancements:
+
+* add a channel type arg to the PrivateInvitation signal
+
+
 sugar-presence-service 0.81.1 (2008-05-21)
 ==========================================
 
diff --git a/configure.ac b/configure.ac
index 40aa7a9..6c3f5e4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([Sugar Presence Service],[0.81.1],[],[sugar-presence-service])
+AC_INIT([Sugar Presence Service],[0.81.2],[],[sugar-presence-service])
 
 AC_PREREQ([2.59])
 
diff --git a/src/presenceservice.py b/src/presenceservice.py
index 0c51f61..88e2904 100644
--- a/src/presenceservice.py
+++ b/src/presenceservice.py
@@ -568,10 +568,10 @@ class PresenceService(ExportedGObject):
             self.ActivityInvitation(activity.object_path(),
                                     buddy.object_path(), message)
 
-    def _private_invitation(self, tp, chan_path):
+    def _private_invitation(self, tp, chan_path, chan_type):
         conn = tp.get_connection()
         self.PrivateInvitation(str(conn.service_name), conn.object_path,
-                               chan_path)
+                               chan_path, chan_type)
 
     def _want_to_connect(self, plugin):
         if plugin == self._ll_plugin:
@@ -606,8 +606,8 @@ class PresenceService(ExportedGObject):
     def ActivityInvitation(self, activity, buddy, message):
         pass
 
-    @dbus.service.signal(PRESENCE_INTERFACE, signature="soo")
-    def PrivateInvitation(self, bus_name, connection, channel):
+    @dbus.service.signal(PRESENCE_INTERFACE, signature="soos")
+    def PrivateInvitation(self, bus_name, connection, channel, chan_type):
         pass
 
     @dbus.service.method(PRESENCE_INTERFACE, in_signature='',
diff --git a/src/telepathy_plugin.py b/src/telepathy_plugin.py
index c85bdd1..2042111 100644
--- a/src/telepathy_plugin.py
+++ b/src/telepathy_plugin.py
@@ -74,7 +74,7 @@ class TelepathyPlugin(gobject.GObject):
             # We were invited to join a chat or a media call
             # args:
             #   channel object path
-            (gobject.SIGNAL_RUN_FIRST, None, [object]),
+            (gobject.SIGNAL_RUN_FIRST, None, [object, str]),
         'want-to-connect':
             # The TelepathyPlugin wants to connect. presenceservice.py will
             # call the start() method if that's OK with its policy.
@@ -477,7 +477,7 @@ class TelepathyPlugin(gobject.GObject):
         elif (handle_type == HANDLE_TYPE_CONTACT and
               channel_type in (CHANNEL_TYPE_TEXT,
                                CHANNEL_TYPE_STREAMED_MEDIA)):
-            self.emit("private-invitation", object_path)
+            self.emit("private-invitation", object_path, channel_type)
 
         elif (handle_type == HANDLE_TYPE_LIST and
               channel_type == CHANNEL_TYPE_CONTACT_LIST):