rpms/empathy/devel 0001-hardcode-facebook-server-to-workaround-SRV-lookup-is.patch, NONE, 1.1 empathy.spec, 1.108, 1.109

[Brian Pepple]

Author: bpepple

Update of /cvs/pkgs/rpms/empathy/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv28871

Modified Files:
	empathy.spec 
Added Files:
	0001-hardcode-facebook-server-to-workaround-SRV-lookup-is.patch 
Log Message:
* Thu Jun  3 2010 Brian Pepple <bpepple at fedoraproject.org> - 2.31.2-2
- Backport patch to fix facebook server error. (#595925)


0001-hardcode-facebook-server-to-workaround-SRV-lookup-is.patch:
 empathy-account-assistant.c |    3 +++
 empathy-accounts-dialog.c   |    4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)

--- NEW FILE 0001-hardcode-facebook-server-to-workaround-SRV-lookup-is.patch ---
>From b8bd45099ed48decb876233cab1f2df217abc323 Mon Sep 17 00:00:00 2001
From: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
Date: Tue, 25 May 2010 11:23:08 +0200
Subject: [PATCH] hardcode facebook server to workaround SRV lookup issues

---
 src/empathy-account-assistant.c |    3 +++
 src/empathy-accounts-dialog.c   |    3 +++
 2 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/src/empathy-account-assistant.c b/src/empathy-account-assistant.c
index 796f565..a8a77e3 100644
--- a/src/empathy-account-assistant.c
+++ b/src/empathy-account-assistant.c
@@ -428,6 +428,9 @@ account_assistant_protocol_changed_cb (GtkComboBox *chooser,
     {
       empathy_account_settings_set_icon_name_async (settings, "im-facebook",
         NULL, NULL);
+
+      empathy_account_settings_set_string (settings, "server",
+          "chat.facebook.com");
     }
 
   if (priv->first_resp == RESPONSE_CREATE_ACCOUNT)
diff --git a/src/empathy-accounts-dialog.c b/src/empathy-accounts-dialog.c
index 3d8aed9..649df9d 100644
--- a/src/empathy-accounts-dialog.c
+++ b/src/empathy-accounts-dialog.c
@@ -594,6 +594,9 @@ accounts_dialog_setup_ui_to_add_account (EmpathyAccountsDialog *dialog)
     {
       empathy_account_settings_set_icon_name_async (settings, "im-facebook",
           NULL, NULL);
+
+      empathy_account_settings_set_string (settings, "server",
+          "chat.facebook.com");
     }
 
   accounts_dialog_add (dialog, settings);
-- 
1.7.0.1



Index: empathy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/devel/empathy.spec,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -p -r1.108 -r1.109
--- empathy.spec	28 May 2010 17:23:32 -0000	1.108
+++ empathy.spec	4 Jun 2010 01:52:35 -0000	1.109
@@ -12,7 +12,7 @@
 
 Name:		empathy
 Version:	2.31.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Instant Messaging Client for GNOME
 
 Group:		Applications/Communications
@@ -21,6 +21,7 @@ URL:		http://live.gnome.org/Empathy
 
 Source0:	http://download.gnome.org/sources/%{name}/2.31/%{name}-%{version}.tar.bz2
 Source1:	%{name}-README.ConnectionManagers
+Patch0:		0001-hardcode-facebook-server-to-workaround-SRV-lookup-is.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -84,6 +85,7 @@ It is built on top of the Telepathy fram
 
 %prep
 %setup -q
+%patch0 -p1 -b .facebook
 # force these to be regenerated
 rm data/empathy.desktop
 rm data/empathy.schemas
@@ -157,6 +159,9 @@ fi
 %{_mandir}/man1/empathy*.1.gz
 
 %changelog
+* Thu Jun  3 2010 Brian Pepple <bpepple at fedoraproject.org> - 2.31.2-2
+- Backport patch to fix facebook server error. (#595925)
+
 * Fri May 28 2010 Matthias Clasen <mclasen at redhat.com> - 2.31.2-1
 - Update to 2.31.2
 - drop presence-icon patch, handled upstream (partially)