VFS API break: Introduce FDisplayName propertyv0.6.52

1 files changed, 10 insertions, 5 deletions

diff --git a/common/treepathutils.c b/common/treepathutils.c
index d249444..d8a5f10 100644
--- a/common/treepathutils.c
+++ b/common/treepathutils.c
@@ -46,7 +46,8 @@ struct PathTree* filelist_tree_new()
   //  create placeholder data
   tree->data = (struct TVFSItem*)malloc(sizeof(struct TVFSItem));
   memset(tree->data, 0, sizeof(struct TVFSItem));
-  tree->data->sFileName = strdup(tree->node);
+  tree->data->FName = strdup(tree->node);
+  tree->data->FDisplayName = strdup(tree->node);
   tree->data->ItemType = vDirectory;
   tree->data->iMode = S_IRWXO + S_IRWXG + S_IRWXU;
   tree->data->iUID = geteuid();
@@ -75,7 +76,8 @@ void filelist_tree_free(struct PathTree *tree)
 	  if (tree->items)
 		  g_ptr_array_free(tree->items, TRUE);
 	  if (tree->data) {
-		  if (tree->data->sFileName) free(tree->data->sFileName);
+		  if (tree->data->FName) free(tree->data->FName);
+		  if (tree->data->FDisplayName) free(tree->data->FDisplayName);
 		  if (tree->data->sLinkTo) free(tree->data->sLinkTo);
 		  free(tree->data);
 	  }
@@ -206,7 +208,8 @@ void filelist_tree_add_item_recurr(struct PathTree *tree, const char *path, stru
 	  t->data = item;
 	  t->index = index;
 	  t->node = strdup(path);
-	  if (t->data)  t->data->sFileName = strdup(path);
+	  if (t->data)  t->data->FName = strdup(path);
+	  if (t->data)  t->data->FDisplayName = strdup(path);
 	  //  create new list of subitems and add new item
 	  if (! tree->items) tree->items = g_ptr_array_new();
 	  g_ptr_array_add(tree->items, t);
@@ -241,7 +244,8 @@ void filelist_tree_add_item_recurr(struct PathTree *tree, const char *path, stru
 		  //  create placeholder data
 		  node->data = (struct TVFSItem*)malloc(sizeof(struct TVFSItem));
 		  memset(node->data, 0, sizeof(struct TVFSItem));
-		  node->data->sFileName = strdup(node->node);
+		  node->data->FName = strdup(node->node);
+		  node->data->FDisplayName = strdup(node->node);
 		  node->data->ItemType = vDirectory;
 		  node->data->iMode = S_IRWXO + S_IRWXG + S_IRWXU;
 		  node->data->iUID = geteuid();
@@ -298,7 +302,8 @@ gboolean filelist_tree_add_item(struct PathTree *tree, const char *path, struct
 	  //  free old data
 	  if (found->data) free_vfs_item(found->data);
 	  found->data = item;
-	  if (found->data)  found->data->sFileName = strdup(found->node);
+	  if (found->data)  found->data->FName = strdup(found->node);
+	  if (found->data)  found->data->FDisplayName = strdup(found->node);
   } else
       //  create new item recursively
 	  filelist_tree_add_item_recurr(tree, pp, item, index);