1 files changed, 23 insertions, 23 deletions

diff --git a/tp-account-widgets/empathy-account-widget-irc.c b/tp-account-widgets/empathy-account-widget-irc.c
index e86cec417..417d309ce 100644
--- a/tp-account-widgets/empathy-account-widget-irc.c
+++ b/tp-account-widgets/empathy-account-widget-irc.c
@@ -28,22 +28,22 @@
 #include "empathy-debug.h"
 
 typedef struct {
-  EmpathyAccountWidget *self;
+  TpawAccountWidget *self;
 
   GtkWidget *vbox_settings;
 
   GtkWidget *network_chooser;
-} EmpathyAccountWidgetIrc;
+} TpawAccountWidgetIrc;
 
 static void
 account_widget_irc_destroy_cb (GtkWidget *widget,
-                               EmpathyAccountWidgetIrc *settings)
+                               TpawAccountWidgetIrc *settings)
 {
-  g_slice_free (EmpathyAccountWidgetIrc, settings);
+  g_slice_free (TpawAccountWidgetIrc, settings);
 }
 
 static void
-account_widget_irc_setup (EmpathyAccountWidgetIrc *settings)
+account_widget_irc_setup (TpawAccountWidgetIrc *settings)
 {
   gchar *nick = NULL;
   gchar *fullname = NULL;
@@ -79,10 +79,10 @@ account_widget_irc_setup (EmpathyAccountWidgetIrc *settings)
 }
 
 static void
-network_changed_cb (EmpathyIrcNetworkChooser *chooser,
-    EmpathyAccountWidgetIrc *settings)
+network_changed_cb (TpawIrcNetworkChooser *chooser,
+    TpawAccountWidgetIrc *settings)
 {
-  empathy_account_widget_changed (settings->self);
+  tpaw_account_widget_changed (settings->self);
 }
 
 /**
@@ -114,7 +114,7 @@ set_password_prompt_if_needed (EmpathyAccountSettings *ac_settings,
 
 static void
 entry_password_changed_cb (GtkEntry *entry,
-    EmpathyAccountWidgetIrc *settings)
+    TpawAccountWidgetIrc *settings)
 {
   const gchar *password;
   EmpathyAccountSettings *ac_settings;
@@ -128,18 +128,18 @@ entry_password_changed_cb (GtkEntry *entry,
   g_object_unref (ac_settings);
 }
 
-EmpathyIrcNetworkChooser *
-empathy_account_widget_irc_build (EmpathyAccountWidget *self,
+TpawIrcNetworkChooser *
+tpaw_account_widget_irc_build (TpawAccountWidget *self,
     const char *filename,
     GtkWidget **table_common_settings,
     GtkWidget **box)
 {
-  EmpathyAccountWidgetIrc *settings;
+  TpawAccountWidgetIrc *settings;
   EmpathyAccountSettings *ac_settings;
   GtkWidget *entry_password;
   gchar *password;
 
-  settings = g_slice_new0 (EmpathyAccountWidgetIrc);
+  settings = g_slice_new0 (TpawAccountWidgetIrc);
   settings->self = self;
 
   self->ui_details->gui = empathy_builder_get_resource (filename,
@@ -152,7 +152,7 @@ empathy_account_widget_irc_build (EmpathyAccountWidget *self,
   /* Add network chooser button */
   g_object_get (settings->self, "settings", &ac_settings, NULL);
 
-  settings->network_chooser = empathy_irc_network_chooser_new (ac_settings);
+  settings->network_chooser = tpaw_irc_network_chooser_new (ac_settings);
 
   g_signal_connect (settings->network_chooser, "changed",
       G_CALLBACK (network_changed_cb), settings);
@@ -164,7 +164,7 @@ empathy_account_widget_irc_build (EmpathyAccountWidget *self,
 
   account_widget_irc_setup (settings);
 
-  empathy_account_widget_handle_params (self,
+  tpaw_account_widget_handle_params (self,
       "entry_nick", "account",
       "entry_fullname", "fullname",
       "entry_password", "password",
@@ -194,19 +194,19 @@ empathy_account_widget_irc_build (EmpathyAccountWidget *self,
   g_signal_connect (entry_password, "changed",
       G_CALLBACK (entry_password_changed_cb), settings);
 
-  return EMPATHY_IRC_NETWORK_CHOOSER (settings->network_chooser);
+  return TPAW_IRC_NETWORK_CHOOSER (settings->network_chooser);
 }
 
-EmpathyIrcNetworkChooser *
-empathy_account_widget_irc_build_simple (EmpathyAccountWidget *self,
+TpawIrcNetworkChooser *
+tpaw_account_widget_irc_build_simple (TpawAccountWidget *self,
     const char *filename,
     GtkWidget **box)
 {
-  EmpathyAccountWidgetIrc *settings;
+  TpawAccountWidgetIrc *settings;
   EmpathyAccountSettings *ac_settings;
   GtkAlignment *alignment;
 
-  settings = g_slice_new0 (EmpathyAccountWidgetIrc);
+  settings = g_slice_new0 (TpawAccountWidgetIrc);
   settings->self = self;
 
   self->ui_details->gui = empathy_builder_get_resource (filename,
@@ -217,7 +217,7 @@ empathy_account_widget_irc_build_simple (EmpathyAccountWidget *self,
   /* Add network chooser button */
   g_object_get (settings->self, "settings", &ac_settings, NULL);
 
-  settings->network_chooser = empathy_irc_network_chooser_new (ac_settings);
+  settings->network_chooser = tpaw_irc_network_chooser_new (ac_settings);
 
   g_signal_connect (settings->network_chooser, "changed",
       G_CALLBACK (network_changed_cb), settings);
@@ -226,7 +226,7 @@ empathy_account_widget_irc_build_simple (EmpathyAccountWidget *self,
 
   gtk_widget_show (settings->network_chooser);
 
-  empathy_account_widget_handle_params (self,
+  tpaw_account_widget_handle_params (self,
       "entry_nick_simple", "account",
       NULL);
 
@@ -238,5 +238,5 @@ empathy_account_widget_irc_build_simple (EmpathyAccountWidget *self,
 
   g_object_unref (ac_settings);
 
-  return EMPATHY_IRC_NETWORK_CHOOSER (settings->network_chooser);
+  return TPAW_IRC_NETWORK_CHOOSER (settings->network_chooser);
 }