[empathy: 1/4] Add empathy_chat_view_append_event_markup
- From: Danielle Madeley <daniellem src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [empathy: 1/4] Add empathy_chat_view_append_event_markup
- Date: Fri, 14 Oct 2011 04:25:36 +0000 (UTC)
commit 6c8045628c9b9092e80aa0183d0e33798c37d661
Author: Emilio Pozuelo Monfort <emilio pozuelo collabora co uk>
Date: Tue May 17 16:34:55 2011 +0100
Add empathy_chat_view_append_event_markup
Conflicts:
libempathy-gtk/empathy-chat-view.c
libempathy-gtk/empathy-chat-view.h
libempathy-gtk/empathy-chat-view.c | 16 ++++++++++++++++
libempathy-gtk/empathy-chat-view.h | 6 ++++++
2 files changed, 22 insertions(+), 0 deletions(-)
---
diff --git a/libempathy-gtk/empathy-chat-view.c b/libempathy-gtk/empathy-chat-view.c
index 49c3844..088b120 100644
--- a/libempathy-gtk/empathy-chat-view.c
+++ b/libempathy-gtk/empathy-chat-view.c
@@ -84,6 +84,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 1fa4445..bc9e917 100644
--- 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,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]