[empathy] accounts-dialog: display the import dialog if there is no account
- From: Guillaume Desmottes <gdesmott src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [empathy] accounts-dialog: display the import dialog if there is no account
- Date: Thu, 16 Feb 2012 16:43:48 +0000 (UTC)
commit 692672af8d6a30c6550571a424b4546a0dea98f7
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date: Wed Feb 15 15:28:18 2012 +0100
accounts-dialog: display the import dialog if there is no account
This is the first step of merging the accounts-dialog and assistant.
https://bugzilla.gnome.org/show_bug.cgi?id=652669
src/empathy-accounts-dialog.c | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 deletions(-)
---
diff --git a/src/empathy-accounts-dialog.c b/src/empathy-accounts-dialog.c
index 6c452b6..934e498 100644
--- a/src/empathy-accounts-dialog.c
+++ b/src/empathy-accounts-dialog.c
@@ -53,6 +53,7 @@
#include <libempathy-gtk/empathy-images.h>
#include <libempathy-gtk/empathy-new-account-dialog.h>
+#include "empathy-accounts-common.h"
#include "empathy-accounts-dialog.h"
#include "empathy-import-dialog.h"
#include "empathy-import-utils.h"
@@ -2053,6 +2054,20 @@ accounts_dialog_set_selected_account (EmpathyAccountsDialog *dialog,
}
static void
+maybe_show_import_dialog (EmpathyAccountsDialog *self)
+{
+ EmpathyAccountsDialogPriv *priv = GET_PRIV (self);
+
+ if (empathy_accounts_has_non_salut_accounts (priv->account_manager))
+ return;
+
+ if (!empathy_import_accounts_to_import ())
+ return;
+
+ display_import_dialog (self);
+}
+
+static void
finished_loading (EmpathyAccountsDialog *self)
{
EmpathyAccountsDialogPriv *priv = GET_PRIV (self);
@@ -2073,6 +2088,8 @@ finished_loading (EmpathyAccountsDialog *self)
gtk_spinner_stop (GTK_SPINNER (priv->spinner));
gtk_notebook_set_current_page (GTK_NOTEBOOK (priv->notebook_account),
NOTEBOOK_PAGE_ACCOUNT);
+
+ maybe_show_import_dialog (self);
}
static void
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]