diff options
| author | Charles Kerr <charles.kerr@canonical.com> | 2014-03-02 16:09:05 -0600 |
|---|---|---|
| committer | Charles Kerr <charles.kerr@canonical.com> | 2014-03-02 16:09:05 -0600 |
| commit | 422401c1b00f0dfa8926acba116e33b29f2ad7d7 (patch) | |
| tree | 846560db71988c75c514a5d9706327082a82293d /src/date-time.cpp | |
| parent | e5f71ea767515f50f5ed8c34946a87746a3d4ed7 (diff) | |
| parent | 58dd68d0f2d513f70c0348bc26bb6b4db09377df (diff) | |
| download | ayatana-indicator-datetime-422401c1b00f0dfa8926acba116e33b29f2ad7d7.tar.gz ayatana-indicator-datetime-422401c1b00f0dfa8926acba116e33b29f2ad7d7.tar.bz2 ayatana-indicator-datetime-422401c1b00f0dfa8926acba116e33b29f2ad7d7.zip | |
sync with trunk
Diffstat (limited to 'src/date-time.cpp')
| -rw-r--r-- | src/date-time.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/date-time.cpp b/src/date-time.cpp index e6d99cd..432d877 100644 --- a/src/date-time.cpp +++ b/src/date-time.cpp @@ -85,9 +85,15 @@ GDateTime* DateTime::get() const std::string DateTime::format(const std::string& fmt) const { - const auto str = g_date_time_format(get(), fmt.c_str()); - std::string ret = str; - g_free(str); + std::string ret; + + gchar* str = g_date_time_format(get(), fmt.c_str()); + if (str) + { + ret = str; + g_free(str); + } + return ret; } |