empathy r1895 - trunk/src

[xclaesse svn gnome org]

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

Log:
Simplify condition

Modified:
   trunk/src/empathy-ft-manager.c

Modified: trunk/src/empathy-ft-manager.c
==============================================================================
--- trunk/src/empathy-ft-manager.c	(original)
+++ trunk/src/empathy-ft-manager.c	Fri Nov 21 16:24:02 2008
@@ -259,9 +259,7 @@
 
         first_line = g_strdup_printf (first_line_format, filename, contact_name);
 
-        if (state == EMP_FILE_TRANSFER_STATE_OPEN
-            || (incoming && state == EMP_FILE_TRANSFER_STATE_ACCEPTED)
-            || (incoming && state == EMP_FILE_TRANSFER_STATE_PENDING))
+        if (state == EMP_FILE_TRANSFER_STATE_OPEN || incoming)
           {
             gchar *total_size_str;
             gchar *transferred_bytes_str;