← Back to branch summary

~mfisch/brasero/update-to-3.8.0

« back to all changes in this revision

Viewing changes to plugins/checksum/burn-checksum-image.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:
plugins/checksum/burn-checksum-image.c
283
283
        }
284
284
 
285
285
        BRASERO_JOB_LOG (self,
286
 
                         "Starting checksuming file %s (size = %i)",
 
286
                         "Starting checksuming file %s (size = %"G_GOFFSET_FORMAT")",
287
287
                         path,
288
288
                         priv->total);
289
289
 
419
419
        checksum_type = gconf_client_get_int (client, GCONF_KEY_CHECKSUM_TYPE, NULL);
420
420
        g_object_unref (client);
421
421
 
422
 
        if (!checksum_type)
423
 
                checksum_type = BRASERO_CHECKSUM_MD5;
424
 
 
425
422
        return checksum_type;
426
423
}
427
424
 
436
433
        priv = BRASERO_CHECKSUM_IMAGE_PRIVATE (self);
437
434
 
438
435
        priv->checksum_type = brasero_checksum_get_checksum_type ();
439
 
        if (priv->checksum_type == BRASERO_CHECKSUM_NONE)
440
 
                checksum_type = G_CHECKSUM_MD5;
441
 
        else if (priv->checksum_type & BRASERO_CHECKSUM_MD5)
 
436
 
 
437
        if (priv->checksum_type & BRASERO_CHECKSUM_MD5)
442
438
                checksum_type = G_CHECKSUM_MD5;
443
439
        else if (priv->checksum_type & BRASERO_CHECKSUM_SHA1)
444
440
                checksum_type = G_CHECKSUM_SHA1;
445
441
        else if (priv->checksum_type & BRASERO_CHECKSUM_SHA256)
446
442
                checksum_type = G_CHECKSUM_SHA256;
447
 
        else
 
443
        else {
448
444
                checksum_type = G_CHECKSUM_MD5;
 
445
                priv->checksum_type = BRASERO_CHECKSUM_MD5;
 
446
        }
449
447
 
450
448
        brasero_job_set_current_action (BRASERO_JOB (self),
451
449
                                        BRASERO_BURN_ACTION_CHECKSUM,