Simplify the code to add a FT in the manager.

svn path=/trunk/; revision=1893

diff --git a/src/empathy.c b/src/empathy.c
index a5606acbef93dae1d85bc75b036bdb808edde6a7..c05f005acc8dbec017a90d9df24e112b42dca6c9 100644 (file)
--- a/src/empathy.c
+++ b/src/empathy.c
@@ -60,27 +60,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,
@@ -127,10 +106,12 @@ dispatch_channel_cb (EmpathyDispatcher *dispatcher,
                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);