/* If we didn't get any match at all, it means the last state
* was a custom one. Just switch to the first one.
*/
- status = empathy_presence_state_get_default_status (states[0]);
+ status = empathy_presence_get_default_message (states[0]);
presence_chooser_reset_scroll_timeout (chooser);
empathy_idle_set_presence (priv->idle, states[0], status);
StateAndStatus *sas;
const gchar *status;
- status = empathy_presence_state_get_default_status (states[i]);
+ status = empathy_presence_get_default_message (states[i]);
sas = presence_chooser_state_and_status_new (states[i], status);
list = g_list_prepend (list, sas);
}
gtk_image_set_from_icon_name (GTK_IMAGE (priv->image),
- empathy_icon_name_for_presence_state (state),
+ empathy_icon_name_for_presence (state),
GTK_ICON_SIZE_MENU);
on = !on;
}
gtk_image_set_from_icon_name (GTK_IMAGE (priv->image),
- empathy_icon_name_for_presence_state (state),
+ empathy_icon_name_for_presence (state),
GTK_ICON_SIZE_MENU);
priv->last_state = state;
for (i = 0; i < G_N_ELEMENTS (states); i += 2) {
GList *list, *l;
- status = empathy_presence_state_get_default_status (states[i]);
+ status = empathy_presence_get_default_message (states[i]);
presence_chooser_menu_add_item (menu,
status,
states[i]);
const gchar *icon_name;
item = gtk_image_menu_item_new_with_label (str);
- icon_name = empathy_icon_name_for_presence_state (state);
+ icon_name = empathy_icon_name_for_presence (state);
g_signal_connect (item, "activate",
G_CALLBACK (presence_chooser_noncustom_activate_cb),
gtk_list_store_append (store, &iter);
gtk_list_store_set (store, &iter,
- COL_ICON, empathy_icon_name_for_presence_state (states[i]),
- COL_LABEL, empathy_presence_state_get_default_status (states[i]),
+ COL_ICON, empathy_icon_name_for_presence (states[i]),
+ COL_LABEL, empathy_presence_get_default_message (states[i]),
COL_PRESENCE, states[i],
-1);
}