diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 3 | ||||
| -rw-r--r-- | src/empathy.c | 7 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index b89a4218d..c7344c8c8 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -8,8 +8,9 @@ AM_CPPFLAGS = \ $(EMPATHY_CFLAGS) \ $(WARN_CFLAGS) -LDADD = \ +LDADD = \ $(top_builddir)/libempathy-gtk/libempathy-gtk.la \ + $(top_builddir)/libempathy/libempathy.la \ $(EMPATHY_LIBS) bin_PROGRAMS = \ diff --git a/src/empathy.c b/src/empathy.c index 6ca47192d..416d2134d 100644 --- a/src/empathy.c +++ b/src/empathy.c @@ -43,6 +43,7 @@ #include <libempathy/empathy-contact.h> #include <libempathy/empathy-chandler.h> #include <libempathy/empathy-tp-chat.h> +#include <libempathy/empathy-tp-chatroom.h> #include <libempathy/empathy-idle.h> #include <libempathy-gtk/empathy-main-window.h> #include <libempathy-gtk/empathy-status-icon.h> @@ -117,7 +118,11 @@ new_channel_cb (EmpathyChandler *chandler, EmpathyTpChat *tp_chat; /* The chat died, give him the new text channel */ - tp_chat = empathy_tp_chat_new (account, tp_chan); + if (empathy_chat_is_group_chat (chat)) { + tp_chat = EMPATHY_TP_CHAT (empathy_tp_chatroom_new (account, tp_chan)); + } else { + tp_chat = empathy_tp_chat_new (account, tp_chan); + } empathy_chat_set_tp_chat (chat, tp_chat); g_object_unref (tp_chat); } |