[Telepathy-commits] [telepathy-gabble/master] Invite Gadget to our activities only if we call Publish(True)

[Guillaume Desmottes]

---
 src/conn-olpc.c                     |    7 +++++--
 tests/twisted/olpc/gadget-invite.py |    3 ++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/conn-olpc.c b/src/conn-olpc.c
index 53dbb7f..4f9ac9c 100644
--- a/src/conn-olpc.c
+++ b/src/conn-olpc.c
@@ -1796,8 +1796,11 @@ olpc_activity_properties_set_properties (GabbleSvcOLPCActivityProperties *iface,
 
   if (!was_visible && is_visible)
     {
-      /* activity becomes visible. Invite gadget */
-      invite_gadget (conn, muc_channel);
+      if (conn->olpc_gadget_publish)
+        {
+          /* activity becomes visible. Invite gadget */
+          invite_gadget (conn, muc_channel);
+        }
     }
 
   if (was_visible || is_visible)
diff --git a/tests/twisted/olpc/gadget-invite.py b/tests/twisted/olpc/gadget-invite.py
index 3e5ccd8..7586bf1 100644
--- a/tests/twisted/olpc/gadget-invite.py
+++ b/tests/twisted/olpc/gadget-invite.py
@@ -10,7 +10,7 @@ from gabbletest import exec_test, make_result_iq, acknowledge_iq, sync_stream
 from twisted.words.xish import domish, xpath
 from twisted.words.protocols.jabber.client import IQ
 
-from util import announce_gadget
+from util import announce_gadget, gadget_publish
 import ns
 
 def join_channel(name, q, conn, stream):
@@ -59,6 +59,7 @@ def test(q, bus, conn, stream):
     simple_presence_iface = dbus.Interface(conn, 'org.freedesktop.Telepathy.Connection.Interface.SimplePresence')
 
     q.expect('dbus-signal', signal='GadgetDiscovered')
+    gadget_publish(q, stream, conn, True)
 
     # join a room
     room_handle, room_path = join_channel('myroom at conference.localhost',
-- 
1.5.6.5