[empathy/next: 4/5] local-xmpp has been renamed local_xmpp

[Guillaume Desmottes <gdesmott src gnome org>]

commit 31abe74cff8289eb38781ddb8fc58a488ff15351
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Fri Oct 25 10:20:19 2013 +0200

    local-xmpp has been renamed local_xmpp

 libempathy-gtk/empathy-individual-store.c          |    2 +-
 .../empathy-local-xmpp-assistant-widget.c          |    4 ++--
 libempathy-gtk/empathy-roster-model-manager.c      |    2 +-
 src/empathy-accounts-common.c                      |    2 +-
 src/empathy-new-chatroom-dialog.c                  |    2 +-
 src/empathy-sanity-cleaning.c                      |    2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/libempathy-gtk/empathy-individual-store.c b/libempathy-gtk/empathy-individual-store.c
index 9b685ee..c85802b 100644
--- a/libempathy-gtk/empathy-individual-store.c
+++ b/libempathy-gtk/empathy-individual-store.c
@@ -336,7 +336,7 @@ empathy_individual_store_add_individual (EmpathyIndividualStore *self,
           protocol_name = tp_connection_get_protocol_name (connection);
         }
 
-      if (!tp_strdiff (protocol_name, "local-xmpp"))
+      if (!tp_strdiff (protocol_name, "local_xmpp"))
         {
           /* these are People Nearby */
           individual_store_get_group (self,
diff --git a/libempathy-gtk/empathy-local-xmpp-assistant-widget.c 
b/libempathy-gtk/empathy-local-xmpp-assistant-widget.c
index cb4e81d..cbfcfca 100644
--- a/libempathy-gtk/empathy-local-xmpp-assistant-widget.c
+++ b/libempathy-gtk/empathy-local-xmpp-assistant-widget.c
@@ -98,7 +98,7 @@ empathy_local_xmpp_assistant_widget_constructed (GObject *object)
       g_object_unref (pix);
     }
 
-  self->priv->settings = tpaw_account_settings_new ("salut", "local-xmpp",
+  self->priv->settings = tpaw_account_settings_new ("salut", "local_xmpp",
       NULL, _("People nearby"));
 
   account_widget = tpaw_account_widget_new_for_protocol (
@@ -230,7 +230,7 @@ empathy_local_xmpp_assistant_widget_should_create_account (
     {
       TpAccount *account = TP_ACCOUNT (l->data);
 
-      if (!tp_strdiff (tp_account_get_protocol_name (account), "local-xmpp"))
+      if (!tp_strdiff (tp_account_get_protocol_name (account), "local_xmpp"))
         {
           salut_created = TRUE;
           break;
diff --git a/libempathy-gtk/empathy-roster-model-manager.c b/libempathy-gtk/empathy-roster-model-manager.c
index e0fff03..b310df7 100644
--- a/libempathy-gtk/empathy-roster-model-manager.c
+++ b/libempathy-gtk/empathy-roster-model-manager.c
@@ -73,7 +73,7 @@ is_xmpp_local_contact (FolksIndividual *individual)
 
   connection = empathy_contact_get_connection (contact);
   protocol_name = tp_connection_get_protocol_name (connection);
-  result = !tp_strdiff (protocol_name, "local-xmpp");
+  result = !tp_strdiff (protocol_name, "local_xmpp");
   g_object_unref (contact);
 
   return result;
diff --git a/src/empathy-accounts-common.c b/src/empathy-accounts-common.c
index 1375ea8..df9e599 100644
--- a/src/empathy-accounts-common.c
+++ b/src/empathy-accounts-common.c
@@ -42,7 +42,7 @@ empathy_accounts_has_non_salut_accounts (TpAccountManager *manager)
 
   for (l = accounts ; l != NULL; l = g_list_next (l))
     {
-      if (tp_strdiff (tp_account_get_protocol_name (l->data), "local-xmpp"))
+      if (tp_strdiff (tp_account_get_protocol_name (l->data), "local_xmpp"))
         {
           ret = TRUE;
           break;
diff --git a/src/empathy-new-chatroom-dialog.c b/src/empathy-new-chatroom-dialog.c
index 9bfbfae..ce03025 100644
--- a/src/empathy-new-chatroom-dialog.c
+++ b/src/empathy-new-chatroom-dialog.c
@@ -325,7 +325,7 @@ new_chatroom_dialog_update_widgets (EmpathyNewChatroomDialog *self)
   /* hardcode here known protocols */
   if (strcmp (protocol, "jabber") == 0)
     gtk_widget_set_sensitive (self->priv->entry_server, TRUE);
-  else if (strcmp (protocol, "local-xmpp") == 0)
+  else if (strcmp (protocol, "local_xmpp") == 0)
     gtk_widget_set_sensitive (self->priv->entry_server, FALSE);
   else if (strcmp (protocol, "irc") == 0)
     gtk_widget_set_sensitive (self->priv->entry_server, FALSE);
diff --git a/src/empathy-sanity-cleaning.c b/src/empathy-sanity-cleaning.c
index 80c9514..6c01158 100644
--- a/src/empathy-sanity-cleaning.c
+++ b/src/empathy-sanity-cleaning.c
@@ -484,7 +484,7 @@ out:
 static gchar *
 dup_plugin_name_for_protocol (const gchar *protocol)
 {
-  if (!tp_strdiff (protocol, "local-xmpp"))
+  if (!tp_strdiff (protocol, "local_xmpp"))
     return g_strdup ("account-plugin-salut");
 
   return g_strdup_printf ("account-plugin-%s", protocol);