#include <tp-account-widgets/tpaw-builder.h>
#include <tp-account-widgets/tpaw-contactinfo-utils.h>
#include <tp-account-widgets/tpaw-time.h>
+#include <tp-account-widgets/tpaw-utils.h>
+#include <telepathy-glib/telepathy-glib-dbus.h>
#ifdef HAVE_LIBCHAMPLAIN
#include <champlain/champlain.h>
goto out;
}
- /* FIXME: Default messages should be moved into libfolks (bgo#627403) */
message = folks_presence_details_get_presence_message (
FOLKS_PRESENCE_DETAILS (folks_object));
- if (EMP_STR_EMPTY (message))
+ if (TPAW_STR_EMPTY (message))
{
- message = empathy_presence_get_default_message (presence);
+ message = folks_presence_details_get_default_message_from_type (presence);
}
if (message != NULL)
g_free (markup_text);
gtk_image_set_from_icon_name (GTK_IMAGE (state_image),
- empathy_icon_name_for_presence (presence),
+ empathy_icon_name_for_presence (
+ empathy_folks_presence_type_to_tp (presence)),
GTK_ICON_SIZE_BUTTON);
out:
g_clear_object (&persona);
}
+ g_clear_object (&iter);
/*
* What we display for various conditions:
add_persona (self, persona);
g_clear_object (&persona);
}
+ g_clear_object (&iter);
}
else if (was_showing_personas && !will_show_personas)
{
remove_persona (self, persona);
g_clear_object (&persona);
}
+ g_clear_object (&iter);
if (removed != NULL)
{
/* Set up the Individual grid instead */
individual_grid_set_up (self);
}
- g_clear_object (&iter);
/* Hide the last separator and show the others */
children = gtk_container_get_children (GTK_CONTAINER (priv->vbox_individual));