empathy r1784 - in trunk: libempathy libempathy-gtk

[xclaesse svn gnome org]

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

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

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

Modified:
   trunk/libempathy-gtk/empathy-ft-manager.c
   trunk/libempathy/empathy-tp-file.c

Modified: trunk/libempathy-gtk/empathy-ft-manager.c
==============================================================================
--- trunk/libempathy-gtk/empathy-ft-manager.c	(original)
+++ trunk/libempathy-gtk/empathy-ft-manager.c	Fri Nov 21 16:16:48 2008
@@ -365,8 +365,7 @@
     {
       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

Modified: trunk/libempathy/empathy-tp-file.c
==============================================================================
--- trunk/libempathy/empathy-tp-file.c	(original)
+++ trunk/libempathy/empathy-tp-file.c	Fri Nov 21 16:16:48 2008
@@ -370,8 +370,8 @@
   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);