diff options
| author | Richard Hughes <richard@hughsie.com> | 2011-03-08 22:06:20 +0000 |
|---|---|---|
| committer | Richard Hughes <richard@hughsie.com> | 2011-03-08 22:06:20 +0000 |
| commit | 4264924e8baaacfeda5b145aa524e43e4467cb0d (patch) | |
| tree | b538895bb59dc4604700e15cb24fa35a73641464 | |
| parent | c7013c83026e7971ceb8b33d243572d1a7aa2886 (diff) | |
| download | colord-4264924e8baaacfeda5b145aa524e43e4467cb0d.tar.gz | |
Do not coldplug SANE devices unless UseSANE=true as SANE is causing crashes
| -rw-r--r-- | etc/colord.conf | 5 | ||||
| -rw-r--r-- | src/cd-main.c | 13 |
2 files changed, 13 insertions, 5 deletions
diff --git a/etc/colord.conf b/etc/colord.conf index 0f4b025..9cd770e 100644 --- a/etc/colord.conf +++ b/etc/colord.conf @@ -7,3 +7,8 @@ # # default=true SearchVolumes=true + +# If we should use SANE to add scanner and camera devices. +# +# default=false +UseSANE=false diff --git a/src/cd-main.c b/src/cd-main.c index 7a805fb..b2ae246 100644 --- a/src/cd-main.c +++ b/src/cd-main.c @@ -1153,11 +1153,14 @@ cd_main_on_name_acquired_cb (GDBusConnection *connection_, cd_udev_client_coldplug (udev_client); /* add SANE devices */ - ret = cd_sane_client_refresh (sane_client, &error); - if (!ret) { - g_warning ("CdMain: failed to refresh SANE devices: %s", - error->message); - g_error_free (error); + ret = cd_config_get_boolean (config, "UseSANE"); + if (ret) { + ret = cd_sane_client_refresh (sane_client, &error); + if (!ret) { + g_warning ("CdMain: failed to refresh SANE devices: %s", + error->message); + g_error_free (error); + } } out: if (array_devices != NULL) |