Updated yet more places to use s/direction/incoming/ (Jonny Lamb)

Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
svn path=/trunk/; revision=1784

diff --git a/libempathy-gtk/empathy-ft-manager.c b/libempathy-gtk/empathy-ft-manager.c
index 2be9e005c0c161f6917a050ae502b57911cd4db9..5c23ccb5c4a4c333cdcee90a3b7d0e23863d6f27 100644 (file)
--- a/libempathy-gtk/empathy-ft-manager.c
+++ b/libempathy-gtk/empathy-ft-manager.c
@@ -365,8 +365,7 @@ update_ft_row (EmpathyFTManager *ft_manager,
     {
       case EMP_FILE_TRANSFER_STATE_REMOTE_PENDING:
       case EMP_FILE_TRANSFER_STATE_OPEN:
-        if (empathy_tp_file_get_direction (tp_file) ==
-            EMP_FILE_TRANSFER_DIRECTION_INCOMING)
+        if (empathy_tp_file_get_incoming (tp_file))
           /* translators: first %s is filename, second %s is the contact name */
           first_line_format = _("Receiving \"%s\" from %s");
         else

diff --git a/libempathy/empathy-tp-file.c b/libempathy/empathy-tp-file.c
index 61f4e26da1ba7c71e7818fc84d5c55b8f834b78f..f98f3c405485410d50a1387777f9a9fc7f94ac8c 100644 (file)
--- a/libempathy/empathy-tp-file.c
+++ b/libempathy/empathy-tp-file.c
@@ -370,8 +370,8 @@ tp_file_constructor (GType type,
   priv->unix_socket_path = g_value_dup_string (g_hash_table_lookup (properties,
       "SocketPath"));
 
-  priv->direction = g_value_get_uint (g_hash_table_lookup (properties,
-      "Direction"));
+  if (priv->state == EMP_FILE_TRANSFER_STATE_LOCAL_PENDING)
+    priv->incoming = TRUE;
 
   g_hash_table_destroy (properties);