From 23c00506586759589874434849fe7f83a5afa8e7 Mon Sep 17 00:00:00 2001
From: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date: Fri, 18 Mar 2011 21:41:08 +0000
Subject: Use the right marshal file

---
 libempathy-gtk/empathy-chat.c | 4 ++--
 telepathy-yell                | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c
index c464e82b9..5da9578bf 100644
--- a/libempathy-gtk/empathy-chat.c
+++ b/libempathy-gtk/empathy-chat.c
@@ -42,13 +42,13 @@
 #include <libempathy/empathy-gsettings.h>
 #include <libempathy/empathy-utils.h>
 #include <libempathy/empathy-dispatcher.h>
-#include <libempathy/empathy-marshal.h>
 
 #include "empathy-chat.h"
 #include "empathy-spell.h"
 #include "empathy-contact-list-store.h"
 #include "empathy-contact-list-view.h"
 #include "empathy-contact-menu.h"
+#include "empathy-gtk-marshal.h"
 #include "empathy-search-bar.h"
 #include "empathy-theme-manager.h"
 #include "empathy-smiley-manager.h"
@@ -2764,7 +2764,7 @@ empathy_chat_class_init (EmpathyChatClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      0,
 			      NULL, NULL,
-			      _empathy_marshal_VOID__OBJECT_BOOLEAN,
+			      _empathy_gtk_marshal_VOID__OBJECT_BOOLEAN,
 			      G_TYPE_NONE,
 			      2, EMPATHY_TYPE_MESSAGE, G_TYPE_BOOLEAN);
 
diff --git a/telepathy-yell b/telepathy-yell
index d60bd53ce..506f7679d 160000
--- a/telepathy-yell
+++ b/telepathy-yell
@@ -1 +1 @@
-Subproject commit d60bd53ce53dd5d527fc56a60302663b8529e697
+Subproject commit 506f7679d370b1f95393e3d1b28ba0b20e9dd7d7
-- 
cgit v1.2.3