diff options
| author | Ted Gould <ted@gould.cx> | 2010-10-24 13:40:42 -0400 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-10-24 13:40:42 -0400 |
| commit | 1475e7bfffe35dc72454017f5fcf087214e650a3 (patch) | |
| tree | 8289dcb67133e22197c9f2fd9b97789d35e3c815 | |
| parent | 4c2ef2a44263275c471728a98e751723721348aa (diff) | |
| parent | 13be17f55dae82a632ede4adb9e66556da7992a9 (diff) | |
| download | ayatana-indicator-datetime-1475e7bfffe35dc72454017f5fcf087214e650a3.tar.gz ayatana-indicator-datetime-1475e7bfffe35dc72454017f5fcf087214e650a3.tar.bz2 ayatana-indicator-datetime-1475e7bfffe35dc72454017f5fcf087214e650a3.zip | |
* Upstream Merge
* Generate the format string at init
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | src/indicator-datetime.c | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index c0800ea..43e9aa4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +indicator-datetime (0.0.6-0ubuntu1~ppa3) UNRELEASED; urgency=low + + * Upstream Merge + * Generate the format string at init + + -- Ted Gould <ted@ubuntu.com> Sun, 24 Oct 2010 13:40:05 -0400 + indicator-datetime (0.0.6-0ubuntu1~ppa2) maverick; urgency=low * Upstream Merge diff --git a/src/indicator-datetime.c b/src/indicator-datetime.c index cef2b00..acdc340 100644 --- a/src/indicator-datetime.c +++ b/src/indicator-datetime.c @@ -220,14 +220,14 @@ indicator_datetime_init (IndicatorDatetime *self) self->priv->idle_measure = 0; self->priv->max_width = 0; - self->priv->time_string = g_strdup(DEFAULT_TIME_FORMAT); - self->priv->time_mode = SETTINGS_TIME_LOCALE; self->priv->show_seconds = FALSE; self->priv->show_date = FALSE; self->priv->show_day = FALSE; self->priv->custom_string = g_strdup(DEFAULT_TIME_FORMAT); + self->priv->time_string = generate_format_string(self); + self->priv->service_proxy = NULL; self->priv->sm = NULL; |