From 453c54ab16cb5316dbffcc3184b8d3218687436f Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sat, 4 May 2024 23:25:35 +0200 Subject: [PATCH] rename WEATHER_DEV_KEY => WEATHER_API_KEY Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/7925297e03b56a2529f773055bcba407830cb614 Author: vanhofen Date: 2024-05-04 (Sat, 04 May 2024) Origin message was: ------------------ - rename WEATHER_DEV_KEY => WEATHER_API_KEY ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- configure.ac | 14 +++++++------- src/neutrino.cpp | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/configure.ac b/configure.ac index 74acd55e2..fa1a17398 100644 --- a/configure.ac +++ b/configure.ac @@ -204,11 +204,11 @@ AC_ARG_ENABLE(graphlcd, AM_CONDITIONAL(ENABLE_GRAPHLCD, test "$enable_graphlcd" = "yes") # weather -AC_ARG_WITH(weather-dev-key, - AS_HELP_STRING([--with-weather-dev-key=KEY], [API dev key to get data from weather data base, required for additional weather informations]), - [WEATHER_DEV_KEY="$withval"], - [WEATHER_DEV_KEY=""]) -AC_DEFINE_UNQUOTED([WEATHER_DEV_KEY], ["$WEATHER_DEV_KEY"], [API dev key to get data from weather data base, required for additional weather informations]) +AC_ARG_WITH(weather-api-key, + AS_HELP_STRING([--with-weather-api-key=KEY], [API key to get data from weather data base, required for additional weather informations]), + [WEATHER_API_KEY="$withval"], + [WEATHER_API_KEY=""]) +AC_DEFINE_UNQUOTED([WEATHER_API_KEY], ["$WEATHER_API_KEY"], [API key to get data from weather data base, required for additional weather informations]) AC_ARG_WITH(weather-api-version, AS_HELP_STRING([--with-weather-api-version=VERSION], [API version to get data from weather data base, required for additional weather informations]), @@ -217,12 +217,12 @@ AC_ARG_WITH(weather-api-version, AC_DEFINE_UNQUOTED([WEATHER_API_VERSION], ["$WEATHER_API_VERSION"], [API version to get data from weather data base, required for additional weather informations]) AC_ARG_ENABLE([weather-key-manage], - AS_HELP_STRING([--enable-weather-key-manage], [enable manage weather api dev key via gui for additional weather informations @<:@default=yes@:>@]), + AS_HELP_STRING([--enable-weather-key-manage], [enable manage weather api key via gui for additional weather informations @<:@default=yes@:>@]), [enable_weather_key_manage="$enableval"], [enable_weather_key_manage="yes"]) if test "$enable_weather_key_manage" = "yes" ; then - AC_DEFINE([ENABLE_WEATHER_KEY_MANAGE], 1, [enable manage weather api dev key via gui for additional weather informations]) + AC_DEFINE([ENABLE_WEATHER_KEY_MANAGE], 1, [enable manage weather api key via gui for additional weather informations]) fi # weather end diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 901889741..94bb156db 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -1116,7 +1116,7 @@ int CNeutrinoApp::loadSetup(const char *fname) g_settings.font_scaling_y = configfile.getInt32("font_scaling_y", 105); // online services - g_settings.weather_api_key = WEATHER_DEV_KEY; + g_settings.weather_api_key = WEATHER_API_KEY; g_settings.weather_api_version = WEATHER_API_VERSION; #if ENABLE_WEATHER_KEY_MANAGE g_settings.weather_api_key = configfile.getString("weather_api_key", g_settings.weather_api_key.empty() ? "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX" : g_settings.weather_api_key);