X-Git-Url: https://git.0d.be/?p=empathy.git;a=blobdiff_plain;f=contact-list%2Fempathy-contact-list-main.c;h=1aba20447f9da30bfcb0694472598091b696f5b6;hp=8be108b3d5731f20c90f8ee5fe788003d2e68108;hb=8aaf6865026ead0f21a233a2897a89a7de332f5d;hpb=b21403fed48c9b95d32a9b8968ac8f47135fd34f diff --git a/contact-list/empathy-contact-list-main.c b/contact-list/empathy-contact-list-main.c index 8be108b3..1aba2044 100644 --- a/contact-list/empathy-contact-list-main.c +++ b/contact-list/empathy-contact-list-main.c @@ -27,8 +27,11 @@ #include #include -#include +#include +#include + #include +#include #include #include #include @@ -43,11 +46,11 @@ destroy_cb (GtkWidget *window, } static void -contact_chat_cb (GtkWidget *list, - GossipContact *contact, - gpointer user_data) +contact_chat_cb (GtkWidget *list, + GossipContact *contact, + MissionControl *mc) { - mission_control_request_channel (empathy_session_get_mission_control (), + mission_control_request_channel (mc, gossip_contact_get_account (contact), TP_IFACE_CHANNEL_TYPE_TEXT, gossip_contact_get_handle (contact), @@ -64,8 +67,6 @@ main (int argc, char *argv[]) gtk_init (&argc, &argv); - empathy_session_connect (); - window = gtk_window_new (GTK_WINDOW_TOPLEVEL); gossip_stock_init (window); @@ -84,7 +85,7 @@ main (int argc, char *argv[]) NULL); g_signal_connect (list, "contact-chat", G_CALLBACK (contact_chat_cb), - NULL); + mission_control_new (tp_get_bus ())); gtk_widget_show_all (window);