aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2012-03-15 17:25:24 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2012-03-15 17:38:42 +0800
commit94520441d0d22f6fc8361770f66c1a1ac27e011c (patch)
tree7f021675fd369a953fed80b2e39db8530c79ccd2
parentfe2da138c66af8521013de1c7f4aa97053b87456 (diff)
downloadgsoc2013-empathy-94520441d0d22f6fc8361770f66c1a1ac27e011c.tar
gsoc2013-empathy-94520441d0d22f6fc8361770f66c1a1ac27e011c.tar.gz
gsoc2013-empathy-94520441d0d22f6fc8361770f66c1a1ac27e011c.tar.bz2
gsoc2013-empathy-94520441d0d22f6fc8361770f66c1a1ac27e011c.tar.lz
gsoc2013-empathy-94520441d0d22f6fc8361770f66c1a1ac27e011c.tar.xz
gsoc2013-empathy-94520441d0d22f6fc8361770f66c1a1ac27e011c.tar.zst
gsoc2013-empathy-94520441d0d22f6fc8361770f66c1a1ac27e011c.zip
Set chat.facebook.com:443 as fallback server
Some nasty firewalls block the port 5222, Facebook servers allow connection to the port 443 as a fallback in this case. https://bugzilla.gnome.org/show_bug.cgi?id=672120
-rw-r--r--goa-mc-plugin/mcp-account-manager-goa.c2
-rw-r--r--libempathy-gtk/empathy-protocol-chooser.c6
2 files changed, 8 insertions, 0 deletions
diff --git a/goa-mc-plugin/mcp-account-manager-goa.c b/goa-mc-plugin/mcp-account-manager-goa.c
index 280485dd6..af82e4727 100644
--- a/goa-mc-plugin/mcp-account-manager-goa.c
+++ b/goa-mc-plugin/mcp-account-manager-goa.c
@@ -137,6 +137,8 @@ get_tp_parameters (GoaAccount *account)
PARAM ("param-account", "chat.facebook.com");
PARAM ("param-server", "chat.facebook.com");
PARAM ("param-require-encryption", "true");
+ PARAM ("param-fallback-servers",
+ "chat.facebook.com:443");
}
else if (!tp_strdiff (type, "windows_live"))
{
diff --git a/libempathy-gtk/empathy-protocol-chooser.c b/libempathy-gtk/empathy-protocol-chooser.c
index 7adacf472..5e26112ed 100644
--- a/libempathy-gtk/empathy-protocol-chooser.c
+++ b/libempathy-gtk/empathy-protocol-chooser.c
@@ -620,12 +620,18 @@ empathy_protocol_chooser_create_account_settings (EmpathyProtocolChooser *self)
}
else if (!tp_strdiff (service, "facebook"))
{
+ gchar *fallback_servers[] = {
+ "chat.facebook.com:443",
+ NULL };
+
empathy_account_settings_set_icon_name_async (settings, "im-facebook",
NULL, NULL);
empathy_account_settings_set_boolean (settings, "require-encryption",
TRUE);
empathy_account_settings_set_string (settings, "server",
"chat.facebook.com");
+ empathy_account_settings_set_strv (settings, "fallback-servers",
+ fallback_servers);
}
out: