summaryrefslogtreecommitdiff
path: root/extra/colord
diff options
context:
space:
mode:
authorParabola <dev@list.parabolagnulinux.org>2012-02-05 17:25:05 +0000
committerParabola <dev@list.parabolagnulinux.org>2012-02-05 17:25:05 +0000
commit359d940358dec836dd0acfe9d9caf0b1ff0a97fe (patch)
treeeeed5f77c8417a98fe5b8538d3c019d1cea00c04 /extra/colord
parentcdc66cc7110e78bf1197f9effc70422114f9341b (diff)
Sun Feb 5 17:25:01 UTC 2012
Diffstat (limited to 'extra/colord')
-rw-r--r--extra/colord/scan_only_color_profile_dir.patch35
1 files changed, 0 insertions, 35 deletions
diff --git a/extra/colord/scan_only_color_profile_dir.patch b/extra/colord/scan_only_color_profile_dir.patch
deleted file mode 100644
index 0591fc420..000000000
--- a/extra/colord/scan_only_color_profile_dir.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 78b6dc7dbf865df6b0d30526293591fe5773029a Mon Sep 17 00:00:00 2001
-From: Richard Hughes <richard@hughsie.com>
-Date: Tue, 6 Dec 2011 09:49:49 +0000
-Subject: [PATCH] If /usr/share/color appears at runtime, don't rescan the
- parent dir
-
-Resolves https://bugs.freedesktop.org/show_bug.cgi?id=43542
----
- src/cd-profile-store.c | 10 ++++++++--
- 1 files changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/src/cd-profile-store.c b/src/cd-profile-store.c
-index ecad474..c662351 100644
---- a/src/cd-profile-store.c
-+++ b/src/cd-profile-store.c
-@@ -260,8 +260,14 @@ cd_profile_store_file_monitor_changed_cb (GFileMonitor *monitor,
- /* just rescan the correct directory */
- parent = g_file_get_parent (file);
- parent_path = g_file_get_path (parent);
-- g_debug ("CdProfileStore: %s was added, rescanning %s", path, parent_path);
-- cd_profile_store_search_path (profile_store, parent_path);
-+ if (g_strcmp0 (parent_path, DATADIR) == 0) {
-+ g_debug ("CdProfileStore: %s was added, rescanning", path);
-+ cd_profile_store_search_path (profile_store, path);
-+ } else {
-+ g_debug ("CdProfileStore: %s was added, rescanning parent %s",
-+ path, parent_path);
-+ cd_profile_store_search_path (profile_store, parent_path);
-+ }
- out:
- if (parent != NULL)
- g_object_unref (parent);
---
-1.7.6
-