← Back to branch summary

~mfisch/brasero/update-to-3.8.0

« back to all changes in this revision

Viewing changes to src/brasero-video-tree-model.c

  • Committer: Bazaar Package Importer
  • Author(s): Robert Ancell
  • Date: 2009-09-08 09:33:41 UTC
  • mfrom: (1.1.29 upstream)
  • Revision ID: james.westby@ubuntu.com-20090908093341-jh02q5ba0q8jyu9l
Tags: 2.27.92-0ubuntu1
https://launchpad.net/bugs/425998
https://launchpad.net/bugs/354995
* New upstream release (LP: #425998)
  - Some improvements when handling DVD-RW sequential
  - #593829 - Brasero gets stuck in a loop at "Getting size" while burning another session on a multi-session disk
  - #578466 - Unable to overburn
  - #593314 - Brasero is failing to burn from sftp
  - #593492 - Compilation must be ordered by file name
  - #587122 - Copying DVD - "Error while reading video DVD (no error)"
  - #592026 - brasero crashes when eject a medium
  - #592025 - brasero crashes on detecting src images on a NFS path when preparing burning an image
  - #591880 - Image checksumming causes internal error (LP: #354995)
  - #591397 - Brasero Main window pops up after exiting from Image Burning window.
  - Translation updates
  - lots of small fixes and improvements

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/brasero-video-tree-model.c
241
241
                        g_value_set_string (value, string);
242
242
                }
243
243
                else {
 
244
                        GFile *file;
244
245
                        gchar *uri;
245
246
                        gchar *name;
246
 
                        gchar *path;
247
247
                        gchar *unescaped;
248
248
 
249
249
                        uri = brasero_track_stream_get_source (BRASERO_TRACK_STREAM (track), TRUE);
250
250
                        unescaped = g_uri_unescape_string (uri, NULL);
251
251
                        g_free (uri);
252
252
 
253
 
                        path = g_filename_from_uri (unescaped, NULL, NULL);
 
253
                        file = g_file_new_for_uri (unescaped);
254
254
                        g_free (unescaped);
255
255
 
256
 
                        name = g_path_get_basename (path);
257
 
                        g_free (path);
 
256
                        name = g_file_get_basename (file);
 
257
                        g_object_unref (file);
258
258
 
259
259
                        g_value_set_string (value, name);
260
260
                        g_free (name);
481
481
 
482
482
                index --;
483
483
 
484
 
                if (index <= 0)
485
 
                        return BRASERO_TRACK (track);
 
484
                if (brasero_track_stream_get_gap (track) > 0) {
 
485
                        if (index <= 0)
 
486
                                return BRASERO_TRACK (track);
486
487
 
487
 
                if (brasero_track_stream_get_gap (track) > 0)
488
 
                        index --;
 
488
                                index --;
 
489
                }
489
490
        }
490
491
 
491
492
        return NULL;