[gnome-settings-daemon] color: Split out the color profile functionality into a new file
- From: Richard Hughes <rhughes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-settings-daemon] color: Split out the color profile functionality into a new file
- Date: Fri, 26 Jul 2013 10:54:54 +0000 (UTC)
commit 32cdd48761d4c97589e36462e509b2ae5bc95122
Author: Richard Hughes <richard hughsie com>
Date: Wed Jul 17 11:23:39 2013 +0100
color: Split out the color profile functionality into a new file
plugins/color/Makefile.am | 2 +
plugins/color/gsd-color-manager.c | 159 ++--------------------
plugins/color/gsd-color-profiles.c | 267 ++++++++++++++++++++++++++++++++++++
plugins/color/gsd-color-profiles.h | 55 ++++++++
4 files changed, 333 insertions(+), 150 deletions(-)
---
diff --git a/plugins/color/Makefile.am b/plugins/color/Makefile.am
index a711748..bb02018 100644
--- a/plugins/color/Makefile.am
+++ b/plugins/color/Makefile.am
@@ -10,6 +10,8 @@ libcolor_la_SOURCES = \
gsd-color-calibrate.h \
gsd-color-manager.c \
gsd-color-manager.h \
+ gsd-color-profiles.c \
+ gsd-color-profiles.h \
gsd-color-plugin.c
libcolor_la_CPPFLAGS = \
diff --git a/plugins/color/gsd-color-manager.c b/plugins/color/gsd-color-manager.c
index 1a4f468..173ca07 100644
--- a/plugins/color/gsd-color-manager.c
+++ b/plugins/color/gsd-color-manager.c
@@ -36,6 +36,7 @@
#include "gnome-settings-session.h"
#include "gsd-color-calibrate.h"
#include "gsd-color-manager.h"
+#include "gsd-color-profiles.h"
#include "gcm-edid.h"
#define GSD_COLOR_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_COLOR_MANAGER,
GsdColorManagerPrivate))
@@ -44,13 +45,13 @@ struct GsdColorManagerPrivate
{
GDBusProxy *session;
CdClient *client;
- CdIccStore *icc_store;
GnomeRRScreen *x11_screen;
GHashTable *edid_cache;
GdkWindow *gdk_window;
gboolean session_is_active;
GHashTable *device_assign_hash;
GsdColorCalibrate *calibrate;
+ GsdColorProfiles *profiles;
};
enum {
@@ -1256,18 +1257,6 @@ gcm_session_client_connect_cb (GObject *source_object,
goto out;
}
- /* add profiles */
- ret = cd_icc_store_search_kind (priv->icc_store,
- CD_ICC_STORE_SEARCH_KIND_USER,
- CD_ICC_STORE_SEARCH_FLAGS_CREATE_LOCATION,
- NULL,
- &error);
- if (!ret) {
- g_warning ("failed to add user icc: %s", error->message);
- g_error_free (error);
- goto out;
- }
-
/* add screens */
gnome_rr_screen_refresh (priv->x11_screen, &error);
if (error != NULL) {
@@ -1328,6 +1317,11 @@ gsd_color_manager_start (GsdColorManager *manager,
if (priv->x11_screen == NULL)
goto out;
+ /* start the profiles collection */
+ ret = gsd_color_profiles_start (priv->profiles, error);
+ if (!ret)
+ goto out;
+
cd_client_connect (priv->client,
NULL,
gcm_session_client_connect_cb,
@@ -1346,137 +1340,12 @@ gsd_color_manager_stop (GsdColorManager *manager)
g_debug ("Stopping color manager");
g_clear_object (&manager->priv->client);
- g_clear_object (&manager->priv->icc_store);
g_clear_object (&manager->priv->session);
g_clear_pointer (&manager->priv->edid_cache, g_hash_table_destroy);
g_clear_pointer (&manager->priv->device_assign_hash, g_hash_table_destroy);
g_clear_object (&manager->priv->x11_screen);
}
-static void
-gcm_session_create_profile_cb (GObject *object,
- GAsyncResult *res,
- gpointer user_data)
-{
- CdProfile *profile;
- GError *error = NULL;
- CdClient *client = CD_CLIENT (object);
-
- profile = cd_client_create_profile_finish (client, res, &error);
- if (profile == NULL) {
- if (error->domain != CD_CLIENT_ERROR ||
- error->code != CD_CLIENT_ERROR_ALREADY_EXISTS)
- g_warning ("%s", error->message);
- g_error_free (error);
- return;
- }
- g_object_unref (profile);
-}
-
-static void
-gcm_session_icc_store_added_cb (CdIccStore *icc_store,
- CdIcc *icc,
- GsdColorManager *manager)
-{
- GsdColorManagerPrivate *priv = manager->priv;
-#if CD_CHECK_VERSION(1,1,1)
- cd_client_create_profile_for_icc (priv->client,
- icc,
- CD_OBJECT_SCOPE_TEMP,
- NULL,
- gcm_session_create_profile_cb,
- manager);
-#else
- const gchar *filename;
- const gchar *checksum;
- gchar *profile_id = NULL;
- GHashTable *profile_props = NULL;
-
- filename = cd_icc_get_filename (icc);
- g_debug ("profile %s added", filename);
-
- /* generate ID */
- checksum = cd_icc_get_checksum (icc);
- profile_id = g_strdup_printf ("icc-%s", checksum);
- profile_props = g_hash_table_new_full (g_str_hash, g_str_equal,
- NULL, NULL);
- g_hash_table_insert (profile_props,
- CD_PROFILE_PROPERTY_FILENAME,
- (gpointer) filename);
- g_hash_table_insert (profile_props,
- CD_PROFILE_METADATA_FILE_CHECKSUM,
- (gpointer) checksum);
- cd_client_create_profile (priv->client,
- profile_id,
- CD_OBJECT_SCOPE_TEMP,
- profile_props,
- NULL,
- gcm_session_create_profile_cb,
- manager);
- g_free (profile_id);
- if (profile_props != NULL)
- g_hash_table_unref (profile_props);
-#endif
-}
-
-static void
-gcm_session_delete_profile_cb (GObject *object,
- GAsyncResult *res,
- gpointer user_data)
-{
- gboolean ret;
- GError *error = NULL;
- CdClient *client = CD_CLIENT (object);
-
- ret = cd_client_delete_profile_finish (client, res, &error);
- if (!ret) {
- g_warning ("%s", error->message);
- g_error_free (error);
- }
-}
-
-static void
-gcm_session_find_profile_by_filename_cb (GObject *object,
- GAsyncResult *res,
- gpointer user_data)
-{
- GError *error = NULL;
- CdProfile *profile;
- CdClient *client = CD_CLIENT (object);
- GsdColorManager *manager = GSD_COLOR_MANAGER (user_data);
-
- profile = cd_client_find_profile_by_filename_finish (client, res, &error);
- if (profile == NULL) {
- g_warning ("%s", error->message);
- g_error_free (error);
- goto out;
- }
-
- /* remove it from colord */
- cd_client_delete_profile (manager->priv->client,
- profile,
- NULL,
- gcm_session_delete_profile_cb,
- manager);
-out:
- if (profile != NULL)
- g_object_unref (profile);
-}
-
-static void
-gcm_session_icc_store_removed_cb (CdIccStore *icc_store,
- CdIcc *icc,
- GsdColorManager *manager)
-{
- /* find the ID for the filename */
- g_debug ("filename %s removed", cd_icc_get_filename (icc));
- cd_client_find_profile_by_filename (manager->priv->client,
- cd_icc_get_filename (icc),
- NULL,
- gcm_session_find_profile_by_filename_cb,
- manager);
-}
-
static gboolean
has_changed (char **strv,
const char *str)
@@ -1565,19 +1434,9 @@ gsd_color_manager_init (GsdColorManager *manager)
priv->client = cd_client_new ();
- /* have access to all user profiles */
- priv->icc_store = cd_icc_store_new ();
- cd_icc_store_set_load_flags (priv->icc_store,
- CD_ICC_LOAD_FLAGS_FALLBACK_MD5);
- g_signal_connect (priv->icc_store, "added",
- G_CALLBACK (gcm_session_icc_store_added_cb),
- manager);
- g_signal_connect (priv->icc_store, "removed",
- G_CALLBACK (gcm_session_icc_store_removed_cb),
- manager);
-
/* setup calibration features */
priv->calibrate = gsd_color_calibrate_new ();
+ priv->profiles = gsd_color_profiles_new ();
}
static void
@@ -1592,7 +1451,7 @@ gsd_color_manager_finalize (GObject *object)
g_clear_object (&manager->priv->client);
g_clear_object (&manager->priv->calibrate);
- g_clear_object (&manager->priv->icc_store);
+ g_clear_object (&manager->priv->profiles);
g_clear_object (&manager->priv->session);
g_clear_pointer (&manager->priv->edid_cache, g_hash_table_destroy);
g_clear_pointer (&manager->priv->device_assign_hash, g_hash_table_destroy);
diff --git a/plugins/color/gsd-color-profiles.c b/plugins/color/gsd-color-profiles.c
new file mode 100644
index 0000000..2b01faa
--- /dev/null
+++ b/plugins/color/gsd-color-profiles.c
@@ -0,0 +1,267 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
+ * Copyright (C) 2007 William Jon McCann <mccann jhu edu>
+ * Copyright (C) 2011-2013 Richard Hughes <richard hughsie com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ */
+
+#include "config.h"
+
+#include <glib/gi18n.h>
+#include <colord.h>
+
+#include "gsd-color-profiles.h"
+
+#define GSD_COLOR_PROFILES_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_COLOR_PROFILES,
GsdColorProfilesPrivate))
+
+struct GsdColorProfilesPrivate
+{
+ CdClient *client;
+ CdIccStore *icc_store;
+};
+
+static void gsd_color_profiles_class_init (GsdColorProfilesClass *klass);
+static void gsd_color_profiles_init (GsdColorProfiles *color_profiles);
+static void gsd_color_profiles_finalize (GObject *object);
+
+G_DEFINE_TYPE (GsdColorProfiles, gsd_color_profiles, G_TYPE_OBJECT)
+
+static void
+gsd_color_profiles_class_init (GsdColorProfilesClass *klass)
+{
+ GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+ object_class->finalize = gsd_color_profiles_finalize;
+
+ g_type_class_add_private (klass, sizeof (GsdColorProfilesPrivate));
+}
+
+static void
+gcm_session_client_connect_cb (GObject *source_object,
+ GAsyncResult *res,
+ gpointer user_data)
+{
+ gboolean ret;
+ GError *error = NULL;
+ GsdColorProfiles *profiles = GSD_COLOR_PROFILES (user_data);
+ GsdColorProfilesPrivate *priv = profiles->priv;
+
+ /* connected */
+ ret = cd_client_connect_finish (profiles->priv->client, res, &error);
+ if (!ret) {
+ g_warning ("failed to connect to colord: %s", error->message);
+ g_error_free (error);
+ return;
+ }
+
+ /* is there an available colord instance? */
+ ret = cd_client_get_has_server (profiles->priv->client);
+ if (!ret) {
+ g_warning ("There is no colord server available");
+ return;
+ }
+
+ /* add profiles */
+ ret = cd_icc_store_search_kind (priv->icc_store,
+ CD_ICC_STORE_SEARCH_KIND_USER,
+ CD_ICC_STORE_SEARCH_FLAGS_CREATE_LOCATION,
+ NULL,
+ &error);
+ if (!ret) {
+ g_warning ("failed to add user icc: %s", error->message);
+ g_error_free (error);
+ }
+}
+
+gboolean
+gsd_color_profiles_start (GsdColorProfiles *profiles,
+ GError **error)
+{
+ cd_client_connect (profiles->priv->client,
+ NULL,
+ gcm_session_client_connect_cb,
+ profiles);
+
+ return TRUE;
+}
+
+static void
+gcm_session_create_profile_cb (GObject *object,
+ GAsyncResult *res,
+ gpointer user_data)
+{
+ CdProfile *profile;
+ GError *error = NULL;
+ CdClient *client = CD_CLIENT (object);
+
+ profile = cd_client_create_profile_finish (client, res, &error);
+ if (profile == NULL) {
+ if (error->domain != CD_CLIENT_ERROR ||
+ error->code != CD_CLIENT_ERROR_ALREADY_EXISTS)
+ g_warning ("%s", error->message);
+ g_error_free (error);
+ return;
+ }
+ g_object_unref (profile);
+}
+
+static void
+gcm_session_icc_store_added_cb (CdIccStore *icc_store,
+ CdIcc *icc,
+ GsdColorProfiles *profiles)
+{
+ GsdColorProfilesPrivate *priv = profiles->priv;
+#if CD_CHECK_VERSION(1,1,1)
+ cd_client_create_profile_for_icc (priv->client,
+ icc,
+ CD_OBJECT_SCOPE_TEMP,
+ NULL,
+ gcm_session_create_profile_cb,
+ profiles);
+#else
+ const gchar *filename;
+ const gchar *checksum;
+ gchar *profile_id = NULL;
+ GHashTable *profile_props = NULL;
+
+ filename = cd_icc_get_filename (icc);
+ g_debug ("profile %s added", filename);
+
+ /* generate ID */
+ checksum = cd_icc_get_checksum (icc);
+ profile_id = g_strdup_printf ("icc-%s", checksum);
+ profile_props = g_hash_table_new_full (g_str_hash, g_str_equal,
+ NULL, NULL);
+ g_hash_table_insert (profile_props,
+ CD_PROFILE_PROPERTY_FILENAME,
+ (gpointer) filename);
+ g_hash_table_insert (profile_props,
+ CD_PROFILE_METADATA_FILE_CHECKSUM,
+ (gpointer) checksum);
+ cd_client_create_profile (priv->client,
+ profile_id,
+ CD_OBJECT_SCOPE_TEMP,
+ profile_props,
+ NULL,
+ gcm_session_create_profile_cb,
+ profiles);
+ g_free (profile_id);
+ if (profile_props != NULL)
+ g_hash_table_unref (profile_props);
+#endif
+}
+
+static void
+gcm_session_delete_profile_cb (GObject *object,
+ GAsyncResult *res,
+ gpointer user_data)
+{
+ gboolean ret;
+ GError *error = NULL;
+ CdClient *client = CD_CLIENT (object);
+
+ ret = cd_client_delete_profile_finish (client, res, &error);
+ if (!ret) {
+ g_warning ("%s", error->message);
+ g_error_free (error);
+ }
+}
+
+static void
+gcm_session_find_profile_by_filename_cb (GObject *object,
+ GAsyncResult *res,
+ gpointer user_data)
+{
+ GError *error = NULL;
+ CdProfile *profile;
+ CdClient *client = CD_CLIENT (object);
+ GsdColorProfiles *profiles = GSD_COLOR_PROFILES (user_data);
+
+ profile = cd_client_find_profile_by_filename_finish (client, res, &error);
+ if (profile == NULL) {
+ g_warning ("%s", error->message);
+ g_error_free (error);
+ goto out;
+ }
+
+ /* remove it from colord */
+ cd_client_delete_profile (profiles->priv->client,
+ profile,
+ NULL,
+ gcm_session_delete_profile_cb,
+ profiles);
+out:
+ if (profile != NULL)
+ g_object_unref (profile);
+}
+
+static void
+gcm_session_icc_store_removed_cb (CdIccStore *icc_store,
+ CdIcc *icc,
+ GsdColorProfiles *profiles)
+{
+ /* find the ID for the filename */
+ g_debug ("filename %s removed", cd_icc_get_filename (icc));
+ cd_client_find_profile_by_filename (profiles->priv->client,
+ cd_icc_get_filename (icc),
+ NULL,
+ gcm_session_find_profile_by_filename_cb,
+ profiles);
+}
+
+static void
+gsd_color_profiles_init (GsdColorProfiles *profiles)
+{
+ GsdColorProfilesPrivate *priv;
+ priv = profiles->priv = GSD_COLOR_PROFILES_GET_PRIVATE (profiles);
+
+ /* have access to all user profiles */
+ priv->client = cd_client_new ();
+ priv->icc_store = cd_icc_store_new ();
+ cd_icc_store_set_load_flags (priv->icc_store,
+ CD_ICC_LOAD_FLAGS_FALLBACK_MD5);
+ g_signal_connect (priv->icc_store, "added",
+ G_CALLBACK (gcm_session_icc_store_added_cb),
+ profiles);
+ g_signal_connect (priv->icc_store, "removed",
+ G_CALLBACK (gcm_session_icc_store_removed_cb),
+ profiles);
+}
+
+static void
+gsd_color_profiles_finalize (GObject *object)
+{
+ GsdColorProfiles *profiles;
+
+ g_return_if_fail (object != NULL);
+ g_return_if_fail (GSD_IS_COLOR_PROFILES (object));
+
+ profiles = GSD_COLOR_PROFILES (object);
+
+ g_clear_object (&profiles->priv->icc_store);
+ g_clear_object (&profiles->priv->client);
+
+ G_OBJECT_CLASS (gsd_color_profiles_parent_class)->finalize (object);
+}
+
+GsdColorProfiles *
+gsd_color_profiles_new (void)
+{
+ GsdColorProfiles *profiles;
+ profiles = g_object_new (GSD_TYPE_COLOR_PROFILES, NULL);
+ return GSD_COLOR_PROFILES (profiles);
+}
diff --git a/plugins/color/gsd-color-profiles.h b/plugins/color/gsd-color-profiles.h
new file mode 100644
index 0000000..d045388
--- /dev/null
+++ b/plugins/color/gsd-color-profiles.h
@@ -0,0 +1,55 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
+ * Copyright (C) 2007 William Jon McCann <mccann jhu edu>
+ * Copyright (C) 2011-2013 Richard Hughes <richard hughsie com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ */
+
+#ifndef __GSD_COLOR_PROFILES_H
+#define __GSD_COLOR_PROFILES_H
+
+#include <glib-object.h>
+
+G_BEGIN_DECLS
+
+#define GSD_TYPE_COLOR_PROFILES (gsd_color_profiles_get_type ())
+#define GSD_COLOR_PROFILES(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GSD_TYPE_COLOR_PROFILES,
GsdColorProfiles))
+#define GSD_IS_COLOR_PROFILES(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GSD_TYPE_COLOR_PROFILES))
+
+typedef struct GsdColorProfilesPrivate GsdColorProfilesPrivate;
+
+typedef struct
+{
+ GObject parent;
+ GsdColorProfilesPrivate *priv;
+} GsdColorProfiles;
+
+typedef struct
+{
+ GObjectClass parent_class;
+} GsdColorProfilesClass;
+
+GType gsd_color_profiles_get_type (void);
+GQuark gsd_color_profiles_error_quark (void);
+
+GsdColorProfiles * gsd_color_profiles_new (void);
+gboolean gsd_color_profiles_start (GsdColorProfiles *profiles,
+ GError **error);
+
+G_END_DECLS
+
+#endif /* __GSD_COLOR_PROFILES_H */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
