diff options
| author | Alexander Larsson <alexl@redhat.com> | 2008-02-22 14:36:12 +0000 |
|---|---|---|
| committer | Alexander Larsson <alexl@src.gnome.org> | 2008-02-22 14:36:12 +0000 |
| commit | 06e0fe76fc9e3308f636bd661cd5af27f60a3e19 (patch) | |
| tree | 65444de859b4af9fd85c0e251f7cf4344fdd07b7 /daemon/gvfsbackendnetwork.c | |
| parent | 3b2ce5ab36b3043e77e28061cab4f936d01c6aca (diff) | |
| download | gvfs-06e0fe76fc9e3308f636bd661cd5af27f60a3e19.tar.gz | |
Fix up network_file_equal.
2008-02-22 Alexander Larsson <alexl@redhat.com>
* daemon/gvfsbackendnetwork.c:
Fix up network_file_equal.
svn path=/trunk/; revision=1333
Diffstat (limited to 'daemon/gvfsbackendnetwork.c')
| -rw-r--r-- | daemon/gvfsbackendnetwork.c | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/daemon/gvfsbackendnetwork.c b/daemon/gvfsbackendnetwork.c index 4db99c1b..35d556c7 100644 --- a/daemon/gvfsbackendnetwork.c +++ b/daemon/gvfsbackendnetwork.c @@ -119,6 +119,8 @@ network_file_free (NetworkFile *file) 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 @@ network_file_equal (NetworkFile *a, 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; |