[brasero: 5/6] Merge branch 'work'

[Philippe Rouquier <philippr src gnome org>]

commit d6a3dd2c46b89e96340a4d9b2c28cbe4e5a5f3ea
Merge: c2a545f... 459aac4...
Author: Philippe Rouquier <bonfire-app wanadoo fr>
Date:   Mon May 11 22:30:29 2009 +0200

    Merge branch 'work'

 libbrasero-burn/Makefile.am                        |   13 +-
 libbrasero-burn/brasero-burn-options-private.h     |   53 --
 libbrasero-burn/brasero-burn-options.c             |  443 +++++++++--
 libbrasero-burn/brasero-data-options.c             |  337 ++++++++
 ...o-disc-copy-dialog.h => brasero-data-options.h} |   46 +-
 libbrasero-burn/brasero-data-vfs.c                 |   80 +-
 libbrasero-burn/brasero-disc-copy-dialog.c         |  133 ---
 libbrasero-burn/brasero-disc-option-dialog.c       |  865 --------------------
 libbrasero-burn/brasero-disc-option-dialog.h       |   65 --
 libbrasero-burn/brasero-enums.h                    |    2 -
 libbrasero-burn/brasero-image-option-dialog.c      |  118 ---
 libbrasero-burn/brasero-image-option-dialog.h      |   67 --
 libbrasero-burn/brasero-status-dialog.c            |  138 +++-
 libbrasero-burn/brasero-status-dialog.h            |    8 +-
 libbrasero-burn/brasero-track-data-cfg.c           |   41 +-
 libbrasero-burn/brasero-video-options.c            |  566 +++++++++++++
 libbrasero-burn/brasero-video-options.h            |   58 ++
 17 files changed, 1540 insertions(+), 1493 deletions(-)