soc.2009.telepathy: 4aa5d6cf: Renamed PurpleAccount signal methods to ...

[sttwister at soc.pidgin.im]

-----------------------------------------------------------------
Revision: 4aa5d6cf68a0f87515972a730c91632d8901c97a
Ancestor: 1024b208718a6cdef8baf6e8bee2607e7bca3d11
Author: sttwister at soc.pidgin.im
Date: 2009-07-21T13:07:03
Branch: im.pidgin.soc.2009.telepathy
URL: http://d.pidgin.im/viewmtn/revision/info/4aa5d6cf68a0f87515972a730c91632d8901c97a

Modified files:
        libpurple/protocols/telepathy/telepathy_account.c

ChangeLog: 

Renamed PurpleAccount signal methods to avoid confusion

-------------- next part --------------
============================================================
--- libpurple/protocols/telepathy/telepathy_account.c	eb83487f3751e5f841a6866332b58bc1006b7bec
+++ libpurple/protocols/telepathy/telepathy_account.c	0734cfe7e7ac557b2262b7c5f65d658d7dc20c77
@@ -308,8 +308,8 @@ static void
 }
 
 static void
-account_modified_cb (PurpleAccount *account,
-                     gpointer user_data)
+purple_account_modified_cb (PurpleAccount *account,
+                            gpointer user_data)
 {
 	telepathy_account *account_data = (telepathy_account*)purple_account_get_int(
 			account, "tp_account_data", 0);
@@ -344,13 +344,13 @@ static void
 }
 
 static void
-account_destroying_cb (PurpleAccount *account,
-                       gpointer user_data)
+purple_account_destroying_cb (PurpleAccount *account,
+                              gpointer user_data)
 {
 	telepathy_account *account_data;
 
 	/* Save the changes to AccountManager and destroy the alocated struct */
-	account_modified_cb(account, user_data);
+	purple_account_modified_cb(account, user_data);
 	
 	account_data = (telepathy_account*)purple_account_get_int(
 			account, "tp_account_data", 0);
@@ -409,8 +409,8 @@ static void
 }
 
 static void
-account_added_cb (PurpleAccount *account,
-                  gpointer user_data)
+purple_account_added_cb (PurpleAccount *account,
+                         gpointer user_data)
 {
 	gchar *protocol_id = g_strndup(purple_account_get_protocol_id(account),
 			strlen(TELEPATHY_ID));
@@ -490,8 +490,8 @@ static void
 }
 
 static void
-account_removed_cb (PurpleAccount *account,
-                    gpointer user_data)
+purple_account_removed_cb (PurpleAccount *account,
+                           gpointer user_data)
 {
 	telepathy_account *account_data;
 
@@ -581,22 +581,22 @@ get_valid_accounts_cb (TpProxy *proxy,
 	 */
 	purple_signal_connect(pidgin_account_get_handle(), "account-modified",
 		purple_accounts_get_handle(),
-		PURPLE_CALLBACK(account_modified_cb),
+		PURPLE_CALLBACK(purple_account_modified_cb),
 		NULL);
 
 	purple_signal_connect(purple_accounts_get_handle(), "account-destroying",
 		purple_accounts_get_handle(),
-		PURPLE_CALLBACK(account_destroying_cb),
+		PURPLE_CALLBACK(purple_account_destroying_cb),
 		NULL);
 
 	purple_signal_connect(purple_accounts_get_handle(), "account-added",
 		purple_accounts_get_handle(),
-		PURPLE_CALLBACK(account_added_cb),
+		PURPLE_CALLBACK(purple_account_added_cb),
 		NULL);
 
 	purple_signal_connect(purple_accounts_get_handle(), "account-removed",
 		purple_accounts_get_handle(),
-		PURPLE_CALLBACK(account_removed_cb),
+		PURPLE_CALLBACK(purple_account_removed_cb),
 		NULL);
 
 	if (daemon)