rpms/telepathy-gabble/devel telepathy-gabble-disco-fix.patch, NONE, 1.1

[Matthew Garrett]

Author: mjg59

Update of /cvs/pkgs/rpms/telepathy-gabble/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv9964

Added Files:
	telepathy-gabble-disco-fix.patch 
Log Message:
* Thu Jun 24 2010 Matthew Garrett <mjg at redhat.com> - 0.9.13-2
- telepathy-gabble-disco-fix.patch: Fix connections to some servers


telepathy-gabble-disco-fix.patch:
 src/connection.c                                   |   43 +++++++++------------
 tests/twisted/Makefile.am                          |    1 
 tests/twisted/connect/disco-error-from-bare-jid.py |only
 3 files changed, 21 insertions(+), 23 deletions(-)

--- NEW FILE telepathy-gabble-disco-fix.patch ---
diff -ur telepathy-gabble-0.9.13/src/connection.c telepathy-gabble-0.9.13.patched/src/connection.c
--- telepathy-gabble-0.9.13/src/connection.c	2010-06-14 09:57:03.000000000 -0400
+++ telepathy-gabble-0.9.13.patched/src/connection.c	2010-06-24 15:34:22.796763493 -0400
@@ -1688,29 +1688,26 @@
   NodeIter i;
 
   if (disco_error != NULL)
-    {
-      DEBUG ("Got disco error on bare jid: %s", disco_error->message);
-      return;
-    }
-
-  for (i = node_iter (result); i; i = node_iter_next (i))
-    {
-      LmMessageNode *child = node_iter_data (i);
-
-      if (!tp_strdiff (child->name, "identity"))
-        {
-          const gchar *category = lm_message_node_get_attribute (child,
-              "category");
-          const gchar *type = lm_message_node_get_attribute (child, "type");
-
-          if (!tp_strdiff (category, "pubsub") &&
-              !tp_strdiff (type, "pep"))
-            {
-              DEBUG ("Server advertises PEP support in our jid features");
-              conn->features |= GABBLE_CONNECTION_FEATURES_PEP;
-            }
-        }
-    }
+    DEBUG ("Got disco error on bare jid: %s", disco_error->message);
+  else
+    for (i = node_iter (result); i; i = node_iter_next (i))
+      {
+        LmMessageNode *child = node_iter_data (i);
+
+        if (!tp_strdiff (child->name, "identity"))
+          {
+            const gchar *category = lm_message_node_get_attribute (child,
+                "category");
+            const gchar *type = lm_message_node_get_attribute (child, "type");
+
+            if (!tp_strdiff (category, "pubsub") &&
+                !tp_strdiff (type, "pep"))
+              {
+                DEBUG ("Server advertises PEP support in our jid features");
+                conn->features |= GABBLE_CONNECTION_FEATURES_PEP;
+              }
+          }
+      }
 
   decrement_waiting_connected (conn);
 }
Only in telepathy-gabble-0.9.13.patched/tests/twisted/connect: disco-error-from-bare-jid.py
diff -ur telepathy-gabble-0.9.13/tests/twisted/Makefile.am telepathy-gabble-0.9.13.patched/tests/twisted/Makefile.am
--- telepathy-gabble-0.9.13/tests/twisted/Makefile.am	2010-06-14 12:32:18.000000000 -0400
+++ telepathy-gabble-0.9.13.patched/tests/twisted/Makefile.am	2010-06-24 15:35:05.460763492 -0400
@@ -174,6 +174,7 @@
 	file-transfer/test-send-file-wait-to-provide.py \
 	file-transfer/test-send-file-send-before-accept.py \
 	test-debug.py \
+	connect/disco-error-from-bare-jid.py \
 	connect/disconnect-timeout.py \
 	connect/test-fail.py \
 	connect/test-success.py \