From c2dbb8d7aa8f5753f9f12d11bf6ed551ac9ff5cb Mon Sep 17 00:00:00 2001
From: Tomeu Vizoso <tomeu.vizoso@collabora.co.uk>
Date: Tue, 10 Aug 2010 12:15:20 +0000
Subject: Call the old Activity.Invite(key) method if Activity.InviteContact is not implemented by this activity

---
diff --git a/src/jarabe/view/buddymenu.py b/src/jarabe/view/buddymenu.py
index 9305ca1..9d74aa0 100644
--- a/src/jarabe/view/buddymenu.py
+++ b/src/jarabe/view/buddymenu.py
@@ -19,6 +19,7 @@ from gettext import gettext as _
 
 import gtk
 import gconf
+import dbus
 
 from sugar.graphics.palette import Palette
 from sugar.graphics.menuitem import MenuItem
@@ -150,7 +151,16 @@ class BuddyMenu(Palette):
         activity = shell.get_model().get_active_activity()
         service = activity.get_service()
         if service:
-            service.Invite(self._buddy.props.account,
-                           self._buddy.props.contact_id)
+            try:
+                service.InviteContact(self._buddy.props.account,
+                                      self._buddy.props.contact_id)
+            except dbus.DBusException, e:
+                expected_exceptions = ['org.freedesktop.DBus.Error.UnknownMethod',
+                        'org.freedesktop.DBus.Python.NotImplementedError']
+                if e.get_dbus_name() in expected_exceptions:
+                    logging.warning('Trying deprecated Activity.Invite')
+                    service.Invite(self._buddy.props.key)
+                else:
+                    raise
         else:
             logging.error('Invite failed, activity service not ')
--
cgit v0.9.1