From: Xavier Claessens <xclaesse@gmail.com>
Date: Thu, 2 Aug 2007 19:03:29 +0000 (+0000)
Subject: Do not try to guess the Jabber server from the jid, gabble does that for
X-Git-Url: https://git.0d.be/?p=empathy.git;a=commitdiff_plain;h=85789199a1c6f455f632605b48caec13dbe0828d

Do not try to guess the Jabber server from the jid, gabble does that for

2007-08-02 Xavier Claessens  <xclaesse@gmail.com>

	* libempathy-gtk/empathy-account-widget-jabber.c: Do not try to guess
	the Jabber server from the jid, gabble does that for us.


svn path=/trunk/; revision=228
---

diff --git a/ChangeLog b/ChangeLog
index 8120ade2..213e057d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-08-02 Xavier Claessens  <xclaesse@gmail.com>
+
+	* libempathy-gtk/empathy-account-widget-jabber.c: Do not try to guess
+	the Jabber server from the jid, gabble does that for us.
+
 2007-08-02 Xavier Claessens  <xclaesse@gmail.com>
 
 	* doc/libempathy-gtk/tmpl/empathy-account-chooser.sgml:
diff --git a/libempathy-gtk/empathy-account-widget-jabber.c b/libempathy-gtk/empathy-account-widget-jabber.c
index 947da4a0..df6870b5 100644
--- a/libempathy-gtk/empathy-account-widget-jabber.c
+++ b/libempathy-gtk/empathy-account-widget-jabber.c
@@ -100,29 +100,6 @@ account_widget_jabber_entry_focus_cb (GtkWidget                 *widget,
 		g_free (value);
 	} else {
 		mc_account_set_param_string (settings->account, param, str);
-
-		if (widget == settings->entry_id) {
-			McProfile   *profile;
-			const gchar *profile_name;
-
-			/* Try to guess the server if we are using the vanilla
-			 * jabber profile. We don't have to do that with
-			 * gtalk profile. */
-			profile = mc_account_get_profile (settings->account);
-			profile_name = mc_profile_get_unique_name (profile);
-			if (strcmp (profile_name, "jabber") == 0) {
-				gchar *server;
-
-				server = strstr (str, "@");
-				if (server != NULL) {
-					/* skip the leading @ */
-					server++;
-					gtk_entry_set_text (GTK_ENTRY (settings->entry_server), server);
-					mc_account_set_param_string (settings->account, "server", server);
-				}
-			}
-			g_object_unref (profile);
-		}
 	}
 
 	return FALSE;