diff options
| author | Aaron Plattner <aplattner@nvidia.com> | 2021-01-26 09:16:45 -0800 |
|---|---|---|
| committer | Aaron Plattner <aplattner@nvidia.com> | 2021-01-26 09:16:45 -0800 |
| commit | 2914b3f100e713b194207855727eca2897211417 (patch) | |
| tree | de11b48f3017731efaa83b1a917170f2d914e034 | |
| parent | 57aff2bb1b4e30642aaf3dbfa59d87f72a69d055 (diff) | |
460.39
| -rw-r--r-- | doc/version.mk | 2 | ||||
| -rw-r--r-- | samples/version.mk | 2 | ||||
| -rw-r--r-- | src/gtk+-2.x/ctkappprofile.c | 8 | ||||
| -rw-r--r-- | src/libXNVCtrl/version.mk | 2 | ||||
| -rw-r--r-- | src/version.mk | 2 | ||||
| -rw-r--r-- | version.mk | 2 |
6 files changed, 11 insertions, 7 deletions
diff --git a/doc/version.mk b/doc/version.mk index b3f509d..c0c3082 100644 --- a/doc/version.mk +++ b/doc/version.mk @@ -1,4 +1,4 @@ -NVIDIA_VERSION = 460.32.03 +NVIDIA_VERSION = 460.39 # This file. VERSION_MK_FILE := $(lastword $(MAKEFILE_LIST)) diff --git a/samples/version.mk b/samples/version.mk index b3f509d..c0c3082 100644 --- a/samples/version.mk +++ b/samples/version.mk @@ -1,4 +1,4 @@ -NVIDIA_VERSION = 460.32.03 +NVIDIA_VERSION = 460.39 # This file. VERSION_MK_FILE := $(lastword $(MAKEFILE_LIST)) diff --git a/src/gtk+-2.x/ctkappprofile.c b/src/gtk+-2.x/ctkappprofile.c index ed45acf..7e39c24 100644 --- a/src/gtk+-2.x/ctkappprofile.c +++ b/src/gtk+-2.x/ctkappprofile.c @@ -3686,19 +3686,23 @@ static char *get_default_keys_file(const char *driver_version) return nvstrdup(file_noversion); } else { char *expected_file_paths; + const char *version_missing_error_str; if (file) { expected_file_paths = nvstrcat("either ", file, " or ", file_noversion, NULL); + version_missing_error_str = "."; } else { expected_file_paths = nvstrdup(file_noversion); + version_missing_error_str = " or the X server is not accessible."; } - nv_error_msg("nvidia-settings could not find the registry key file. " + nv_error_msg("nvidia-settings could not find the registry key file%s " "This file should have been installed along with this " "driver at %s. The application profiles " "will continue to work, but values cannot be " "prepopulated or validated, and will not be listed in " "the help text. Please see the README for possible " - "values and descriptions.", expected_file_paths); + "values and descriptions.", version_missing_error_str, + expected_file_paths); free(expected_file_paths); free(file); diff --git a/src/libXNVCtrl/version.mk b/src/libXNVCtrl/version.mk index b3f509d..c0c3082 100644 --- a/src/libXNVCtrl/version.mk +++ b/src/libXNVCtrl/version.mk @@ -1,4 +1,4 @@ -NVIDIA_VERSION = 460.32.03 +NVIDIA_VERSION = 460.39 # This file. VERSION_MK_FILE := $(lastword $(MAKEFILE_LIST)) diff --git a/src/version.mk b/src/version.mk index b3f509d..c0c3082 100644 --- a/src/version.mk +++ b/src/version.mk @@ -1,4 +1,4 @@ -NVIDIA_VERSION = 460.32.03 +NVIDIA_VERSION = 460.39 # This file. VERSION_MK_FILE := $(lastword $(MAKEFILE_LIST)) @@ -1,4 +1,4 @@ -NVIDIA_VERSION = 460.32.03 +NVIDIA_VERSION = 460.39 # This file. VERSION_MK_FILE := $(lastword $(MAKEFILE_LIST)) |