[darcs-to-svn @ GossipMainWindow]

svn path=/trunk/; revision=20

1 files changed, 3 insertions, 36 deletions

diff --git a/contact-list/empathy-contact-list-main.c b/contact-list/empathy-contact-list-main.c
index 1aba20447..dfa7695e3 100644
--- a/contact-list/empathy-contact-list-main.c
+++ b/contact-list/empathy-contact-list-main.c
@@ -27,13 +27,8 @@
 #include <glib.h>
 #include <gtk/gtk.h>
 
-#include <libtelepathy/tp-helpers.h>
-#include <libmissioncontrol/mission-control.h>
-
 #include <libempathy/empathy-session.h>
-#include <libempathy/gossip-contact.h>
-#include <libempathy-gtk/gossip-contact-list.h>
-#include <libempathy-gtk/gossip-private-chat.h>
+#include <libempathy-gtk/empathy-main-window.h>
 #include <libempathy-gtk/gossip-stock.h>
 
 static void
@@ -45,49 +40,21 @@ destroy_cb (GtkWidget *window,
 	gtk_main_quit ();
 }
 
-static void
-contact_chat_cb (GtkWidget      *list,
-		 GossipContact  *contact,
-		 MissionControl *mc)
-{
-	mission_control_request_channel (mc,
-					 gossip_contact_get_account (contact),
-					 TP_IFACE_CHANNEL_TYPE_TEXT,
-					 gossip_contact_get_handle (contact),
-					 TP_HANDLE_TYPE_CONTACT,
-					 NULL, NULL);
-}
-
 int
 main (int argc, char *argv[])
 {
 	GtkWidget *window;
-	GtkWidget *list;
-	GtkWidget *sw;
 
 	gtk_init (&argc, &argv);
 
-	window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+	window = empathy_main_window_new ();
 	gossip_stock_init (window);
 
-	list = GTK_WIDGET (gossip_contact_list_new ());
-	sw = gtk_scrolled_window_new (NULL, NULL);	
-	gtk_container_add (GTK_CONTAINER (window), sw);
-	gtk_container_add (GTK_CONTAINER (sw), list);
-
-	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
-					GTK_POLICY_AUTOMATIC,
-					GTK_POLICY_AUTOMATIC);
-	gtk_widget_set_size_request (sw, 200, 400);
-
 	g_signal_connect (window, "destroy",
 			  G_CALLBACK (destroy_cb),
 			  NULL);
-	g_signal_connect (list, "contact-chat",
-			  G_CALLBACK (contact_chat_cb),
-			  mission_control_new (tp_get_bus ()));
 
-	gtk_widget_show_all (window);
+	gtk_widget_show (window);
 
 	gtk_main ();