[gnome-color-manager: 80/80] Merge branch 'libcolor-glib'

[Richard Hughes <rhughes src gnome org>]

commit 10ae18bf49726296e9eacb4884936a89ada5fb01
Merge: 3f9d6be b734530
Author: Richard Hughes <richard hughsie com>
Date:   Mon Jul 19 12:32:08 2010 +0100

    Merge branch 'libcolor-glib'

 .gitignore                                         |    1 -
 Makefile.am                                        |    2 +
 configure.ac                                       |   60 +-
 contrib/reset.sh                                   |    1 +
 docs/.gitignore                                    |    1 +
 docs/Makefile.am                                   |    3 +
 docs/api/.gitignore                                |   25 +
 docs/api/Makefile.am                               |   74 ++
 docs/api/clean.sh                                  |    7 +
 docs/api/libcolor-glib-docs.sgml                   |   76 ++
 docs/api/version.xml.in                            |    1 +
 docs/huey/.gitignore                               |    4 +
 ...t-usb-traffic-and-add-hex-output-pretty-p.patch |   53 +
 docs/huey/Makefile.am                              |   17 +
 docs/huey/annotate.sh                              |    9 +
 docs/huey/argyll-spotread-verbose.txt.gz           |  Bin 0 -> 3179 bytes
 docs/huey/gcm-parse-huey.c                         |  303 ++++++
 docs/huey/lsusb-vvv                                |   97 ++
 docs/huey/multiplier-1-to-100.csv.gz               |  Bin 0 -> 905 bytes
 docs/huey/register-dump.txt                        |  576 ++++++++++
 docs/huey/usb-ambient.txt.gz                       |  Bin 0 -> 955 bytes
 docs/huey/usb-init-cancel.txt.gz                   |  Bin 0 -> 663 bytes
 docs/huey/usb-init.txt.gz                          |  Bin 0 -> 1896 bytes
 docs/huey/usb-profile-complete-crt.txt.gz          |  Bin 0 -> 51034 bytes
 docs/huey/usb-profile-complete.txt.gz              |  Bin 0 -> 56720 bytes
 docs/huey/usb-startup.txt.gz                       |  Bin 0 -> 9249 bytes
 docs/huey/usb-unlock.txt.gz                        |  Bin 0 -> 9237 bytes
 libcolor-glib/.gitignore                           |   16 +
 libcolor-glib/Makefile.am                          |  165 +++
 libcolor-glib/egg-debug.c                          |    1 +
 libcolor-glib/egg-debug.h                          |    1 +
 {src => libcolor-glib}/gcm-brightness.c            |    0
 {src => libcolor-glib}/gcm-brightness.h            |    4 +
 {src => libcolor-glib}/gcm-clut.c                  |    8 +-
 {src => libcolor-glib}/gcm-clut.h                  |    4 +
 libcolor-glib/gcm-color.c                          |  157 +++
 libcolor-glib/gcm-color.h                          |   77 ++
 libcolor-glib/gcm-common.c                         |  194 ++++
 libcolor-glib/gcm-common.h                         |   66 ++
 libcolor-glib/gcm-ddc-client.c                     |  342 ++++++
 libcolor-glib/gcm-ddc-client.h                     |   99 ++
 libcolor-glib/gcm-ddc-common.c                     |  171 +++
 libcolor-glib/gcm-ddc-common.h                     |   59 +
 libcolor-glib/gcm-ddc-control.c                    |  518 +++++++++
 libcolor-glib/gcm-ddc-control.h                    |  116 ++
 libcolor-glib/gcm-ddc-device.c                     | 1147 ++++++++++++++++++++
 libcolor-glib/gcm-ddc-device.h                     |  137 +++
 {src => libcolor-glib}/gcm-dmi.c                   |    0
 {src => libcolor-glib}/gcm-dmi.h                   |    4 +
 {src => libcolor-glib}/gcm-edid.c                  |    0
 {src => libcolor-glib}/gcm-edid.h                  |    4 +
 {src => libcolor-glib}/gcm-enum.c                  |   19 -
 {src => libcolor-glib}/gcm-enum.h                  |    7 +-
 {src => libcolor-glib}/gcm-image.c                 |    6 +-
 {src => libcolor-glib}/gcm-image.h                 |    4 +
 {src => libcolor-glib}/gcm-profile-store.c         |   77 +-
 {src => libcolor-glib}/gcm-profile-store.h         |    4 +
 {src => libcolor-glib}/gcm-profile.c               |  189 +++-
 {src => libcolor-glib}/gcm-profile.h               |    4 +
 libcolor-glib/gcm-self-test.c                      |  660 +++++++++++
 libcolor-glib/gcm-sensor-client.c                  |  320 ++++++
 libcolor-glib/gcm-sensor-client.h                  |   70 ++
 libcolor-glib/gcm-sensor-dummy.c                   |  114 ++
 libcolor-glib/gcm-sensor-dummy.h                   |   57 +
 libcolor-glib/gcm-sensor-huey.c                    |  886 +++++++++++++++
 libcolor-glib/gcm-sensor-huey.h                    |   63 ++
 libcolor-glib/gcm-sensor.c                         |  694 ++++++++++++
 libcolor-glib/gcm-sensor.h                         |  156 +++
 {src => libcolor-glib}/gcm-tables.c                |    0
 {src => libcolor-glib}/gcm-tables.h                |    4 +
 libcolor-glib/gcm-version.h.in                     |   44 +
 {src => libcolor-glib}/gcm-xserver.c               |   57 +-
 {src => libcolor-glib}/gcm-xserver.h               |    4 +
 {src => libcolor-glib}/gcm-xyz.c                   |    0
 {src => libcolor-glib}/gcm-xyz.h                   |    4 +
 libcolor-glib/libcolor-glib.h                      |   53 +
 libcolor-glib/libcolor-glib.pc.in                  |   12 +
 po/POTFILES.in                                     |    5 +-
 po/POTFILES.skip                                   |    1 +
 src/.gitignore                                     |    2 +
 src/Makefile.am                                    |   84 +-
 src/cc-color-panel.c                               |   33 +-
 src/gcm-calibrate-argyll.c                         |  106 +-
 src/gcm-calibrate.c                                |   75 +-
 src/gcm-calibrate.h                                |    3 +-
 src/gcm-colorimeter.c                              |  567 ----------
 src/gcm-colorimeter.h                              |   90 --
 src/gcm-ddc-util.c                                 |  310 ++++++
 src/gcm-device-xrandr.c                            |    1 +
 src/gcm-device.c                                   |   11 +-
 src/gcm-huey-example.c                             |   72 ++
 src/gcm-picker.c                                   |  205 +++--
 src/gcm-self-test.c                                |  456 --------
 src/gcm-session.c                                  |    9 +-
 src/gcm-utils.c                                    |   77 +-
 src/gcm-utils.h                                    |    5 +-
 src/gcm-viewer.c                                   |    9 +-
 97 files changed, 8754 insertions(+), 1475 deletions(-)
---