From f0ed5dde5c702af14acc3d4aa1da78e164c88d84 Mon Sep 17 00:00:00 2001
From: Will Thompson <will.thompson@collabora.co.uk>
Date: Fri, 28 Jan 2011 16:55:11 +0000
Subject: [PATCH] Use conference.telepathy.im as the default MUC server

Fixes: <https://bugs.freedesktop.org//show_bug.cgi?id=32815>
---
 NEWS           |    5 +++++
 src/protocol.c |    4 +++-
 2 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/NEWS b/NEWS
index 1fca175..ca74da0 100644
--- a/NEWS
+++ b/NEWS
@@ -12,6 +12,11 @@ Fixes:
 
 Enhancements:
 
+• fd.o#32815: fallback-conference-server now defaults to
+  conference.telepathy.im. Thus, if the user's server doesn't have a
+  conference component configured, upgrading a 1-1 chat into an ad-hoc
+  conference still works.
+
 telepathy-gabble 0.11.6 (2011-01-27)
 ====================================
 
diff --git a/src/protocol.c b/src/protocol.c
index 03eefa7..9530cba 100644
--- a/src/protocol.c
+++ b/src/protocol.c
@@ -99,7 +99,9 @@ static TpCMParamSpec jabber_params[] = {
     tp_cm_param_filter_uint_nonzero, NULL },
 
   { "fallback-conference-server", DBUS_TYPE_STRING_AS_STRING, G_TYPE_STRING,
-    0, NULL, 0 /* unused */,
+    TP_CONN_MGR_PARAM_FLAG_HAS_DEFAULT,
+    "conference.telepathy.im",
+    0 /* offset, not used */,
     /* FIXME: validate properly */
     tp_cm_param_filter_string_nonempty, NULL },
 
-- 
1.7.2.3