[telepathy-gabble/master] Fall back to stun.telepathy.im not stun.ccu

[Will Thompson]

---
 src/connection.h                    |    2 +-
 tests/twisted/jingle/stun-server.py |    4 ++--
 tests/twisted/main-debug.c          |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/connection.h b/src/connection.h
index f744924..f99c243 100644
--- a/src/connection.h
+++ b/src/connection.h
@@ -45,7 +45,7 @@ G_BEGIN_DECLS
 /* Default parameters for optional parameters */
 #define GABBLE_PARAMS_DEFAULT_HTTPS_PROXY_PORT           443
 #define GABBLE_PARAMS_DEFAULT_STUN_PORT                  3478
-#define GABBLE_PARAMS_DEFAULT_FALLBACK_STUN_SERVER       "stun.collabora.co.uk"
+#define GABBLE_PARAMS_DEFAULT_FALLBACK_STUN_SERVER       "stun.telepathy.im"
 #define GABBLE_PARAMS_DEFAULT_SOCKS5_PROXIES             { NULL }
 
 
diff --git a/tests/twisted/jingle/stun-server.py b/tests/twisted/jingle/stun-server.py
index d921d0b..19d53e8 100644
--- a/tests/twisted/jingle/stun-server.py
+++ b/tests/twisted/jingle/stun-server.py
@@ -101,9 +101,9 @@ def test(q, bus, conn, stream,
 
     if expected_stun_server == None:
         # If there is no stun server set then gabble should fallback on the
-        # default fallback stunserver (stun.collabora.co.uk)
+        # default fallback stunserver (stun.telepathy.im)
         # This test uses the test-resolver which is set to
-        # have 'stun.collabora.co.uk' resolve to '6.7.8.9'
+        # have 'stun.telepathy.im' resolve to '6.7.8.9'
         expected_stun_server = '6.7.8.9'
         expected_stun_port = 3478
 
diff --git a/tests/twisted/main-debug.c b/tests/twisted/main-debug.c
index c802f91..10771ec 100644
--- a/tests/twisted/main-debug.c
+++ b/tests/twisted/main-debug.c
@@ -94,7 +94,7 @@ main (int argc,
   test_resolver_add_A (TEST_RESOLVER (kludged),
       "localhost", "127.0.0.1");
   test_resolver_add_A (TEST_RESOLVER (kludged),
-      "stun.collabora.co.uk", "6.7.8.9");
+      "stun.telepathy.im", "6.7.8.9");
 
   gabble_jingle_factory_set_test_mode ();
 
-- 
1.5.6.5