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

1 files changed, 10 insertions, 7 deletions

diff --git a/libempathy-gtk/gossip-chat-window.c b/libempathy-gtk/gossip-chat-window.c
index fb112379b..7dfc8e0c5 100644
--- a/libempathy-gtk/gossip-chat-window.c
+++ b/libempathy-gtk/gossip-chat-window.c
@@ -810,13 +810,16 @@ FIXME:
 						   window);
 #endif
 	} else {
+		GossipPrivateChat  *chat;
 		GossipSubscription  subscription;
 		GossipContact      *contact;
 
+		chat = GOSSIP_PRIVATE_CHAT (priv->current_chat);
+
 		/* Show / Hide widgets */
 		gtk_widget_hide (priv->menu_room);
 
-		contact = gossip_chat_get_contact (priv->current_chat);
+		contact = gossip_private_chat_get_contact (chat);
 		subscription = gossip_contact_get_subscription (contact);
 		if (!(subscription & GOSSIP_SUBSCRIPTION_FROM)) {
 			gtk_widget_show (priv->menu_conv_add_contact);
@@ -872,11 +875,11 @@ chat_window_add_contact_activate_cb (GtkWidget        *menuitem,
 				     GossipChatWindow *window)
 {
 	GossipChatWindowPriv *priv;
-	GossipContact        *contact;
+	//GossipContact        *contact;
 
 	priv = GET_PRIV (window);
 
-	contact = gossip_chat_get_contact (priv->current_chat);
+	//contact = gossip_chat_get_contact (priv->current_chat);
 
 	// FIXME: gossip_add_contact_dialog_show (NULL, contact);
 }
@@ -911,13 +914,13 @@ chat_window_info_activate_cb (GtkWidget        *menuitem,
 			      GossipChatWindow *window)
 {
 	GossipChatWindowPriv *priv;
-	GossipContact        *contact;
+	//GossipContact        *contact;
 
 	priv = GET_PRIV (window);
-
+/*FIXME:
 	contact = gossip_chat_get_contact (priv->current_chat);
 
-/*FIXME:	gossip_contact_info_dialog_show (contact,
+	gossip_contact_info_dialog_show (contact,
 					 GTK_WINDOW (priv->dialog));*/
 }
 
@@ -1007,7 +1010,7 @@ chat_window_show_contacts_toggled_cb (GtkWidget        *menuitem,
 	g_return_if_fail (priv->current_chat != NULL);
 
 	show = gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (priv->menu_room_show_contacts));
-	gossip_chat_set_show_contacts (priv->current_chat, show);
+	//gossip_group_chat_set_show_contacts (GOSSIP_GROUP_CHAT (priv->current_chat), show);
 }
 
 static void