empathy r2131 - in trunk: libempathy-gtk src

[xclaesse svn gnome org]

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

Log:
Use the new dispatcher api to request text channels

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

Modified:
   trunk/libempathy-gtk/empathy-contact-list-view.c
   trunk/libempathy-gtk/empathy-new-message-dialog.c
   trunk/src/empathy-chat-window.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:12:11 2009
@@ -542,7 +542,7 @@
 
 	if (contact) {
 		DEBUG ("Starting a chat");
-		empathy_dispatcher_chat_with_contact (contact);
+		empathy_dispatcher_chat_with_contact (contact, NULL, NULL);
 		g_object_unref (contact);
 	}
 }
@@ -571,7 +571,7 @@
 			    -1);
 
 	if (contact) {
-		empathy_dispatcher_call_with_contact (contact);
+		empathy_dispatcher_call_with_contact (contact, NULL, NULL);
 		g_object_unref (contact);
 	}
 }

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:12:11 2009
@@ -184,10 +184,9 @@
 	}
 
 	if (response == 1) {
-		empathy_dispatcher_call_with_contact_id (account, id);
-	}
-	else if (response == 2) {
-		empathy_dispatcher_chat_with_contact_id (account, id);
+		empathy_dispatcher_call_with_contact_id (account, id, NULL, NULL);
+	} else if (response == 2) {
+		empathy_dispatcher_chat_with_contact_id (account, id, NULL, NULL);
 	}
 
 	g_object_unref (account);

Modified: trunk/src/empathy-chat-window.c
==============================================================================
--- trunk/src/empathy-chat-window.c	(original)
+++ trunk/src/empathy-chat-window.c	Fri Jan  9 16:12:11 2009
@@ -1081,7 +1081,7 @@
 		chat = empathy_chat_window_find_chat (account, strv[1]);
 
 		if (!chat) {
-			empathy_dispatcher_chat_with_contact_id (account, strv[2]);
+			empathy_dispatcher_chat_with_contact_id (account, strv[2], NULL, NULL);
 			g_object_unref (account);
 			g_strfreev (strv);
 			return;