diff options
| author | Xavier Claessens <xclaesse@src.gnome.org> | 2007-05-01 20:18:26 +0800 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@src.gnome.org> | 2007-05-01 20:18:26 +0800 |
| commit | 8aaf6865026ead0f21a233a2897a89a7de332f5d (patch) | |
| tree | 1eb2237d2e0284e26130361ec8ca68922af6e971 /contact-list/empathy-contact-list-main.c | |
| parent | b21403fed48c9b95d32a9b8968ac8f47135fd34f (diff) | |
| download | gsoc2013-empathy-8aaf6865026ead0f21a233a2897a89a7de332f5d.tar gsoc2013-empathy-8aaf6865026ead0f21a233a2897a89a7de332f5d.tar.gz gsoc2013-empathy-8aaf6865026ead0f21a233a2897a89a7de332f5d.tar.bz2 gsoc2013-empathy-8aaf6865026ead0f21a233a2897a89a7de332f5d.tar.lz gsoc2013-empathy-8aaf6865026ead0f21a233a2897a89a7de332f5d.tar.xz gsoc2013-empathy-8aaf6865026ead0f21a233a2897a89a7de332f5d.tar.zst gsoc2013-empathy-8aaf6865026ead0f21a233a2897a89a7de332f5d.zip | |
[darcs-to-svn @ Connect accounts in empathy-launcher, not in empathy-contact-list]
svn path=/trunk/; revision=14
Diffstat (limited to 'contact-list/empathy-contact-list-main.c')
| -rw-r--r-- | contact-list/empathy-contact-list-main.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/contact-list/empathy-contact-list-main.c b/contact-list/empathy-contact-list-main.c index 8be108b3d..1aba20447 100644 --- a/contact-list/empathy-contact-list-main.c +++ b/contact-list/empathy-contact-list-main.c @@ -27,8 +27,11 @@ #include <glib.h> #include <gtk/gtk.h> -#include <libempathy/gossip-contact.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/gossip-stock.h> @@ -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); |