From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Thu, 3 Oct 2013 09:07:02 +0000 (+0200)
Subject: use folks_presence_details_get_default_message_from_type
X-Git-Url: https://git.0d.be/?p=empathy.git;a=commitdiff_plain;h=71e69f68ae8e7ac926440e454620116661db59b9

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 41d93996..8193c0a9 100644
--- 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;
     }
 
-  /* 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 = empathy_presence_get_default_message (presence);
+      message = folks_presence_details_get_default_message_from_type (presence);
     }
 
   if (message != NULL)