[telepathy-gabble/master] Sync Wocky

Guillaume Desmottes guillaume.desmottes at collabora.co.uk
Thu Sep 24 10:26:26 PDT 2009


WOCKY_PORTER_ERROR_FORCE_CLOSING has been renamed to WOCKY_PORTER_ERROR_FORCIBLY_CLOSED
---
 lib/ext/wocky    |    2 +-
 src/connection.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/ext/wocky b/lib/ext/wocky
index 16ce7be..76cf917 160000
--- a/lib/ext/wocky
+++ b/lib/ext/wocky
@@ -1 +1 @@
-Subproject commit 16ce7be592b94c5f50c3ca4010f90247ef1d48f4
+Subproject commit 76cf91722c1e1826750b9e396e119caddd675311
diff --git a/src/connection.c b/src/connection.c
index 8b1612a..9940ba0 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -1829,7 +1829,7 @@ closed_cb (GObject *source,
       DEBUG ("close failed: %s", error->message);
 
       if (g_error_matches (error, WOCKY_PORTER_ERROR,
-            WOCKY_PORTER_ERROR_FORCE_CLOSING))
+            WOCKY_PORTER_ERROR_FORCIBLY_CLOSED))
         {
           /* Close operation has been aborted because a force_close operation
            * has been started. tp_base_connection_finish_shutdown will be
-- 
1.5.6.5



More information about the telepathy-commits mailing list