diff options
| -rw-r--r-- | src/empathy-accounts-common.c | 3 | ||||
| -rw-r--r-- | src/empathy-accounts-common.h | 1 | ||||
| -rw-r--r-- | src/empathy-accounts.c | 9 |
3 files changed, 3 insertions, 10 deletions
diff --git a/src/empathy-accounts-common.c b/src/empathy-accounts-common.c index 88d14c321..9704b2e9b 100644 --- a/src/empathy-accounts-common.c +++ b/src/empathy-accounts-common.c @@ -135,13 +135,12 @@ out: 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) || + if (empathy_accounts_has_non_salut_accounts (manager) || account != NULL) { do_show_accounts_ui (manager, account, app); diff --git a/src/empathy-accounts-common.h b/src/empathy-accounts-common.h index f9294fbd2..39d094d22 100644 --- a/src/empathy-accounts-common.h +++ b/src/empathy-accounts-common.h @@ -28,7 +28,6 @@ gboolean empathy_accounts_has_accounts (TpAccountManager *manager); void empathy_accounts_show_accounts_ui (TpAccountManager *manager, TpAccount *account, - gboolean assistant, GApplication *app); #endif /* __EMPATHY_ACCOUNTS_COMMON_H__ */ diff --git a/src/empathy-accounts.c b/src/empathy-accounts.c index e44be8162..a342f417d 100644 --- a/src/empathy-accounts.c +++ b/src/empathy-accounts.c @@ -53,7 +53,6 @@ static gboolean only_if_needed = FALSE; static gboolean hidden = FALSE; static gchar *selected_account_name = NULL; -static gboolean assistant = FALSE; static void maybe_show_accounts_ui (TpAccountManager *manager, @@ -65,7 +64,7 @@ maybe_show_accounts_ui (TpAccountManager *manager, if (only_if_needed && empathy_accounts_has_non_salut_accounts (manager)) return; - empathy_accounts_show_accounts_ui (manager, NULL, assistant, app); + empathy_accounts_show_accounts_ui (manager, NULL, app); } static TpAccount * @@ -122,7 +121,7 @@ account_manager_ready_for_accounts_cb (GObject *source_object, if (account != NULL) { - empathy_accounts_show_accounts_ui (manager, account, assistant, app); + empathy_accounts_show_accounts_ui (manager, account, app); goto out; } else @@ -190,10 +189,6 @@ local_cmdline (GApplication *app, N_("Initially select given account (eg, " "gabble/jabber/foo_40example_2eorg0)"), N_("<account-id>") }, - { "assistant", 'a', - 0, G_OPTION_ARG_NONE, &assistant, - N_("Show account assistant"), - NULL }, { NULL } }; |