diff options
author | Emanuele Aina <emanuele.aina@collabora.com> | 2013-04-03 19:14:33 +0800 |
---|---|---|
committer | Marco Barisione <marco.barisione@collabora.co.uk> | 2013-08-20 18:03:04 +0800 |
commit | 42456ae2a2c758db70cc093679d05675293758cb (patch) | |
tree | 1e546367d2d44970c664f841b6834a2b8890fb8e /libempathy-gtk | |
parent | 75df7ae67b78f94dd69ac5c6ad079e3d360c8461 (diff) | |
download | gsoc2013-empathy-42456ae2a2c758db70cc093679d05675293758cb.tar gsoc2013-empathy-42456ae2a2c758db70cc093679d05675293758cb.tar.gz gsoc2013-empathy-42456ae2a2c758db70cc093679d05675293758cb.tar.bz2 gsoc2013-empathy-42456ae2a2c758db70cc093679d05675293758cb.tar.lz gsoc2013-empathy-42456ae2a2c758db70cc093679d05675293758cb.tar.xz gsoc2013-empathy-42456ae2a2c758db70cc093679d05675293758cb.tar.zst gsoc2013-empathy-42456ae2a2c758db70cc093679d05675293758cb.zip |
tp-account-widgets: Switch the symbols namespace to tpaw
The file names have been kept unchanged to keep the diff simple and will
be updated later. This makes easier to spot where the account widgets
still rely on libempathy.
https://bugzilla.gnome.org/show_bug.cgi?id=699492
Diffstat (limited to 'libempathy-gtk')
-rw-r--r-- | libempathy-gtk/empathy-local-xmpp-assistant-widget.c | 8 | ||||
-rw-r--r-- | libempathy-gtk/empathy-new-account-dialog.c | 12 |
2 files changed, 10 insertions, 10 deletions
diff --git a/libempathy-gtk/empathy-local-xmpp-assistant-widget.c b/libempathy-gtk/empathy-local-xmpp-assistant-widget.c index f0f6aefec..26d2bbf8b 100644 --- a/libempathy-gtk/empathy-local-xmpp-assistant-widget.c +++ b/libempathy-gtk/empathy-local-xmpp-assistant-widget.c @@ -54,7 +54,7 @@ empathy_local_xmpp_assistant_widget_init (EmpathyLocalXmppAssistantWidget *self) } static void -handle_apply_cb (EmpathyAccountWidget *widget_object, +handle_apply_cb (TpawAccountWidget *widget_object, gboolean is_valid, EmpathyLocalXmppAssistantWidget *self) { @@ -68,7 +68,7 @@ empathy_local_xmpp_assistant_widget_constructed (GObject *object) object; GtkWidget *w; GdkPixbuf *pix; - EmpathyAccountWidget *account_widget; + TpawAccountWidget *account_widget; gchar *markup; G_OBJECT_CLASS (empathy_local_xmpp_assistant_widget_parent_class)-> @@ -99,9 +99,9 @@ empathy_local_xmpp_assistant_widget_constructed (GObject *object) self->priv->settings = empathy_account_settings_new ("salut", "local-xmpp", NULL, _("People nearby")); - account_widget = empathy_account_widget_new_for_protocol ( + account_widget = tpaw_account_widget_new_for_protocol ( self->priv->settings, TRUE); - empathy_account_widget_hide_buttons (account_widget); + tpaw_account_widget_hide_buttons (account_widget); g_signal_connect (account_widget, "handle-apply", G_CALLBACK (handle_apply_cb), self); diff --git a/libempathy-gtk/empathy-new-account-dialog.c b/libempathy-gtk/empathy-new-account-dialog.c index 6d13d15e3..b26423f91 100644 --- a/libempathy-gtk/empathy-new-account-dialog.c +++ b/libempathy-gtk/empathy-new-account-dialog.c @@ -34,7 +34,7 @@ G_DEFINE_TYPE (EmpathyNewAccountDialog, empathy_new_account_dialog, \ struct _EmpathyNewAccountDialogPrivate { GtkWidget *chooser; - EmpathyAccountWidget *current_account_widget; + TpawAccountWidget *current_account_widget; GtkWidget *main_vbox; GtkWidget *connect_button; @@ -42,7 +42,7 @@ struct _EmpathyNewAccountDialogPrivate }; static void -close_cb (EmpathyAccountWidget *widget, +close_cb (TpawAccountWidget *widget, GtkResponseType response, EmpathyNewAccountDialog *self) { @@ -54,7 +54,7 @@ protocol_changed_cb (GtkComboBox *chooser, EmpathyNewAccountDialog *self) { EmpathyAccountSettings *settings; - EmpathyAccountWidget *account_widget; + TpawAccountWidget *account_widget; gchar *password = NULL, *account = NULL; settings = empathy_protocol_chooser_create_account_settings ( @@ -75,7 +75,7 @@ protocol_changed_cb (GtkComboBox *chooser, 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, TRUE); if (self->priv->current_account_widget != NULL) { @@ -95,13 +95,13 @@ protocol_changed_cb (GtkComboBox *chooser, /* 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); } |