noonien-d/wocky-old

wocky-old's Issues

telepathy-gabble twisted tests

I don't know why this is true, but popping the unacked stanzas cause the tests to fail.

I first tried to put a conditional in telepathy-gabble/src/im-factory.c around the call to gabble_im_factory_report_unacked but I couldn't see an easy way to get to the WockyXmppConnection object that has the is_sm_enabled call.

So I put the check in wocky-c2s-porter.c that if sm is not enabled wocky_c2s_porter_pop_unacked_stanzas immediately returns NULL and the tests pass.

I don't really like this solution, as

something else is going on. But I wanted to write down my progress.

diff --git a/wocky/wocky-c2s-porter.c b/wocky/wocky-c2s-porter.c
index 6473b4b..64cbe88 100644
--- a/wocky/wocky-c2s-porter.c
+++ b/wocky/wocky-c2s-porter.c
@@ -2335,7 +2335,11 @@ wocky_c2s_porter_pop_unacked_stanzas (WockyC2SPorter *porter)
 {
   WockyC2SPorterPrivate *priv = porter->priv;

-  if (priv->sm)
+  if (!wocky_xmpp_connection_get_sm_enabled (priv->connection))
+    {
+      return NULL;
+    }
+  else if (priv->sm)
     {
       g_warning ("wocky_sm_pop_unacked_stanza");
       return wocky_sm_pop_unacked_stanza (priv->sm);