diff -r 1e7b4b3741a0 -r cf3f735b09b7 pidgin/gtkstatusbox.c
--- a/pidgin/gtkstatusbox.c	Thu Feb 06 16:53:42 2014 +0530
+++ b/pidgin/gtkstatusbox.c	Thu Feb 06 20:02:57 2014 +0530
@@ -659,7 +659,7 @@
 	else if (account_status)
 		primary = g_strdup(purple_status_get_name(purple_account_get_active_status(acct)));
 	else if (purple_savedstatus_is_transient(saved_status))
-		primary = g_strdup(purple_primitive_get_name_from_type(purple_savedstatus_get_type(saved_status)));
+		primary = g_strdup(purple_primitive_get_name_from_type(purple_savedstatus_get_primitive_type(saved_status)));
 	else
 		primary = g_markup_escape_text(purple_savedstatus_get_title(saved_status), -1);
 
@@ -701,7 +701,7 @@
 			status_type = purple_status_get_status_type(purple_account_get_active_status(acct));
 	        prim = purple_status_type_get_primitive(status_type);
 	    } else {
-			prim = purple_savedstatus_get_type(saved_status);
+			prim = purple_savedstatus_get_primitive_type(saved_status);
 	    }
 
 		stock = pidgin_stock_id_from_status_primitive(prim);
@@ -798,7 +798,7 @@
 	 * If there is a token-account, then select the primitive from the
 	 * dropdown using a loop. Otherwise select from the default list.
 	 */
-	primitive = purple_savedstatus_get_type(saved_status);
+	primitive = purple_savedstatus_get_primitive_type(saved_status);
 	if (!status_box->token_status_account && purple_savedstatus_is_transient(saved_status) &&
 		((primitive == PURPLE_STATUS_AVAILABLE) || (primitive == PURPLE_STATUS_AWAY) ||
 		 (primitive == PURPLE_STATUS_INVISIBLE) || (primitive == PURPLE_STATUS_OFFLINE) ||
@@ -2178,7 +2178,7 @@
 				type == PIDGIN_STATUS_BOX_TYPE_POPULAR) {
 			PurpleSavedStatus *saved = purple_savedstatus_find_by_creation_time(GPOINTER_TO_INT(data));
 			if (saved) {
-				prim = purple_savedstatus_get_type(saved);
+				prim = purple_savedstatus_get_primitive_type(saved);
 			}
 		}
 
@@ -2426,14 +2426,14 @@
 				/* Make sure that statusbox displays the correct thing.
 				 * It can get messed up if the previous selection was a
 				 * saved status that wasn't supported by this account */
-				if ((purple_savedstatus_get_type(ss) == primitive)
+				if ((purple_savedstatus_get_primitive_type(ss) == primitive)
 					&& purple_savedstatus_is_transient(ss)
 					&& purple_savedstatus_has_substatuses(ss))
 					changed = FALSE;
 			}
 		} else {
 			saved_status = purple_savedstatus_get_current();
-			if (purple_savedstatus_get_type(saved_status) == primitive &&
+			if (purple_savedstatus_get_primitive_type(saved_status) == primitive &&
 			    !purple_savedstatus_has_substatuses(saved_status) &&
 				purple_strequal(purple_savedstatus_get_message(saved_status), message))
 			{
@@ -2453,7 +2453,7 @@
 					const char *ss_msg = purple_savedstatus_get_message(ss);
 					/* find a known transient status that is the same as the
 					 * new selected one */
-					if ((purple_savedstatus_get_type(ss) == primitive) && purple_savedstatus_is_transient(ss) &&
+					if ((purple_savedstatus_get_primitive_type(ss) == primitive) && purple_savedstatus_is_transient(ss) &&
 						purple_savedstatus_has_substatuses(ss) && /* Must have substatuses */
 						purple_strequal(ss_msg, message))
 					{
@@ -2463,7 +2463,8 @@
 							PurpleAccount *acct = tmp->data;
 							PurpleSavedStatusSub *sub = purple_savedstatus_get_substatus(ss, acct);
 							if (sub) {
-								const PurpleStatusType *sub_type = purple_savedstatus_substatus_get_type(sub);
+								const PurpleStatusType *sub_type =
+										purple_savedstatus_substatus_get_status_type(sub);
 								const char *subtype_status_id = purple_status_type_get_id(sub_type);
 								if (purple_strequal(subtype_status_id, id)) {
 									found = TRUE;
@@ -2685,7 +2686,7 @@
 		{
 			PurpleSavedStatus *saved_status;
 			saved_status = purple_savedstatus_get_current();
-			if (purple_savedstatus_get_type(saved_status) == PURPLE_STATUS_AVAILABLE)
+			if (purple_savedstatus_get_primitive_type(saved_status) == PURPLE_STATUS_AVAILABLE)
 				saved_status = purple_savedstatus_new(NULL, PURPLE_STATUS_AWAY);
 			pidgin_status_editor_show(FALSE,
 				purple_savedstatus_is_transient(saved_status)
@@ -2761,7 +2762,7 @@
 {
 	gint index = -1;
 
-	switch (purple_savedstatus_get_type(saved_status))
+	switch (purple_savedstatus_get_primitive_type(saved_status))
 	{
 		/* In reverse order */
 		case PURPLE_STATUS_OFFLINE: