empathy r1893 - trunk/src

[xclaesse svn gnome org]

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

Log:
Simplify the code to add a FT in the manager.

Modified:
   trunk/src/empathy.c

Modified: trunk/src/empathy.c
==============================================================================
--- trunk/src/empathy.c	(original)
+++ trunk/src/empathy.c	Fri Nov 21 16:23:54 2008
@@ -61,27 +61,6 @@
 static BaconMessageConnection *connection = NULL;
 
 static void
-file_channel_get_state_cb (TpProxy      *proxy,
-			   const GValue *state_value,
-			   const GError *error,
-			   gpointer      user_data,
-			   GObject      *weak_object)
-{
-	EmpathyTpFile *tp_file;
-	EmpathyFTManager *ft_manager;
-	EmpFileTransferState state;
-
-	state = g_value_get_uint (state_value);
-	if (state != EMP_FILE_TRANSFER_STATE_PENDING) {
-		return;
-	}
-
-	ft_manager = empathy_ft_manager_get_default ();
-	tp_file = empathy_tp_file_new (TP_CHANNEL (proxy));
-	empathy_ft_manager_add_tp_file (ft_manager, tp_file);
-}
-
-static void
 dispatch_channel_cb (EmpathyDispatcher *dispatcher,
 		     TpChannel         *channel,
 		     gpointer           user_data)
@@ -127,10 +106,12 @@
 		empathy_call_window_new (channel);
 	}
 	else if (!tp_strdiff (channel_type, EMP_IFACE_CHANNEL_TYPE_FILE_TRANSFER)) {
-		tp_cli_dbus_properties_call_get (channel, -1,
-			EMP_IFACE_CHANNEL_TYPE_FILE_TRANSFER,
-			"State", file_channel_get_state_cb,
-			NULL, NULL, NULL);
+		EmpathyFTManager *ft_manager;
+		EmpathyTpFile    *tp_file;
+
+		ft_manager = empathy_ft_manager_get_default ();
+		tp_file = empathy_tp_file_new (channel);
+		empathy_ft_manager_add_tp_file (ft_manager, tp_file);
 	}
 
 	g_free (channel_type);