Merge branch 'upstream'

5 files changed, 27 insertions, 17 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 b/configure
index 61a012b..db3e83d 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for Sugar Presence Service 0.81.1.
+# Generated by GNU Autoconf 2.61 for Sugar Presence Service 0.81.2.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
 # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -572,8 +572,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='Sugar Presence Service'
 PACKAGE_TARNAME='sugar-presence-service'
-PACKAGE_VERSION='0.81.1'
-PACKAGE_STRING='Sugar Presence Service 0.81.1'
+PACKAGE_VERSION='0.81.2'
+PACKAGE_STRING='Sugar Presence Service 0.81.2'
 PACKAGE_BUGREPORT=''
 
 ac_unique_file="src/sugar-presence-service.in"
@@ -1152,7 +1152,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures Sugar Presence Service 0.81.1 to adapt to many kinds of systems.
+\`configure' configures Sugar Presence Service 0.81.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1218,7 +1218,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of Sugar Presence Service 0.81.1:";;
+     short | recursive ) echo "Configuration of Sugar Presence Service 0.81.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1282,7 +1282,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-Sugar Presence Service configure 0.81.1
+Sugar Presence Service configure 0.81.2
 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1296,7 +1296,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by Sugar Presence Service $as_me 0.81.1, which was
+It was created by Sugar Presence Service $as_me 0.81.2, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
@@ -1972,7 +1972,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='sugar-presence-service'
- VERSION='0.81.1'
+ VERSION='0.81.2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2686,7 +2686,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by Sugar Presence Service $as_me 0.81.1, which was
+This file was extended by Sugar Presence Service $as_me 0.81.2, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -2729,7 +2729,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-Sugar Presence Service config.status 0.81.1
+Sugar Presence Service config.status 0.81.2
 configured by $0, generated by GNU Autoconf 2.61,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
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):