use folks_presence_details_get_default_message_from_type

This has been introduced in folks since a while (0.7.1).

Fix a FIXME and remove a enum casting warning.

diff --git a/libempathy-gtk/empathy-individual-widget.c b/libempathy-gtk/empathy-individual-widget.c
index 41d939966d4e96c23efa0fdf864b346ffd3b39b9..8193c0a9bee0e010b411b379affbf7d69b599e0a 100644 (file)
--- a/libempathy-gtk/empathy-individual-widget.c
+++ b/libempathy-gtk/empathy-individual-widget.c
@@ -1294,12 +1294,11 @@ notify_presence_cb (gpointer folks_object,
       goto out;
     }
 
       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 (TPAW_STR_EMPTY (message))
     {
   message = folks_presence_details_get_presence_message (
       FOLKS_PRESENCE_DETAILS (folks_object));
   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)
     }
 
   if (message != NULL)