Blame 0001-Fix-session-helper-failing-to-find-argyll-tool.patch
|
Richard Hughes |
1a9392a |
From 301f24d02158f1e12a2e7ccdf9970d02ecddd534 Mon Sep 17 00:00:00 2001
|
|
Richard Hughes |
1a9392a |
From: Tim Waugh <twaugh@redhat.com>
|
|
Richard Hughes |
1a9392a |
Date: Mon, 23 Feb 2015 09:56:12 +0000
|
|
Richard Hughes |
1a9392a |
Subject: [PATCH] Fix session-helper failing to find argyll tool.
|
|
Richard Hughes |
1a9392a |
|
|
Richard Hughes |
1a9392a |
We don't want to free the thing we're trying to return. This fixes the
|
|
Richard Hughes |
1a9392a |
bug introduced in commit b6f7c4d117a06f059a6e852e2dce8c13a3bb1f2c.
|
|
Richard Hughes |
1a9392a |
|
|
Richard Hughes |
1a9392a |
See:
|
|
Richard Hughes |
1a9392a |
https://bugzilla.redhat.com/show_bug.cgi?id=1190720
|
|
Richard Hughes |
1a9392a |
---
|
|
Richard Hughes |
1a9392a |
contrib/session-helper/cd-main.c | 2 +-
|
|
Richard Hughes |
1a9392a |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
Richard Hughes |
1a9392a |
|
|
Richard Hughes |
1a9392a |
diff --git a/contrib/session-helper/cd-main.c b/contrib/session-helper/cd-main.c
|
|
Richard Hughes |
1a9392a |
index 61e0c5b..0f93697 100644
|
|
Richard Hughes |
1a9392a |
--- a/contrib/session-helper/cd-main.c
|
|
Richard Hughes |
1a9392a |
+++ b/contrib/session-helper/cd-main.c
|
|
Richard Hughes |
1a9392a |
@@ -939,7 +939,7 @@ cd_main_find_argyll_tool (const gchar *command,
|
|
Richard Hughes |
1a9392a |
GError **error)
|
|
Richard Hughes |
1a9392a |
{
|
|
Richard Hughes |
1a9392a |
gboolean ret;
|
|
Richard Hughes |
1a9392a |
- _cleanup_free_ gchar *filename = NULL;
|
|
Richard Hughes |
1a9392a |
+ gchar *filename;
|
|
Richard Hughes |
1a9392a |
|
|
Richard Hughes |
1a9392a |
/* try the original argyllcms filename installed in /usr/local/bin */
|
|
Richard Hughes |
1a9392a |
filename = g_strdup_printf ("/usr/local/bin/%s", command);
|
|
Richard Hughes |
1a9392a |
--
|
|
Richard Hughes |
1a9392a |
2.1.0
|
|
Richard Hughes |
1a9392a |
|