[empathy] accounts-dialog: stop displaying the import dialog automatically (#631080)
- From: Guillaume Desmottes <gdesmott src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [empathy] accounts-dialog: stop displaying the import dialog automatically (#631080)
- Date: Fri, 1 Oct 2010 10:10:55 +0000 (UTC)
commit f08b753e0c8f29709390c832275290dc2934fe82
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date: Fri Oct 1 11:56:24 2010 +0200
accounts-dialog: stop displaying the import dialog automatically (#631080)
User had seen the nice assistant before so he already imported his account if
he wanted to.
src/empathy-accounts-dialog.c | 19 -------------------
1 files changed, 0 insertions(+), 19 deletions(-)
---
diff --git a/src/empathy-accounts-dialog.c b/src/empathy-accounts-dialog.c
index 55e2121..9f2f97a 100644
--- a/src/empathy-accounts-dialog.c
+++ b/src/empathy-accounts-dialog.c
@@ -39,7 +39,6 @@
#include <libempathy/empathy-utils.h>
#include <libempathy/empathy-connection-managers.h>
#include <libempathy/empathy-connectivity.h>
-#include <libempathy/empathy-gsettings.h>
#include <libempathy-gtk/empathy-ui-utils.h>
#include <libempathy-gtk/empathy-protocol-chooser.h>
@@ -2206,7 +2205,6 @@ do_constructed (GObject *object)
EmpathyAccountsDialog *dialog = EMPATHY_ACCOUNTS_DIALOG (object);
EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
GtkTreeModel *model;
- GSettings *gsettings = g_settings_new (EMPATHY_PREFS_SCHEMA);
accounts_dialog_build_ui (dialog);
accounts_dialog_model_setup (dialog);
@@ -2223,24 +2221,7 @@ do_constructed (GObject *object)
tp_account_manager_prepare_async (priv->account_manager, NULL,
accounts_dialog_manager_ready_cb, dialog);
- if (empathy_import_accounts_to_import ())
- {
- gtk_widget_show (priv->button_import);
-
- if (!g_settings_get_boolean (gsettings, EMPATHY_PREFS_IMPORT_ASKED))
- {
- GtkWidget *import_dialog;
-
- g_settings_set_boolean (gsettings, EMPATHY_PREFS_IMPORT_ASKED, TRUE);
- import_dialog = empathy_import_dialog_new (GTK_WINDOW (dialog),
- FALSE);
- gtk_widget_show (import_dialog);
- }
- }
-
priv->connectivity = empathy_connectivity_dup_singleton ();
-
- g_object_unref (gsettings);
}
static void
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]