← Back to branch summary

~mfisch/brasero/update-to-3.8.0

« back to all changes in this revision

Viewing changes to src/burn-volume.c

  • Committer: Bazaar Package Importer
  • Author(s): Pedro Fragoso
  • Date: 2008-11-18 11:30:50 UTC
  • mto: (1.4.1 experimental)
  • mto: This revision was merged to the branch mainline in revision 29.
  • Revision ID: james.westby@ubuntu.com-20081118113050-yhrskmatlel0gzfm
Tags: upstream-0.8.3
Import upstream version 0.8.3

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/burn-volume.c
75
75
        if (file->isdir) {
76
76
                GList *iter;
77
77
 
78
 
                for (iter = file->specific.dir.children; iter; iter = iter->next)
79
 
                        brasero_volume_file_free (iter->data);
 
78
                if (file->isdir_loaded) {
 
79
                        for (iter = file->specific.dir.children; iter; iter = iter->next)
 
80
                                brasero_volume_file_free (iter->data);
80
81
 
81
 
                g_list_free (file->specific.dir.children);
 
82
                        g_list_free (file->specific.dir.children);
 
83
                }
82
84
        }
83
85
        else {
84
86
                g_slist_foreach (file->specific.file.extents,
175
177
        && !brasero_iso9660_get_size (buffer, nb_blocks, error))
176
178
                return NULL;
177
179
 
178
 
        return brasero_iso9660_get_contents (vol, buffer, data_blocks, error);
 
180
        return brasero_iso9660_get_contents (vol,
 
181
                                             buffer,
 
182
                                             data_blocks,
 
183
                                             error);
 
184
}
 
185
 
 
186
GList *
 
187
brasero_volume_load_directory_contents (BraseroVolSrc *vol,
 
188
                                        gint64 session_block,
 
189
                                        gint64 block,
 
190
                                        GError **error)
 
191
{
 
192
        gchar buffer [ISO9660_BLOCK_SIZE];
 
193
 
 
194
        if (BRASERO_VOL_SRC_SEEK (vol, session_block, SEEK_SET, error) == -1)
 
195
                return FALSE;
 
196
 
 
197
        if (!brasero_volume_get_primary_from_file (vol, buffer, error))
 
198
                return NULL;
 
199
 
 
200
        if (!brasero_iso9660_is_primary_descriptor (buffer, error))
 
201
                return NULL;
 
202
 
 
203
        return brasero_iso9660_get_directory_contents (vol,
 
204
                                                       buffer,
 
205
                                                       block,
 
206
                                                       error);
179
207
}
180
208
 
181
209
BraseroVolFile *