Move should_create_salut_account to local-xmpp-assistant-widget

https://bugzilla.gnome.org/show_bug.cgi?id=652669

diff --git a/libempathy-gtk/empathy-local-xmpp-assistant-widget.c b/libempathy-gtk/empathy-local-xmpp-assistant-widget.c
index 5cf8ce976bf72005f5d1e243e5ded3c3775e379e..5d00fd22950f26b75031eccec32ff39968cd19b3 100644 (file)
--- a/libempathy-gtk/empathy-local-xmpp-assistant-widget.c
+++ b/libempathy-gtk/empathy-local-xmpp-assistant-widget.c
@@ -280,3 +280,28 @@ empathy_local_xmpp_assistant_widget_create_account (
   empathy_account_settings_apply_async (self->priv->settings,
       apply_account_cb, NULL);
 }
+
+gboolean
+empathy_local_xmpp_assistant_widget_should_create_account (
+    TpAccountManager *manager)
+{
+  gboolean salut_created = FALSE;
+  GList *accounts, *l;
+
+  accounts = tp_account_manager_get_valid_accounts (manager);
+
+  for (l = accounts; l != NULL;  l = g_list_next (l))
+    {
+      TpAccount *account = TP_ACCOUNT (l->data);
+
+      if (!tp_strdiff (tp_account_get_protocol (account), "local-xmpp"))
+        {
+          salut_created = TRUE;
+          break;
+        }
+    }
+
+  g_list_free (accounts);
+
+  return !salut_created;
+}

diff --git a/libempathy-gtk/empathy-local-xmpp-assistant-widget.h b/libempathy-gtk/empathy-local-xmpp-assistant-widget.h
index edb9b6a40299b5f953694974a651079ec56dd4bf..996671fdccfc1a0c0018d66524f3808cdbba4d0f 100644 (file)
--- a/libempathy-gtk/empathy-local-xmpp-assistant-widget.h
+++ b/libempathy-gtk/empathy-local-xmpp-assistant-widget.h
@@ -23,6 +23,8 @@
 
 #include <gtk/gtk.h>
 
+#include <telepathy-glib/telepathy-glib.h>
+
 G_BEGIN_DECLS
 
 #define EMPATHY_TYPE_LOCAL_XMPP_ASSISTANT_WIDGET (empathy_local_xmpp_assistant_widget_get_type ())
@@ -53,6 +55,9 @@ GtkWidget * empathy_local_xmpp_assistant_widget_new (void);
 void empathy_local_xmpp_assistant_widget_create_account (
     EmpathyLocalXmppAssistantWidget *self);
 
+gboolean empathy_local_xmpp_assistant_widget_should_create_account (
+    TpAccountManager *manager);
+
 G_END_DECLS
 
 #endif /* __EMPATHY_LOCAL_XMPP_ASSISTANT_WIDGET_H__ */

diff --git a/src/empathy-account-assistant.c b/src/empathy-account-assistant.c
index e4ee048b547713dac4c318bd48e3f8c57cc095dc..00add5ed18e1d82d93781611dacfba848ddb99d8 100644 (file)
--- a/src/empathy-account-assistant.c
+++ b/src/empathy-account-assistant.c
@@ -35,6 +35,7 @@
 
 #include <libempathy-gtk/empathy-account-widget.h>
 #include <libempathy-gtk/empathy-protocol-chooser.h>
+#include <libempathy-gtk/empathy-local-xmpp-assistant-widget.h>
 #include <libempathy-gtk/empathy-ui-utils.h>
 
 #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
@@ -1174,7 +1175,7 @@ account_mgr_prepare_cb (GObject *source_object,
       return;
     }
 
-  if (!should_create_salut_account (manager))
+  if (!empathy_local_xmpp_assistant_widget_should_create_account (manager))
     {
       DEBUG ("No need to create a Salut account");
       priv->display_salut_page = FALSE;

diff --git a/src/empathy-auto-salut-account-helper.c b/src/empathy-auto-salut-account-helper.c
index 409b6936c66ef741385226b1d4c49dc98b8849f1..d22fe51d40e6ef12dc54a8b694465154a6731eba 100644 (file)
--- a/src/empathy-auto-salut-account-helper.c
+++ b/src/empathy-auto-salut-account-helper.c
@@ -38,32 +38,6 @@
 
 #include "empathy-auto-salut-account-helper.h"
 
-/* Salut account creation. The TpAccountManager first argument
- * must already be prepared when calling this function. */
-gboolean
-should_create_salut_account (TpAccountManager *manager)
-{
-  gboolean salut_created = FALSE;
-  GList *accounts, *l;
-
-  accounts = tp_account_manager_get_valid_accounts (manager);
-
-  for (l = accounts; l != NULL;  l = g_list_next (l))
-    {
-      TpAccount *account = TP_ACCOUNT (l->data);
-
-      if (!tp_strdiff (tp_account_get_protocol (account), "local-xmpp"))
-        {
-          salut_created = TRUE;
-          break;
-        }
-    }
-
-  g_list_free (accounts);
-
-  return !salut_created;
-}
-
 EmpathyAccountSettings *
 create_salut_account_settings (void)
 {

diff --git a/src/empathy-auto-salut-account-helper.h b/src/empathy-auto-salut-account-helper.h
index f0409d01d5ae90a562386221b975b038bf818d33..ad186c8404c2bab57e79e2b852c0df85c45ade00 100644 (file)
--- a/src/empathy-auto-salut-account-helper.h
+++ b/src/empathy-auto-salut-account-helper.h
@@ -29,8 +29,6 @@
 #include <libempathy/empathy-connection-managers.h>
 #include <libempathy/empathy-account-settings.h>
 
-gboolean should_create_salut_account (TpAccountManager *manager);
-
 EmpathyAccountSettings * create_salut_account_settings (void);
 
 #endif