Add empathy_chat_view_append_event_markup

Conflicts:

	libempathy-gtk/empathy-chat-view.c
	libempathy-gtk/empathy-chat-view.h

diff --git a/libempathy-gtk/empathy-chat-view.c b/libempathy-gtk/empathy-chat-view.c
index 49c384489e6d79ada3bbd169e70e2d3be51e874a..088b1208478139975fcabc2e1b3aa2edd4518b02 100644 (file)
--- a/libempathy-gtk/empathy-chat-view.c
+++ b/libempathy-gtk/empathy-chat-view.c
@@ -83,6 +83,22 @@ empathy_chat_view_append_event (EmpathyChatView *view,
        }
 }
 
+void
+empathy_chat_view_append_event_markup (EmpathyChatView *view,
+                                      const gchar     *markup_text,
+                                      const gchar     *fallback_text)
+{
+       g_return_if_fail (EMPATHY_IS_CHAT_VIEW (view));
+
+       if (EMPATHY_TYPE_CHAT_VIEW_GET_IFACE (view)->append_event_markup) {
+               EMPATHY_TYPE_CHAT_VIEW_GET_IFACE (view)->append_event_markup (view,
+                                                                             markup_text,
+                                                                             fallback_text);
+       } else {
+               empathy_chat_view_append_event (view, fallback_text);
+       }
+}
+
 void
 empathy_chat_view_edit_message (EmpathyChatView *view,
                                EmpathyMessage  *message)

diff --git a/libempathy-gtk/empathy-chat-view.h b/libempathy-gtk/empathy-chat-view.h
index 1fa44450ab30fec559a5fa2f5cdd3a4ae04798ee..bc9e9176105921abb18bfbe722635e3d71ace512 100644 (file)
--- a/libempathy-gtk/empathy-chat-view.h
+++ b/libempathy-gtk/empathy-chat-view.h
@@ -46,6 +46,9 @@ struct _EmpathyChatViewIface {
                                                  EmpathyMessage  *msg);
        void             (*append_event)         (EmpathyChatView *view,
                                                  const gchar     *str);
+       void             (*append_event_markup)  (EmpathyChatView *view,
+                                                 const gchar     *markup_text,
+                                                 const gchar     *fallback_text);
        void             (*edit_message)         (EmpathyChatView *view,
                                                  EmpathyMessage  *message);
        void             (*scroll)               (EmpathyChatView *view,
@@ -81,6 +84,9 @@ void             empathy_chat_view_append_message       (EmpathyChatView *view,
                                                         EmpathyMessage  *msg);
 void             empathy_chat_view_append_event         (EmpathyChatView *view,
                                                         const gchar     *str);
+void             empathy_chat_view_append_event_markup  (EmpathyChatView *view,
+                                                        const gchar     *markup_text,
+                                                        const gchar     *fallback_text);
 void             empathy_chat_view_edit_message         (EmpathyChatView *view,
                                                         EmpathyMessage  *message);
 void             empathy_chat_view_scroll               (EmpathyChatView *view,