[gnome-color-manager: 2/2] trivial: fix up merge conflicts

[Richard Hughes <rhughes src gnome org>]

commit 1dc4936918a3274a6bb4a5faaed67fdab7f0a8f5
Merge: c2e1f80 a099031
Author: Richard Hughes <richard hughsie com>
Date:   Thu May 6 16:24:27 2010 +0100

    trivial: fix up merge conflicts

 NEWS                                |   36 +
 RELEASE                             |    8 +-
 configure.ac                        |   32 +-
 contrib/gnome-color-manager.spec.in |    2 +-
 data/gcm-picker.ui                  |   76 +-
 data/gcm-prefs.ui                   |   85 ++-
 data/gnome-color-manager.schemas.in |   24 +-
 po/LINGUAS                          |    1 +
 po/POTFILES.in                      |    1 +
 po/de.po                            |  707 ++++++------
 po/en_GB.po                         | 2000 ++++++++++++++++++++++++--------
 po/es.po                            |  558 +++++----
 po/ja.po                            | 2206 +++++++++++++++++++++++++++++++++++
 po/nb.po                            |  922 +++++++++-------
 po/sl.po                            |  704 ++++++------
 src/Makefile.am                     |   11 +-
 src/gcm-apply.c                     |    2 +-
 src/gcm-calibrate-argyll.c          |  366 +++++--
 src/gcm-calibrate-dialog.c          |   30 +-
 src/gcm-calibrate-dialog.h          |    2 +
 src/gcm-calibrate.c                 |   61 +
 src/gcm-calibrate.h                 |    7 +
 src/gcm-client.c                    |  131 ++-
 src/gcm-client.h                    |   10 +
 src/gcm-dbus.c                      |    2 +-
 src/gcm-device-cups.c               |    6 +-
 src/gcm-device-xrandr.c             |   29 +-
 src/gcm-device-xrandr.h             |    1 +
 src/gcm-dump-edid.c                 |    8 +-
 src/gcm-edid.c                      |   48 +-
 src/gcm-edid.h                      |    2 +-
 src/gcm-enum.c                      |   17 +
 src/gcm-enum.h                      |    1 +
 src/gcm-picker.c                    |  338 +++++-
 src/gcm-prefs.c                     |   47 +-
 src/gcm-profile.c                   |   24 +-
 src/gcm-profile.h                   |    1 +
 src/gcm-xyz.c                       |   47 +-
 src/gcm-xyz.h                       |    6 +-
 39 files changed, 6460 insertions(+), 2099 deletions(-)
---
diff --cc configure.ac
index 1d0d38c,1ed868d..2529d07
--- a/configure.ac
+++ b/configure.ac
@@@ -103,12 -102,11 +103,12 @@@ dnl -----------------------------------
  GLIB_REQUIRED=2.14.0
  GTK_REQUIRED=2.14.0
  GNOMEDESKTOP_REQUIRED=2.14.0
 -GCONF_REQUIRED=0.22
 +GCONF_REQUIRED=2.31.1
  UNIQUE_REQUIRED=1.0.0
- VTE_REQUIRED=0.22.2
+ VTE_REQUIRED=0.25.1
  DBUS_GLIB_REQUIRED=0.73
  CANBERRA_REQUIRED=0.10
 +GIO_REQUIRED=2.25.0
  
  dnl ---------------------------------------------------------------------------
  dnl - Check library dependencies
diff --cc src/gcm-calibrate.c
index 5376cfc,a8a2edd..c39bf0c
--- a/src/gcm-calibrate.c
+++ b/src/gcm-calibrate.c
@@@ -32,8 -32,10 +32,9 @@@
  #include <gtk/gtk.h>
  #include <tiff.h>
  #include <tiffio.h>
 -#include <gconf/gconf-client.h>
  
  #include "gcm-calibrate.h"
+ #include "gcm-xyz.h"
  #include "gcm-dmi.h"
  #include "gcm-device-xrandr.h"
  #include "gcm-utils.h"
diff --cc src/gcm-dbus.c
index 3ee4476,7ba4223..c89a51a
--- a/src/gcm-dbus.c
+++ b/src/gcm-dbus.c
@@@ -554,14 -553,19 +554,14 @@@ gcm_dbus_init (GcmDbus *dbus
  	dbus->priv->profile_store = gcm_profile_store_new ();
  	dbus->priv->timer = g_timer_new ();
  
 -	/* notify on changes */
 -	gconf_client_notify_add (dbus->priv->gconf_client, GCM_SETTINGS_DIR,
 -				 (GConfClientNotifyFunc) gcm_dbus_gconf_key_changed_cb,
 -				 dbus, NULL, NULL);
 -
  	/* coldplug */
 -	dbus->priv->rendering_intent_display = gconf_client_get_string (dbus->priv->gconf_client, GCM_SETTINGS_RENDERING_INTENT_DISPLAY, NULL);
 -	dbus->priv->rendering_intent_softproof = gconf_client_get_string (dbus->priv->gconf_client, GCM_SETTINGS_RENDERING_INTENT_SOFTPROOF, NULL);
 -	dbus->priv->colorspace_rgb = gconf_client_get_string (dbus->priv->gconf_client, GCM_SETTINGS_COLORSPACE_RGB, NULL);
 -	dbus->priv->colorspace_cmyk = gconf_client_get_string (dbus->priv->gconf_client, GCM_SETTINGS_COLORSPACE_CMYK, NULL);
 +	dbus->priv->rendering_intent_display = g_settings_get_string (dbus->priv->settings, GCM_SETTINGS_RENDERING_INTENT_DISPLAY);
 +	dbus->priv->rendering_intent_softproof = g_settings_get_string (dbus->priv->settings, GCM_SETTINGS_RENDERING_INTENT_SOFTPROOF);
 +	dbus->priv->colorspace_rgb = g_settings_get_string (dbus->priv->settings, GCM_SETTINGS_COLORSPACE_RGB);
 +	dbus->priv->colorspace_cmyk = g_settings_get_string (dbus->priv->settings, GCM_SETTINGS_COLORSPACE_CMYK);
  
  	/* get all devices */
- 	ret = gcm_client_add_connected (dbus->priv->client, &error);
+ 	ret = gcm_client_add_connected (dbus->priv->client, GCM_CLIENT_COLDPLUG_ALL, &error);
  	if (!ret) {
  		egg_warning ("failed to coldplug: %s", error->message);
  		g_error_free (error);
diff --cc src/gcm-device-xrandr.c
index 0c36705,c1a3142..4eb8b05
--- a/src/gcm-device-xrandr.c
+++ b/src/gcm-device-xrandr.c
@@@ -688,9 -713,10 +712,10 @@@ gcm_device_xrandr_finalize (GObject *ob
  	GcmDeviceXrandrPrivate *priv = device_xrandr->priv;
  
  	g_free (priv->native_device);
+ 	g_free (priv->eisa_id);
  	g_object_unref (priv->edid);
  	g_object_unref (priv->dmi);
 -	g_object_unref (priv->gconf_client);
 +	g_object_unref (priv->settings);
  	g_object_unref (priv->screen);
  	g_object_unref (priv->xserver);