aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXavier Claessens <xclaesse@gmail.com>2007-08-03 03:03:29 +0800
committerXavier Claessens <xclaesse@src.gnome.org>2007-08-03 03:03:29 +0800
commit85789199a1c6f455f632605b48caec13dbe0828d (patch)
tree8767223c17b2b14e28d67e093d02bd7f01c83bb1
parentaa88fc84c16a3d4b2b0a0bd5875efb963cfd3f98 (diff)
downloadgsoc2013-empathy-85789199a1c6f455f632605b48caec13dbe0828d.tar
gsoc2013-empathy-85789199a1c6f455f632605b48caec13dbe0828d.tar.gz
gsoc2013-empathy-85789199a1c6f455f632605b48caec13dbe0828d.tar.bz2
gsoc2013-empathy-85789199a1c6f455f632605b48caec13dbe0828d.tar.lz
gsoc2013-empathy-85789199a1c6f455f632605b48caec13dbe0828d.tar.xz
gsoc2013-empathy-85789199a1c6f455f632605b48caec13dbe0828d.tar.zst
gsoc2013-empathy-85789199a1c6f455f632605b48caec13dbe0828d.zip
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
-rw-r--r--ChangeLog5
-rw-r--r--libempathy-gtk/empathy-account-widget-jabber.c23
2 files changed, 5 insertions, 23 deletions
diff --git a/ChangeLog b/ChangeLog
index 8120ade2d..213e057d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
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:
* doc/libempathy-gtk/tmpl/empathy-ui-utils.sgml:
* doc/libempathy-gtk/tmpl/empathy-contact-widget.sgml:
diff --git a/libempathy-gtk/empathy-account-widget-jabber.c b/libempathy-gtk/empathy-account-widget-jabber.c
index 947da4a0e..df6870b50 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;