empathy r2167 - trunk/libempathy-gtk

[xclaesse svn gnome org]

Author: xclaesse
Date: Fri Jan  9 16:14:17 2009
New Revision: 2167
URL: http://svn.gnome.org/viewvc/empathy?rev=2167&view=rev

Log:
Use the new call utility function to start calls

Signed-off-by: Sjoerd Simons <sjoerd simons collabora co uk>

Modified:
   trunk/libempathy-gtk/empathy-contact-list-view.c
   trunk/libempathy-gtk/empathy-contact-menu.c
   trunk/libempathy-gtk/empathy-new-message-dialog.c

Modified: trunk/libempathy-gtk/empathy-contact-list-view.c
==============================================================================
--- trunk/libempathy-gtk/empathy-contact-list-view.c	(original)
+++ trunk/libempathy-gtk/empathy-contact-list-view.c	Fri Jan  9 16:14:17 2009
@@ -571,7 +571,7 @@
 			    -1);
 
 	if (contact) {
-		empathy_dispatcher_call_with_contact (contact, NULL, NULL);
+		empathy_start_call_with_contact (contact);
 		g_object_unref (contact);
 	}
 }

Modified: trunk/libempathy-gtk/empathy-contact-menu.c
==============================================================================
--- trunk/libempathy-gtk/empathy-contact-menu.c	(original)
+++ trunk/libempathy-gtk/empathy-contact-menu.c	Fri Jan  9 16:14:17 2009
@@ -147,7 +147,7 @@
 	gtk_widget_show (image);
 
 	g_signal_connect_swapped (item, "activate",
-				  G_CALLBACK (empathy_dispatcher_call_with_contact),
+				  G_CALLBACK (empathy_start_call_with_contact),
 				  contact);
 	
 	return item;

Modified: trunk/libempathy-gtk/empathy-new-message-dialog.c
==============================================================================
--- trunk/libempathy-gtk/empathy-new-message-dialog.c	(original)
+++ trunk/libempathy-gtk/empathy-new-message-dialog.c	Fri Jan  9 16:14:17 2009
@@ -184,7 +184,15 @@
 	}
 
 	if (response == 1) {
-		empathy_dispatcher_call_with_contact_id (account, id, NULL, NULL);
+		EmpathyContactFactory *factory;
+		EmpathyContact *contact;
+
+		factory = empathy_contact_factory_new ();
+		contact = empathy_contact_factory_get_from_id (factory, account, id);
+		empathy_start_call_with_contact (contact);
+
+		g_object_unref (contact);
+		g_object_unref (factory);
 	} else if (response == 2) {
 		empathy_dispatcher_chat_with_contact_id (account, id, NULL, NULL);
 	}