aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rw-r--r--data/salut.profile4
-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
-rw-r--r--libempathy/empathy-tp-contact-list.c2
6 files changed, 16 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index f25c0bb3f..b81fd11da 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
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)
+
+2007-08-24 Xavier Claessens <xclaesse@gmail.com>
+
* src/empathy.c: Chech if there is already a Salut account before
creating a new one and add more debug messages.
diff --git a/data/salut.profile b/data/salut.profile
index ec6b3f5fb..bd8baa350 100644
--- a/data/salut.profile
+++ b/data/salut.profile
@@ -1,8 +1,8 @@
[Profile]
Manager=salut
-Protocol=salut
+Protocol=local-xmpp
DisplayName=Salut
IconName = empathy-proto-salut
-ConfigurationUI = salut
+ConfigurationUI = local-xmpp
Capabilities = chat-p2p, chat-room, chat-room-list, voice-p2p, supports-avatars, supports-alias
SupportedPresences = offline,available,away,extended-away,do-not-disturb
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);
}
diff --git a/libempathy/empathy-tp-contact-list.c b/libempathy/empathy-tp-contact-list.c
index 70cd10a1e..a5c54b74e 100644
--- a/libempathy/empathy-tp-contact-list.c
+++ b/libempathy/empathy-tp-contact-list.c
@@ -350,7 +350,7 @@ empathy_tp_contact_list_new (McAccount *account)
* FIXME: Default group should be an information in the profile */
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) {
priv->protocol_group = _("People nearby");
}
g_object_unref (profile);