diff options
| author | Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk> | 2011-03-19 05:41:08 +0800 |
|---|---|---|
| committer | Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk> | 2011-03-19 05:41:08 +0800 |
| commit | 23c00506586759589874434849fe7f83a5afa8e7 (patch) | |
| tree | 570b8404f58bc8710ebb79017530b16b7d3a949d | |
| parent | c9e61ab462770ae75ab1ce18604300f94851a934 (diff) | |
| download | gsoc2013-empathy-23c00506586759589874434849fe7f83a5afa8e7.tar gsoc2013-empathy-23c00506586759589874434849fe7f83a5afa8e7.tar.gz gsoc2013-empathy-23c00506586759589874434849fe7f83a5afa8e7.tar.bz2 gsoc2013-empathy-23c00506586759589874434849fe7f83a5afa8e7.tar.lz gsoc2013-empathy-23c00506586759589874434849fe7f83a5afa8e7.tar.xz gsoc2013-empathy-23c00506586759589874434849fe7f83a5afa8e7.tar.zst gsoc2013-empathy-23c00506586759589874434849fe7f83a5afa8e7.zip | |
Use the right marshal file
| -rw-r--r-- | libempathy-gtk/empathy-chat.c | 4 | ||||
| m--------- | telepathy-yell | 0 |
2 files changed, 2 insertions, 2 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 -Subproject d60bd53ce53dd5d527fc56a60302663b8529e69 +Subproject 506f7679d370b1f95393e3d1b28ba0b20e9dd7d |