diff options
| author |  Alan Fitton <ajf@eth0.org.uk> | 2013-02-20 21:08:26 +0000 |
|---|---|---|
| committer | Alan Fitton <ajf@eth0.org.uk> | 2013-02-20 21:08:26 +0000 |
| commit | c12238f59f911eef07b5455a2cbf5b76a52fff45 (patch) | |
| tree | 20f56253812573645e2d99ce079729c6341f4de1 /src | |
| parent | 69fd839c5d6069ec86bd2e113e980bcb6ca33505 (diff) | |
fix for file parsed when unordered
Diffstat (limited to 'src')
| -rw-r--r-- | src/trg-file-parser.c | 8 | ||||
| -rw-r--r-- | src/trg-files-model.c | 10 |
2 files changed, 4 insertions, 14 deletions
diff --git a/src/trg-file-parser.c b/src/trg-file-parser.c index 2916615..fbfb6aa 100644 --- a/src/trg-file-parser.c +++ b/src/trg-file-parser.c @@ -50,7 +50,7 @@ static trg_files_tree_node *trg_file_parser_node_insert(trg_files_tree_node parentList = g_list_prepend(parentList, lastIter); li = parentList; - lastIter = NULL; + lastIter = top; /* Iterate over the path list which contains each file/directory * component of the path in order. @@ -77,11 +77,7 @@ static trg_files_tree_node *trg_file_parser_node_insert(trg_files_tree_node target_node = g_new0(trg_files_tree_node, 1); target_node->name = g_strdup(path_el_node->val.s); target_node->parent = lastIter; - - if (lastIter) - trg_files_tree_node_add_child(lastIter, target_node); - else - trg_files_tree_node_add_child(top, target_node); + trg_files_tree_node_add_child(lastIter, target_node); } if (isFile) { diff --git a/src/trg-files-model.c b/src/trg-files-model.c index bfb1c81..bb1b46b 100644 --- a/src/trg-files-model.c +++ b/src/trg-files-model.c @@ -166,7 +166,7 @@ static trg_files_tree_node *trg_file_parser_node_insert(trg_files_tree_node parentList = g_list_prepend(parentList, lastIter); li = parentList; - lastIter = NULL; + lastIter = top; /* Iterate over the path list which contains each file/directory * component of the path in order. @@ -201,13 +201,7 @@ static trg_files_tree_node *trg_file_parser_node_insert(trg_files_tree_node target_node = g_new0(trg_files_tree_node, 1); target_node->name = g_strdup(path[i]); target_node->parent = lastIter; - - /* Under the parent of the last iteration. */ - if (lastIter) - trg_files_tree_node_add_child(lastIter, target_node); - /* None set, so under the top node. */ - else - trg_files_tree_node_add_child(top, target_node); + trg_files_tree_node_add_child(lastIter, target_node); } lastIter = target_node; |