#include "empathy-new-account-dialog.h"
#include <glib/gi18n-lib.h>
+#include <tp-account-widgets/tpaw-account-widget.h>
-#define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
-#include "libempathy/empathy-debug.h"
-
-#include "empathy-account-widget.h"
#include "empathy-protocol-chooser.h"
+#define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
+#include "empathy-debug.h"
+
G_DEFINE_TYPE (EmpathyNewAccountDialog, empathy_new_account_dialog, \
GTK_TYPE_DIALOG)
struct _EmpathyNewAccountDialogPrivate
{
GtkWidget *chooser;
- EmpathyAccountWidget *current_account_widget;
+ TpawAccountWidget *current_account_widget;
GtkWidget *main_vbox;
GtkWidget *connect_button;
- EmpathyAccountSettings *settings;
+ TpawAccountSettings *settings;
};
static void
-close_cb (EmpathyAccountWidget *widget,
+close_cb (TpawAccountWidget *widget,
GtkResponseType response,
EmpathyNewAccountDialog *self)
{
protocol_changed_cb (GtkComboBox *chooser,
EmpathyNewAccountDialog *self)
{
- EmpathyAccountSettings *settings;
- EmpathyAccountWidget *account_widget;
+ TpawAccountSettings *settings;
+ TpawAccountWidget *account_widget;
gchar *password = NULL, *account = NULL;
settings = empathy_protocol_chooser_create_account_settings (
/* Save "account" and "password" parameters */
if (self->priv->settings != NULL)
{
- account = empathy_account_settings_dup_string (
+ account = tpaw_account_settings_dup_string (
self->priv->settings, "account");
- password = empathy_account_settings_dup_string (
+ password = tpaw_account_settings_dup_string (
self->priv->settings, "password");
g_object_unref (self->priv->settings);
}
- account_widget = empathy_account_widget_new_for_protocol (settings, TRUE);
+ account_widget = tpaw_account_widget_new_for_protocol (settings,
+ NULL, TRUE);
if (self->priv->current_account_widget != NULL)
{
/* Restore "account" and "password" parameters in the new widget */
if (account != NULL)
{
- empathy_account_widget_set_account_param (account_widget, account);
+ tpaw_account_widget_set_account_param (account_widget, account);
g_free (account);
}
if (password != NULL)
{
- empathy_account_widget_set_password_param (account_widget, password);
+ tpaw_account_widget_set_password_param (account_widget, password);
g_free (password);
}
/* trigger show the first account widget */
protocol_changed_cb (GTK_COMBO_BOX (self->priv->chooser), self);
- gtk_window_set_title (GTK_WINDOW (self), _("Adding new account"));
+ gtk_window_set_title (GTK_WINDOW (self), _("Add new account"));
}
static void
return result;
}
-EmpathyAccountSettings *
+TpawAccountSettings *
empathy_new_account_dialog_get_settings (EmpathyNewAccountDialog *self)
{
return self->priv->settings;