diff src/savedstatuses.c @ 12080:3b52d94437f3

[gaim-migrate @ 14377] The rest of sf patch #1354886, from Sadrul Habib Chowdhury, with an EXTREME amount of changes from me. Come to me, first, if something doesn't work. This allows you to edit the substatuses of a saved status. committer: Tailor Script <[e-mail]>

--- a/src/savedstatuses.c	Mon Nov 14 06:50:07 2005 +0000
+++ b/src/savedstatuses.c	Mon Nov 14 07:20:22 2005 +0000
@@ -65,8 +65,6 @@
 };
 
 /*
- * TODO: If an account is deleted, need to also delete any associated
- *       GaimSavedStatusSub's.
  * TODO: If a GaimStatusType is deleted, need to also delete any
  *       associated GaimSavedStatusSub's?
  */
@@ -446,10 +444,10 @@
 }
 
 void
-gaim_savedstatus_set_substatus_for_account(GaimSavedStatus *saved_status,
-										   const GaimAccount *account,
-										   const GaimStatusType *type,
-										   const char *message)
+gaim_savedstatus_set_substatus(GaimSavedStatus *saved_status,
+							   const GaimAccount *account,
+							   const GaimStatusType *type,
+							   const char *message)
 {
 	GaimSavedStatusSub *substatus;
 
@@ -458,7 +456,7 @@
 	g_return_if_fail(type         != NULL);
 
 	/* Find an existing substatus or create a new one */
-	substatus = gaim_savedstatus_get_substatus_for_account(saved_status, account);
+	substatus = gaim_savedstatus_get_substatus(saved_status, account);
 	if (substatus == NULL)
 	{
 		substatus = g_new0(GaimSavedStatusSub, 1);
@@ -474,8 +472,8 @@
 }
 
 void
-gaim_savedstatus_unset_substatus_for_account(GaimSavedStatus *saved_status,
-											 const GaimAccount *account)
+gaim_savedstatus_unset_substatus(GaimSavedStatus *saved_status,
+								 const GaimAccount *account)
 {
 	GList *iter;
 	GaimSavedStatusSub *substatus;
@@ -569,8 +567,8 @@
 }
 
 GaimSavedStatusSub *
-gaim_savedstatus_get_substatus_for_account(const GaimSavedStatus *saved_status,
-										   const GaimAccount *account)
+gaim_savedstatus_get_substatus(const GaimSavedStatus *saved_status,
+							   const GaimAccount *account)
 {
 	GList *iter;
 	GaimSavedStatusSub *substatus;
@@ -638,7 +636,7 @@
 	g_return_if_fail(saved_status != NULL);
 	g_return_if_fail(account != NULL);
 
-	substatus = gaim_savedstatus_get_substatus_for_account(saved_status, account);
+	substatus = gaim_savedstatus_get_substatus(saved_status, account);
 	if (substatus != NULL)
 	{
 		status_type = substatus->type;