diff options
| author | xclaesse <xclaesse@4ee84921-47dd-4033-b63a-18d7a039a3e4> | 2007-07-29 05:12:28 +0800 |
|---|---|---|
| committer | xclaesse <xclaesse@4ee84921-47dd-4033-b63a-18d7a039a3e4> | 2007-07-29 05:12:28 +0800 |
| commit | b6eacea820d31caf9d7604229bee7a0ddcdc9a70 (patch) | |
| tree | 12f4b1455507205ba607354280da6f6e346f5b19 /libempathy-gtk | |
| parent | 753896e994bb35073f4df7cfcfdb34360b820efb (diff) | |
| download | gsoc2013-empathy-b6eacea820d31caf9d7604229bee7a0ddcdc9a70.tar gsoc2013-empathy-b6eacea820d31caf9d7604229bee7a0ddcdc9a70.tar.gz gsoc2013-empathy-b6eacea820d31caf9d7604229bee7a0ddcdc9a70.tar.bz2 gsoc2013-empathy-b6eacea820d31caf9d7604229bee7a0ddcdc9a70.tar.lz gsoc2013-empathy-b6eacea820d31caf9d7604229bee7a0ddcdc9a70.tar.xz gsoc2013-empathy-b6eacea820d31caf9d7604229bee7a0ddcdc9a70.tar.zst gsoc2013-empathy-b6eacea820d31caf9d7604229bee7a0ddcdc9a70.zip | |
2007-07-28 Xavier Claessens <xclaesse@gmail.com>
* libempathy-gtk/empathy-account-widget-jabber.c: Try to guess the
server from the jid only if we are using the jabber profile. When we
guessed a server don't forget to set the "server" McAccount param,
setting the entry's text is not enough.
git-svn-id: svn+ssh://svn.gnome.org/svn/empathy/trunk@209 4ee84921-47dd-4033-b63a-18d7a039a3e4
Diffstat (limited to 'libempathy-gtk')
| -rw-r--r-- | libempathy-gtk/empathy-account-widget-jabber.c | 27 |
1 files changed, 19 insertions, 8 deletions
diff --git a/libempathy-gtk/empathy-account-widget-jabber.c b/libempathy-gtk/empathy-account-widget-jabber.c index a4db08fdf..947da4a0e 100644 --- a/libempathy-gtk/empathy-account-widget-jabber.c +++ b/libempathy-gtk/empathy-account-widget-jabber.c @@ -102,15 +102,26 @@ account_widget_jabber_entry_focus_cb (GtkWidget *widget, mc_account_set_param_string (settings->account, param, str); if (widget == settings->entry_id) { - /* Try to guess the server */ - gchar *server; - - server = strstr (str, "@"); - if (server != NULL) { - /* skip the leading @ */ - server++; - gtk_entry_set_text (GTK_ENTRY (settings->entry_server), server); + 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); } } |