diff options
author | Charles Kerr <charles.kerr@canonical.com> | 2015-10-05 13:06:35 -0500 |
---|---|---|
committer | Charles Kerr <charles.kerr@canonical.com> | 2015-10-05 13:06:35 -0500 |
commit | 55ec6e57ee6ec5930b2ec74ececde52ead16f935 (patch) | |
tree | 7c23970516b3faeb0d70ecaa95888d5dfd959aa0 /tests/test-utils.cpp | |
parent | 645e1ade17334468583a0227cf685940ce6043aa (diff) | |
parent | 3f3445ae0c7c47f3351bccbb4e653c875da89f85 (diff) | |
download | ayatana-indicator-datetime-55ec6e57ee6ec5930b2ec74ececde52ead16f935.tar.gz ayatana-indicator-datetime-55ec6e57ee6ec5930b2ec74ececde52ead16f935.tar.bz2 ayatana-indicator-datetime-55ec6e57ee6ec5930b2ec74ececde52ead16f935.zip |
sync with trunk
Diffstat (limited to 'tests/test-utils.cpp')
-rw-r--r-- | tests/test-utils.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/test-utils.cpp b/tests/test-utils.cpp index 97f07ed..f5c14d4 100644 --- a/tests/test-utils.cpp +++ b/tests/test-utils.cpp @@ -59,7 +59,7 @@ namespace const char* location; const char* expected_name; } beautify_timezone_test_cases[] = { - { "America/Chicago", nullptr, "Chicago" }, + { "America/Chicago", "", "Chicago" }, { "America/Chicago", "America/Chicago", "Chicago" }, { "America/Chicago", "America/Chigago Chicago", "Chicago" }, { "America/Chicago", "America/Chicago Oklahoma City", "Oklahoma City" }, |