aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy-gtk
diff options
context:
space:
mode:
authorXavier Claessens <xclaesse@gmail.com>2007-08-25 05:24:01 +0800
committerXavier Claessens <xclaesse@src.gnome.org>2007-08-25 05:24:01 +0800
commitfac0f3d315c75175abd27f348bf8ce04c3bb9a58 (patch)
tree0c31a04bcda69115e49db252c27b58f3e2dd0376 /libempathy-gtk
parent8cbc5f2429a0160c79c55efac222b51982b50640 (diff)
downloadgsoc2013-empathy-fac0f3d315c75175abd27f348bf8ce04c3bb9a58.tar
gsoc2013-empathy-fac0f3d315c75175abd27f348bf8ce04c3bb9a58.tar.gz
gsoc2013-empathy-fac0f3d315c75175abd27f348bf8ce04c3bb9a58.tar.bz2
gsoc2013-empathy-fac0f3d315c75175abd27f348bf8ce04c3bb9a58.tar.lz
gsoc2013-empathy-fac0f3d315c75175abd27f348bf8ce04c3bb9a58.tar.xz
gsoc2013-empathy-fac0f3d315c75175abd27f348bf8ce04c3bb9a58.tar.zst
gsoc2013-empathy-fac0f3d315c75175abd27f348bf8ce04c3bb9a58.zip
Salut's protocol name is going to change to local-xmpp. Fixes bug #469638
2007-08-24 Xavier Claessens <xclaesse@gmail.com> * libempathy-gtk/empathy-new-chatroom-dialog.c: * libempathy-gtk/empathy-contact-widget.c: * libempathy-gtk/empathy-accounts-dialog.c: * libempathy/empathy-tp-contact-list.c: * data/salut.profile: Salut's protocol name is going to change to local-xmpp. Fixes bug #469638 (Sjoerd Simons) svn path=/trunk/; revision=270
Diffstat (limited to 'libempathy-gtk')
-rw-r--r--libempathy-gtk/empathy-accounts-dialog.c2
-rw-r--r--libempathy-gtk/empathy-contact-widget.c5
-rw-r--r--libempathy-gtk/empathy-new-chatroom-dialog.c2
3 files changed, 4 insertions, 5 deletions
diff --git a/libempathy-gtk/empathy-accounts-dialog.c b/libempathy-gtk/empathy-accounts-dialog.c
index 3f2911972..e8a87d173 100644
--- a/libempathy-gtk/empathy-accounts-dialog.c
+++ b/libempathy-gtk/empathy-accounts-dialog.c
@@ -288,7 +288,7 @@ accounts_dialog_update_account (EmpathyAccountsDialog *dialog,
dialog ->settings_widget =
empathy_account_widget_msn_new (account);
}
- else if (!empathy_strdiff (config_ui, "salut")) {
+ else if (!empathy_strdiff (config_ui, "local-xmpp")) {
dialog->settings_widget =
empathy_account_widget_salut_new (account);
}
diff --git a/libempathy-gtk/empathy-contact-widget.c b/libempathy-gtk/empathy-contact-widget.c
index df780b84c..5c8f6d3d8 100644
--- a/libempathy-gtk/empathy-contact-widget.c
+++ b/libempathy-gtk/empathy-contact-widget.c
@@ -293,10 +293,9 @@ contact_widget_can_add_contact_to_account (McAccount *account,
profile = mc_account_get_profile (account);
protocol_name = mc_profile_get_protocol_name (profile);
- if (strcmp (protocol_name, "salut") == 0) {
+ if (strcmp (protocol_name, "local-xmpp") == 0) {
/* We can't add accounts to a XMPP LL connection
- * FIXME: We should take that information from the profile
- * to not hardcode the protocol name
+ * FIXME: We should inspect the flags of the contact list group interface
*/
g_object_unref (profile);
return FALSE;
diff --git a/libempathy-gtk/empathy-new-chatroom-dialog.c b/libempathy-gtk/empathy-new-chatroom-dialog.c
index 7b5adc011..75a52fa6f 100644
--- a/libempathy-gtk/empathy-new-chatroom-dialog.c
+++ b/libempathy-gtk/empathy-new-chatroom-dialog.c
@@ -314,7 +314,7 @@ new_chatroom_dialog_update_widgets (EmpathyNewChatroomDialog *dialog)
gtk_widget_show (dialog->vbox_browse);
}
- else if (strcmp (protocol, "salut") == 0) {
+ else if (strcmp (protocol, "local-xmpp") == 0) {
gtk_widget_set_sensitive (dialog->entry_server, FALSE);
gtk_widget_show (dialog->vbox_browse);
}