[gnome-color-manager: 74/74] Merge branch 'colord'
- From: Richard Hughes <rhughes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-color-manager: 74/74] Merge branch 'colord'
- Date: Tue, 8 Mar 2011 14:32:12 +0000 (UTC)
commit b0fc3366dee4d2278bcbabe42cfb0b4446f4139e
Merge: 7fce311 58f5edb
Author: Richard Hughes <richard hughsie com>
Date: Tue Mar 8 14:30:18 2011 +0000
Merge branch 'colord'
Makefile.am | 9 +-
autogen.sh | 2 -
configure.ac | 77 +-
contrib/gnome-color-manager.spec.in | 12 -
data/Makefile.am | 4 +-
data/gcm-calibrate.ui | 2 +-
data/gcm-picker.ui | 259 +++-
data/gcm-prefs.ui | 1269 ++++++++--------
...gcm-apply.desktop.in => gcm-session.desktop.in} | 2 +-
data/org.gnome.color-manager.gschema.xml | 15 -
docs/Makefile.am | 22 +-
docs/api/.gitignore | 25 -
docs/api/Makefile.am | 74 -
docs/api/clean.sh | 7 -
docs/api/libcolor-glib-docs.sgml | 80 -
docs/api/version.xml.in | 1 -
docs/gcm-parse-beagle.c | 2 +-
docs/huey/Makefile.am | 22 +-
docs/huey/gcm-calculate-fudge.c | 1 -
docs/huey/gcm-dump-to-values.c | 3 +-
docs/huey/gcm-parse-huey.c | 2 +-
libcolor-glib/.gitignore | 16 -
libcolor-glib/Makefile.am | 180 ---
libcolor-glib/gcm-ddc-client.c | 374 -----
libcolor-glib/gcm-ddc-client.h | 99 --
libcolor-glib/gcm-ddc-common.c | 175 ---
libcolor-glib/gcm-ddc-common.h | 59 -
libcolor-glib/gcm-ddc-control.c | 519 -------
libcolor-glib/gcm-ddc-control.h | 116 --
libcolor-glib/gcm-ddc-device.c | 1158 --------------
libcolor-glib/gcm-ddc-device.h | 137 --
libcolor-glib/gcm-enum.c | 182 ---
libcolor-glib/gcm-enum.h | 86 --
libcolor-glib/gcm-profile-store.c | 698 ---------
libcolor-glib/gcm-self-test.c | 890 -----------
libcolor-glib/gcm-version.h.in | 51 -
libcolor-glib/libcolor-glib.h | 62 -
libcolor-glib/libcolor-glib.pc.in | 12 -
po/POTFILES.in | 11 +-
po/POTFILES.skip | 2 +-
policy/.gitignore | 8 -
policy/Makefile.am | 14 -
policy/org.gnome.color.policy.in | 37 -
rules/.gitignore | 1 -
rules/55-gcm-i2c.rules | 18 -
rules/95-gcm-devices.rules | 6 +-
rules/Makefile.am | 28 +-
rules/gcm-udev-ddc.c | 72 -
session/.gitignore | 5 -
session/Makefile.am | 45 -
session/color.gnome-settings-plugin | 8 -
session/gsd-color-manager.h | 56 -
session/gsd-color-plugin.c | 104 --
session/gsd-color-plugin.h | 57 -
src/.gitignore | 2 -
src/Makefile.am | 181 +--
src/cc-color-panel.c | 1564 ++++++++++----------
{session => src}/egg-console-kit.c | 0
{session => src}/egg-console-kit.h | 0
src/gcm-apply.c | 190 ---
{libcolor-glib => src}/gcm-brightness.c | 6 -
{libcolor-glib => src}/gcm-brightness.h | 4 -
{libcolor-glib => src}/gcm-buffer.c | 16 -
{libcolor-glib => src}/gcm-buffer.h | 4 -
src/gcm-calibrate-argyll.c | 9 +-
src/gcm-calibrate-dialog.c | 2 +-
src/gcm-calibrate-dialog.h | 2 -
src/gcm-calibrate-manual.c | 1 +
src/gcm-calibrate-native.c | 6 +-
src/gcm-calibrate.c | 47 +-
src/gcm-calibrate.h | 5 +-
src/gcm-cell-renderer-profile-icon.c | 6 +-
src/gcm-cell-renderer-profile-icon.h | 5 +-
src/gcm-cell-renderer-profile-text.c | 10 +-
src/gcm-cell-renderer-profile-text.h | 5 +-
src/gcm-client.c | 1579 --------------------
src/gcm-client.h | 100 --
{libcolor-glib => src}/gcm-clut.c | 12 -
{libcolor-glib => src}/gcm-clut.h | 4 -
{libcolor-glib => src}/gcm-color.c | 38 -
{libcolor-glib => src}/gcm-color.h | 4 -
{libcolor-glib => src}/gcm-compat.h | 4 -
{libcolor-glib => src}/gcm-debug.c | 0
{libcolor-glib => src}/gcm-debug.h | 4 -
src/gcm-device-cups.c | 276 ----
src/gcm-device-cups.h | 61 -
src/gcm-device-sane.c | 446 ------
src/gcm-device-sane.h | 60 -
src/gcm-device-udev.c | 237 ---
src/gcm-device-udev.h | 60 -
src/gcm-device-virtual.c | 99 --
src/gcm-device-virtual.h | 61 -
src/gcm-device-xrandr.c | 840 -----------
src/gcm-device-xrandr.h | 69 -
src/gcm-device.c | 1423 ------------------
src/gcm-device.h | 146 --
{libcolor-glib => src}/gcm-dmi.c | 8 -
{libcolor-glib => src}/gcm-dmi.h | 4 -
{libcolor-glib => src}/gcm-edid.c | 32 -
{libcolor-glib => src}/gcm-edid.h | 4 -
src/gcm-exif.c | 28 +-
src/gcm-exif.h | 5 +-
{libcolor-glib => src}/gcm-image.c | 18 +-
{libcolor-glib => src}/gcm-image.h | 4 -
src/gcm-import.c | 52 +-
src/gcm-inspect.c | 73 +-
src/gcm-install-system-wide.c | 277 ----
src/gcm-list-store-profiles.c | 20 +-
src/gcm-list-store-profiles.h | 4 +-
{libcolor-glib => src}/gcm-math.c | 28 -
{libcolor-glib => src}/gcm-math.h | 4 -
src/gcm-picker.c | 182 ++-
src/gcm-profile-store.c | 393 +++++
{libcolor-glib => src}/gcm-profile-store.h | 36 +-
{libcolor-glib => src}/gcm-profile.c | 219 +---
{libcolor-glib => src}/gcm-profile.h | 16 +-
{libcolor-glib => src}/gcm-sample-window.c | 6 -
{libcolor-glib => src}/gcm-sample-window.h | 4 -
src/gcm-self-test.c | 1173 ++++++++++-----
{libcolor-glib => src}/gcm-sensor-client.c | 10 +-
{libcolor-glib => src}/gcm-sensor-client.h | 0
.../gcm-sensor-colormunki-private.c | 8 -
.../gcm-sensor-colormunki-private.h | 4 -
{libcolor-glib => src}/gcm-sensor-colormunki.c | 6 +-
{libcolor-glib => src}/gcm-sensor-colormunki.h | 0
{libcolor-glib => src}/gcm-sensor-dummy.c | 2 -
{libcolor-glib => src}/gcm-sensor-dummy.h | 0
{libcolor-glib => src}/gcm-sensor-huey-private.c | 4 -
{libcolor-glib => src}/gcm-sensor-huey-private.h | 4 -
{libcolor-glib => src}/gcm-sensor-huey.c | 2 -
{libcolor-glib => src}/gcm-sensor-huey.h | 4 -
{libcolor-glib => src}/gcm-sensor.c | 62 -
{libcolor-glib => src}/gcm-sensor.h | 4 -
src/gcm-session.c | 1057 +++++++++++---
{libcolor-glib => src}/gcm-tables.c | 4 -
{libcolor-glib => src}/gcm-tables.h | 4 -
{libcolor-glib => src}/gcm-usb.c | 13 -
{libcolor-glib => src}/gcm-usb.h | 0
src/gcm-utils.c | 104 +-
src/gcm-utils.h | 15 +-
src/gcm-viewer.c | 258 ++--
{libcolor-glib => src}/gcm-x11-output.c | 195 ++-
{libcolor-glib => src}/gcm-x11-output.h | 15 +-
{libcolor-glib => src}/gcm-x11-screen.c | 285 +++-
{libcolor-glib => src}/gcm-x11-screen.h | 15 +-
{session => src}/gsd-color-manager.c | 2 +-
src/org.gnome.ColorManager.xml | 61 -
tools/.gitignore | 1 -
tools/Makefile.am | 48 +-
tools/gcm-ddc-util.c | 312 ----
tools/gcm-dump-edid.c | 210 ---
tools/gcm-dump-profile.c | 19 +-
tools/gcm-dump-sensor.c | 5 +-
tools/gcm-sensor-example.c | 3 +-
154 files changed, 4678 insertions(+), 15412 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
