gvfs r1333 - in trunk: . daemon

[alexl svn gnome org]

Author: alexl
Date: Fri Feb 22 14:36:12 2008
New Revision: 1333
URL: http://svn.gnome.org/viewvc/gvfs?rev=1333&view=rev

Log:
2008-02-22  Alexander Larsson  <alexl redhat com>

        * daemon/gvfsbackendnetwork.c:
	Fix up network_file_equal.



Modified:
   trunk/ChangeLog
   trunk/daemon/gvfsbackendnetwork.c

Modified: trunk/daemon/gvfsbackendnetwork.c
==============================================================================
--- trunk/daemon/gvfsbackendnetwork.c	(original)
+++ trunk/daemon/gvfsbackendnetwork.c	Fri Feb 22 14:36:12 2008
@@ -119,6 +119,8 @@
   g_slice_free (NetworkFile, file);
 }
 
+/* Assumes file_name is equal and compares for
+   metadata changes */
 static gboolean
 network_file_equal (NetworkFile *a,
                     NetworkFile *b)
@@ -126,20 +128,12 @@
   if (!g_icon_equal (a->icon, b->icon))
     return FALSE;
 
-  if ((a->file_name != NULL && b->file_name != NULL) &&
-      (a->file_name != NULL && b->file_name == NULL) ||
-      (a->file_name == NULL && b->file_name != NULL))
-    return FALSE;
-
-  if (strcmp (a->file_name, b->file_name) != 0)
-    return FALSE;
-
-  if ((a->display_name != NULL && b->display_name != NULL) &&
-      (a->display_name != NULL && b->display_name == NULL) ||
+  if ((a->display_name != NULL && b->display_name == NULL) ||
       (a->display_name == NULL && b->display_name != NULL))
     return FALSE;
 
-  if (strcmp (a->display_name, b->display_name) != 0)
+  if ((a->display_name != NULL && b->display_name != NULL) &&
+      strcmp (a->display_name, b->display_name) != 0)
     return FALSE;
 
   return TRUE;