[gnome-color-manager] Use cd_client_find_profile_by_property_sync() where available
- From: Richard Hughes <rhughes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-color-manager] Use cd_client_find_profile_by_property_sync() where available
- Date: Mon, 8 Oct 2012 16:28:49 +0000 (UTC)
commit 00cbd7869d888620edbde49d340db67e21426e34
Author: Richard Hughes <richard hughsie com>
Date: Mon Oct 8 17:29:44 2012 +0100
Use cd_client_find_profile_by_property_sync() where available
The profile ID is not the best way to find a specific profile.
src/gcm-import.c | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
---
diff --git a/src/gcm-import.c b/src/gcm-import.c
index 42f9872..e116a33 100644
--- a/src/gcm-import.c
+++ b/src/gcm-import.c
@@ -176,6 +176,7 @@ main (int argc, char **argv)
g_string_append_printf (string, "\n%s %s", _("Profile copyright:"), copyright);
}
+#if !CD_CHECK_VERSION(0,1,24)
/* check file does't already exist as a file */
destination = gcm_utils_get_profile_destination (file);
ret = g_file_query_exists (destination, NULL);
@@ -193,6 +194,7 @@ main (int argc, char **argv)
gtk_widget_destroy (dialog);
goto out;
}
+#endif
/* check file does't already exist as system-wide */
client = cd_client_new ();
@@ -205,10 +207,19 @@ main (int argc, char **argv)
g_error_free (error);
goto out;
}
+#if CD_CHECK_VERSION(0,1,24)
+ profile_tmp = cd_client_find_profile_by_property_sync (client,
+ CD_PROFILE_METADATA_FILE_CHECKSUM,
+ gcm_profile_get_checksum (profile),
+ NULL,
+ NULL);
+#else
+ /* FIXME: this isn't supported by the daemon */
profile_tmp = cd_client_find_profile_sync (client,
gcm_profile_get_checksum (profile),
NULL,
NULL);
+#endif
if (profile_tmp != NULL) {
/* TRANSLATORS: color profile already been installed */
dialog = gtk_message_dialog_new (NULL,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]