From: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date: Fri, 18 Mar 2011 21:00:21 +0000 (+0000)
Subject: Use the right marshal file
X-Git-Url: https://git.0d.be/?p=empathy.git;a=commitdiff_plain;h=6fc411c2e7a53eafe132c67c7ce430df665e5493

Use the right marshal file
---

diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c
index 867200b0..dae0239c 100644
--- a/libempathy-gtk/empathy-chat.c
+++ b/libempathy-gtk/empathy-chat.c
@@ -43,7 +43,6 @@
 #include <libempathy/empathy-keyring.h>
 #include <libempathy/empathy-utils.h>
 #include <libempathy/empathy-request-util.h>
-#include <libempathy/empathy-marshal.h>
 #include <libempathy/empathy-chatroom-manager.h>
 #include <src/empathy-chat-window.h>
 
@@ -52,6 +51,7 @@
 #include "empathy-contact-list-store.h"
 #include "empathy-contact-list-view.h"
 #include "empathy-contact-menu.h"
+#include "empathy-gtk-marshal.h"
 #include "empathy-input-text-view.h"
 #include "empathy-search-bar.h"
 #include "empathy-theme-manager.h"
@@ -2937,7 +2937,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);