diff options
| author | Charles Kerr <charles.kerr@canonical.com> | 2014-01-16 21:21:13 -0600 |
|---|---|---|
| committer | Charles Kerr <charles.kerr@canonical.com> | 2014-01-16 21:21:13 -0600 |
| commit | 5e7433aabbe4b14327202ea1e9318bb8fd92d625 (patch) | |
| tree | 858adc477a8c399878b45e69760bc3c0f6fd2cd5 | |
| parent | 40689ea36c360cb6fb42048f5d93303237745b86 (diff) | |
| download | ayatana-indicator-datetime-5e7433aabbe4b14327202ea1e9318bb8fd92d625.tar.gz ayatana-indicator-datetime-5e7433aabbe4b14327202ea1e9318bb8fd92d625.tar.bz2 ayatana-indicator-datetime-5e7433aabbe4b14327202ea1e9318bb8fd92d625.zip | |
fix minor -Wshadow warnings
| -rw-r--r-- | src/utils.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/utils.cpp b/src/utils.cpp index bef8c2e..0b586f4 100644 --- a/src/utils.cpp +++ b/src/utils.cpp @@ -104,11 +104,11 @@ split_settings_location(const gchar* location, gchar** zone, gchar** name) * on the "Oklahoma City" menuitem. */ gchar* -get_beautified_timezone_name(const char* timezone, const char* saved_location) +get_beautified_timezone_name(const char* timezone_, const char* saved_location) { gchar* zone; gchar* name; - split_settings_location(timezone, &zone, &name); + split_settings_location(timezone_, &zone, &name); gchar* saved_zone; gchar* saved_name; @@ -134,10 +134,10 @@ get_beautified_timezone_name(const char* timezone, const char* saved_location) } gchar* -get_timezone_name(const gchar* timezone, GSettings* settings) +get_timezone_name(const gchar* timezone_, GSettings* settings) { auto saved_location = g_settings_get_string(settings, SETTINGS_TIMEZONE_NAME_S); - auto rv = get_beautified_timezone_name(timezone, saved_location); + auto rv = get_beautified_timezone_name(timezone_, saved_location); g_free(saved_location); return rv; } |