[gnome-color-manager/gdbus: 16/16] Merge branch 'master' into gdbus

[Richard Hughes <rhughes src gnome org>]

commit c56c06238c8ea54bd5a62065fb7e4f75047fa82c
Merge: ceed3a7 fde6eed
Author: Richard Hughes <richard hughsie com>
Date:   Fri May 21 13:46:34 2010 +0100

    Merge branch 'master' into gdbus

 configure.ac                                 |   10 +-
 contrib/gnome-color-manager.spec.in          |   37 +--
 data/.gitignore                              |    2 +-
 data/Makefile.am                             |   35 +--
 data/gcm-prefs.ui                            |   81 ++++--
 data/gnome-color-manager.schemas.in          |  181 ------------
 data/org.gnome.color-manager.gschema.migrate |   14 +
 data/org.gnome.color-manager.gschema.xml     |   64 ++++
 data/tests/Makefile.am                       |    3 +
 data/tests/test.jpg                          |  Bin 0 -> 13863 bytes
 data/tests/test.png                          |  Bin 0 -> 27598 bytes
 po/POTFILES.in                               |    2 +-
 src/Makefile.am                              |    6 +
 src/gcm-calibrate.c                          |   43 ++--
 src/gcm-device.c                             |    2 +-
 src/gcm-exif.c                               |  402 ++++++++++++++++++++++++++
 src/gcm-exif.h                               |   78 +++++
 src/gcm-prefs.c                              |  102 +++++++-
 src/gcm-self-test.c                          |  216 +++++---------
 src/gcm-session.c                            |    3 -
 src/gcm-utils.h                              |   26 +-
 21 files changed, 860 insertions(+), 447 deletions(-)
---
diff --cc src/gcm-utils.h
index e30476f,5321230..66386ce
--- a/src/gcm-utils.h
+++ b/src/gcm-utils.h
@@@ -31,24 -31,21 +31,24 @@@
  
  #define GCM_STOCK_ICON					"gnome-color-manager"
  #define GCM_PROFILE_PATH				"/.color/icc"
 +#define GCM_DBUS_SERVICE				"org.gnome.ColorManager"
 +#define GCM_DBUS_INTERFACE				"org.gnome.ColorManager"
 +#define GCM_DBUS_PATH					"/org/gnome/ColorManager"
  
- #define GCM_SETTINGS_SCHEMA				"org.gnome.ColorManager"
- #define GCM_SETTINGS_DEFAULT_GAMMA			"default_gamma"
- #define GCM_SETTINGS_GLOBAL_DISPLAY_CORRECTION		"global_display_correction"
- #define GCM_SETTINGS_SET_ICC_PROFILE_ATOM		"set_icc_profile_atom"
- #define GCM_SETTINGS_RENDERING_INTENT_DISPLAY		"rendering_intent_display"
- #define GCM_SETTINGS_RENDERING_INTENT_SOFTPROOF		"rendering_intent_softproof"
- #define GCM_SETTINGS_COLORSPACE_RGB			"colorspace_rgb"
- #define GCM_SETTINGS_COLORSPACE_CMYK			"colorspace_cmyk"
- #define GCM_SETTINGS_USE_PROFILES_FROM_VOLUMES		"use_profiles_from_volumes"
- #define GCM_SETTINGS_CALIBRATION_LENGTH			"calibration_length"
- #define GCM_SETTINGS_SHOW_FINE_TUNING			"show_fine_tuning"
+ #define GCM_SETTINGS_SCHEMA				"org.gnome.color-manager"
+ #define GCM_SETTINGS_DEFAULT_GAMMA			"default-gamma"
+ #define GCM_SETTINGS_GLOBAL_DISPLAY_CORRECTION		"global-display-correction"
+ #define GCM_SETTINGS_SET_ICC_PROFILE_ATOM		"set-icc-profile-atom"
+ #define GCM_SETTINGS_RENDERING_INTENT_DISPLAY		"rendering-intent-display"
+ #define GCM_SETTINGS_RENDERING_INTENT_SOFTPROOF		"rendering-intent-softproof"
+ #define GCM_SETTINGS_COLORSPACE_RGB			"colorspace-rgb"
+ #define GCM_SETTINGS_COLORSPACE_CMYK			"colorspace-cmyk"
+ #define GCM_SETTINGS_USE_PROFILES_FROM_VOLUMES		"use-profiles-from-volumes"
+ #define GCM_SETTINGS_CALIBRATION_LENGTH			"calibration-length"
+ #define GCM_SETTINGS_SHOW_FINE_TUNING			"show-fine-tuning"
  
- #define GCM_SETTINGS_RECALIBRATE_PRINTER_THRESHOLD	"recalibrate_printer_threshold"
- #define GCM_SETTINGS_RECALIBRATE_DISPLAY_THRESHOLD	"recalibrate_display_threshold"
+ #define GCM_SETTINGS_RECALIBRATE_PRINTER_THRESHOLD	"recalibrate-printer-threshold"
+ #define GCM_SETTINGS_RECALIBRATE_DISPLAY_THRESHOLD	"recalibrate-display-threshold"
  
  /* DISTROS: you will have to patch if you have changed the name of these packages */
  #define GCM_PREFS_PACKAGE_NAME_SHARED_COLOR_TARGETS	"shared-color-targets"