empathy r1747 - trunk/libempathy-gtk

[xclaesse svn gnome org]

Author: xclaesse
Date: Fri Nov 21 16:14:25 2008
New Revision: 1747
URL: http://svn.gnome.org/viewvc/empathy?rev=1747&view=rev

Log:
Added empathy_send_file_with_file_chooser_and_manager to make use of the file transfer manager. (Jonny Lamb)

Signed-off-by: Jonny Lamb <jonny lamb collabora co uk>

Modified:
   trunk/libempathy-gtk/empathy-contact-menu.c
   trunk/libempathy-gtk/empathy-ui-utils.c
   trunk/libempathy-gtk/empathy-ui-utils.h

Modified: trunk/libempathy-gtk/empathy-contact-menu.c
==============================================================================
--- trunk/libempathy-gtk/empathy-contact-menu.c	(original)
+++ trunk/libempathy-gtk/empathy-contact-menu.c	Fri Nov 21 16:14:25 2008
@@ -195,7 +195,7 @@
 static void
 contact_file_transfer_menu_item_activate_cb (EmpathyContact *contact)
 {
-	empathy_send_file_with_file_chooser (contact, NULL, NULL);
+	empathy_send_file_with_file_chooser_and_manager (contact);
 }
 
 GtkWidget *

Modified: trunk/libempathy-gtk/empathy-ui-utils.c
==============================================================================
--- trunk/libempathy-gtk/empathy-ui-utils.c	(original)
+++ trunk/libempathy-gtk/empathy-ui-utils.c	Fri Nov 21 16:14:25 2008
@@ -1570,3 +1570,17 @@
 	gtk_widget_show (widget);
 }
 
+static void
+add_file_to_manager (EmpathyFile      *file,
+		     EmpathyFTManager *ft_manager)
+{
+	empathy_ft_manager_add_file (ft_manager, file);
+}
+
+void
+empathy_send_file_with_file_chooser_and_manager (EmpathyContact   *contact)
+{
+	empathy_send_file_with_file_chooser (contact,
+					     (EmpathyFileChooserCallback) add_file_to_manager,
+					     empathy_ft_manager_get_default ());
+}

Modified: trunk/libempathy-gtk/empathy-ui-utils.h
==============================================================================
--- trunk/libempathy-gtk/empathy-ui-utils.h	(original)
+++ trunk/libempathy-gtk/empathy-ui-utils.h	Fri Nov 21 16:14:25 2008
@@ -41,6 +41,7 @@
 #include <libempathy/empathy-file.h>
 
 #include "empathy-chat-view.h"
+#include "empathy-ft-manager.h"
 
 G_BEGIN_DECLS
 
@@ -120,6 +121,7 @@
 void        empathy_send_file_with_file_chooser         (EmpathyContact             *contact,
 							 EmpathyFileChooserCallback  callback,
 							 gpointer                    user_data);
+void    empathy_send_file_with_file_chooser_and_manager (EmpathyContact   *contact);
 
 G_END_DECLS