diff -r ff5eccb9f797 -r ec0d44434ba8 finch/gntstatus.c
--- a/finch/gntstatus.c	Thu Feb 06 18:40:31 2014 +0530
+++ b/finch/gntstatus.c	Thu Feb 06 19:50:34 2014 +0530
@@ -94,7 +94,7 @@
 			continue;
 
 		title = purple_savedstatus_get_title(saved);
-		type = purple_primitive_get_name_from_type(purple_savedstatus_get_type(saved));
+		type = purple_primitive_get_name_from_type(purple_savedstatus_get_primitive_type(saved));
 		message = purple_savedstatus_get_message(saved);  /* XXX: Strip possible markups */
 
 		gnt_tree_add_row_last(tree, saved,
@@ -322,7 +322,7 @@
 	else
 	{
 		purple_savedstatus_set_title(edit->saved, title);
-		purple_savedstatus_set_type(edit->saved, prim);
+		purple_savedstatus_set_primitive_type(edit->saved, prim);
 		purple_savedstatus_set_message(edit->saved, message);
 		if (statuses.tree)
 		{
@@ -358,7 +358,7 @@
 
 	if (sub)
 	{
-		key->type = purple_savedstatus_substatus_get_type(sub);
+		key->type = purple_savedstatus_substatus_get_status_type(sub);
 		type = purple_status_type_get_name(key->type);
 		message = purple_savedstatus_substatus_get_message(sub);
 		key->message = g_strdup(message);
@@ -545,7 +545,7 @@
 
 	edit->type = combo = gnt_combo_box_new();
 	gnt_box_add_widget(GNT_BOX(box), combo);
-	current = saved ? purple_savedstatus_get_type(saved) : PURPLE_STATUS_UNSET;
+	current = saved ? purple_savedstatus_get_primitive_type(saved) : PURPLE_STATUS_UNSET;
 	for (i = 0; prims[i] != PURPLE_STATUS_UNSET; i++)
 	{
 		gnt_combo_box_add_data(GNT_COMBO_BOX(combo), GINT_TO_POINTER(prims[i]),