From 20ce0c962a960e39216b06bdf2198dfd83319278 Mon Sep 17 00:00:00 2001
From: Xavier Claessens <xclaesse@src.gnome.org>
Date: Fri, 18 May 2007 21:50:47 +0000
Subject: EmpathyContactList is now an interface implemented by

	* libempathy-gtk/gossip-private-chat.h:
	* libempathy-gtk/gossip-contact-list.c:
	* libempathy-gtk/gossip-chat.c:
	* libempathy-gtk/gossip-chat.h:
	* libempathy-gtk/gossip-chat-window.c:
	* libempathy-gtk/Makefile.am:
	* libempathy-gtk/gossip-chat-view.c:
	* libempathy-gtk/gossip-private-chat.c:
	* src/empathy-chat-main.c:
	* libempathy/gossip-utils.c:
	* libempathy/gossip-contact.h:
	* libempathy/empathy-tp-chat.c:
	* libempathy/gossip-utils.h:
	* libempathy/empathy-contact-manager.c:
	* libempathy/empathy-contact-manager.h:
	* libempathy/empathy-tp-contact-list.c:
	* libempathy/empathy-tp-contact-list.h:
	* libempathy/empathy-tp-chatroom.c:
	* libempathy/empathy-tp-chatroom.h:
	* libempathy/empathy-contact-list.c:
	* libempathy/empathy-contact-list.h:
	* libempathy/Makefile.am:
	* libempathy/gossip-contact.c: EmpathyContactList is now an interface
	implemented by EmpathyTpContactList, EmpathyContactManager and
	EmpathyTpChatroom. GossipContactList use that interface to display a
	treeview.


svn path=/trunk/; revision=72
---
 src/empathy-chat-main.c | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/empathy-chat-main.c b/src/empathy-chat-main.c
index 7750b0b3f..287766594 100644
--- a/src/empathy-chat-main.c
+++ b/src/empathy-chat-main.c
@@ -134,14 +134,14 @@ new_channel_cb (EmpathyChandler *chandler,
 
 	if (tp_chan->handle_type == TP_HANDLE_TYPE_CONTACT) {
 		EmpathyContactManager *manager;
-		EmpathyContactList    *list;
+		EmpathyTpContactList  *list;
 		GossipContact         *contact;
 		GossipPrivateChat     *chat;
 
 		/* We have a new private chat channel */
 		manager = empathy_contact_manager_new ();
 		list = empathy_contact_manager_get_list (manager, account);
-		contact = empathy_contact_list_get_from_handle (list, tp_chan->handle);
+		contact = empathy_tp_contact_list_get_from_handle (list, tp_chan->handle);
 
 		chat = gossip_private_chat_new_with_channel (contact, tp_chan);
 		g_object_weak_ref (G_OBJECT (chat),
@@ -157,6 +157,24 @@ new_channel_cb (EmpathyChandler *chandler,
 		g_object_unref (chat);
 		g_object_unref (manager);
 	}
+	if (tp_chan->handle_type == TP_HANDLE_TYPE_ROOM) {
+#if 0
+		GossipGroupChat *chat;
+
+		/* We have a new group chat channel */
+		chat = gossip_group_chat_new (account, tp_chan);
+		g_object_weak_ref (G_OBJECT (chat),
+				   (GWeakNotify) chat_finalized_cb,
+				   NULL);
+
+		exit_timeout_stop ();
+		chat_count++;
+
+		gossip_chat_present (GOSSIP_CHAT (chat));
+
+		g_object_unref (chat);
+#endif
+	}
 
 OUT:
 	g_free (id);
-- 
cgit v1.2.3