[gnome-color-manager: 3/3] Merge branch 'master' into xsane

[Richard Hughes <rhughes src gnome org>]

commit adaa1243022f1d3d7602eadefe881160dc8fdc30
Merge: 7ce8396 7d280d7
Author: Richard Hughes <richard hughsie com>
Date:   Mon Feb 22 15:08:18 2010 +0000

    Merge branch 'master' into xsane

 configure.ac                                       |   17 +-
 contrib/gnome-color-manager.spec.in                |    2 +
 data/gcm-calibrate.ui                              |  610 ++++++---
 data/gcm-prefs.ui                                  |   34 +-
 data/gnome-color-manager.schemas.in                |   12 +-
 data/targets/LaserSoftDCPro.png                    |  Bin 0 -> 37582 bytes
 data/targets/Makefile.am                           |    1 +
 help/C/gnome-color-manager.xml                     |  266 ++++-
 help/es/es.po                                      |  289 +++-
 po/es.po                                           | 1530 +++++++++++++-------
 po/ru.po                                           |  565 ++++----
 po/sl.po                                           |  906 +++++++------
 po/sv.po                                           | 1028 +++++++++-----
 rules/95-gcm-colorimeters.rules                    |   64 +
 ...me-color-manager.rules => 95-gcm-devices.rules} |    9 +-
 rules/Makefile.am                                  |    3 +-
 src/Makefile.am                                    |    7 +
 src/gcm-calibrate-argyll.c                         |  575 ++++----
 src/gcm-calibrate-dialog.c                         |  737 ++++++++++
 src/gcm-calibrate-dialog.h                         |   89 ++
 src/gcm-calibrate-manual.c                         |    6 +-
 src/gcm-calibrate.c                                |  500 +++-----
 src/gcm-calibrate.h                                |   11 +
 src/gcm-cie-widget.c                               |    5 +-
 src/gcm-colorimeter.c                              |  148 ++-
 src/gcm-colorimeter.h                              |    3 +
 src/gcm-dbus.c                                     |    5 +-
 src/gcm-device-cups.c                              |   17 +-
 src/gcm-device-xrandr.c                            |   29 +-
 src/gcm-device.c                                   |    1 +
 src/gcm-dmi.c                                      |   12 +-
 src/gcm-dump-profile.c                             |    6 +-
 src/gcm-fix-profile.c                              |    8 +-
 src/gcm-import.c                                   |   17 +-
 src/gcm-install-system-wide.c                      |    2 +-
 src/gcm-prefs.c                                    |  401 ++++--
 src/gcm-print.c                                    |  258 ++++
 src/gcm-print.h                                    |   69 +
 src/gcm-profile-store.c                            |   25 +-
 src/gcm-profile.c                                  |   23 +-
 src/gcm-profile.h                                  |    4 +-
 src/gcm-self-test.c                                |    2 +-
 src/gcm-session.c                                  |    2 +-
 src/gcm-tables.c                                   |   12 +-
 src/gcm-trc-widget.c                               |    5 +-
 src/gcm-utils.c                                    |   87 +-
 src/gcm-utils.h                                    |   10 +-
 src/gcm-xserver.c                                  |   12 +-
 48 files changed, 5777 insertions(+), 2647 deletions(-)
---