* Travis Reitter <travis.reitter@collabora.co.uk>
*/
-#include <config.h>
-
-#include <string.h>
-#include <stdlib.h>
-
-#include <gtk/gtk.h>
-#include <glib/gi18n-lib.h>
-
-#include <telepathy-glib/account-manager.h>
-#include <telepathy-glib/util.h>
-
-#include <libempathy/empathy-utils.h>
-#include <libempathy/empathy-connection-managers.h>
-#include <libempathy-gtk/empathy-ui-utils.h>
-
+#include "config.h"
#include "empathy-accounts-common.h"
+
#include "empathy-accounts-dialog.h"
-#include "empathy-account-assistant.h"
-#include "empathy-auto-salut-account-helper.h"
#define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
-#include <libempathy/empathy-debug.h>
+#include "empathy-debug.h"
gboolean
empathy_accounts_has_non_salut_accounts (TpAccountManager *manager)
gboolean ret = FALSE;
GList *accounts, *l;
- accounts = tp_account_manager_get_valid_accounts (manager);
+ accounts = tp_account_manager_dup_valid_accounts (manager);
for (l = accounts ; l != NULL; l = g_list_next (l))
{
- if (tp_strdiff (tp_account_get_protocol (l->data), "local-xmpp"))
+ if (tp_strdiff (tp_account_get_protocol_name (l->data), "local-xmpp"))
{
ret = TRUE;
break;
}
}
- g_list_free (accounts);
+ g_list_free_full (accounts, g_object_unref);
return ret;
}
GList *accounts;
gboolean has_accounts;
- accounts = tp_account_manager_get_valid_accounts (manager);
+ accounts = tp_account_manager_dup_valid_accounts (manager);
has_accounts = (accounts != NULL);
- g_list_free (accounts);
+ g_list_free_full (accounts, g_object_unref);
return has_accounts;
}
-static void
-do_show_accounts_ui (TpAccountManager *manager,
+void
+empathy_accounts_show_accounts_ui (TpAccountManager *manager,
TpAccount *account,
GApplication *app)
{
static GtkWidget *accounts_window = NULL;
+ g_return_if_fail (TP_IS_ACCOUNT_MANAGER (manager));
+ g_return_if_fail (!account || TP_IS_ACCOUNT (account));
+
if (accounts_window == NULL)
{
accounts_window = empathy_accounts_dialog_show (NULL, account);
gtk_window_present (GTK_WINDOW (accounts_window));
}
-
-static GtkWidget *
-show_account_assistant (EmpathyConnectionManagers *connection_mgrs,
- GApplication *app)
-{
- GtkWidget *assistant;
-
- assistant = empathy_account_assistant_show (NULL, connection_mgrs);
-
- gtk_application_add_window (GTK_APPLICATION (app), GTK_WINDOW (assistant));
-
- return assistant;
-}
-
-static void
-connection_managers_prepare_for_accounts (GObject *source,
- GAsyncResult *result,
- gpointer user_data)
-{
- EmpathyConnectionManagers *cm_mgr = EMPATHY_CONNECTION_MANAGERS (source);
- GApplication *app = user_data;
-
- if (!empathy_connection_managers_prepare_finish (cm_mgr, result, NULL))
- goto out;
-
- show_account_assistant (cm_mgr, app);
- DEBUG ("would show the account assistant");
-
-out:
- g_object_unref (cm_mgr);
- g_application_release (app);
-}
-
-void
-empathy_accounts_show_accounts_ui (TpAccountManager *manager,
- TpAccount *account,
- gboolean assistant,
- GApplication *app)
-{
- g_return_if_fail (TP_IS_ACCOUNT_MANAGER (manager));
- g_return_if_fail (!account || TP_IS_ACCOUNT (account));
-
- if ((empathy_accounts_has_non_salut_accounts (manager) && !assistant) ||
- account != NULL)
- {
- do_show_accounts_ui (manager, account, app);
- }
- else
- {
- EmpathyConnectionManagers *cm_mgr;
-
- cm_mgr = empathy_connection_managers_dup_singleton ();
-
- /* Hold the application while preparing cm_mgr */
- g_application_hold (app);
-
- empathy_connection_managers_prepare_async (cm_mgr,
- connection_managers_prepare_for_accounts, app);
- }
-}