← Back to team overview

ayatana-commits team mailing list archive

[Merge] lp:~ted/indicator-datetime/generate-at-init into lp:indicator-datetime

 

Ted Gould has proposed merging lp:~ted/indicator-datetime/generate-at-init into lp:indicator-datetime.

Requested reviews:
  Indicator Applet Developers (indicator-applet-developers)


Fixes the initial value of the timeformat string to be based on the default settings in the locale instead of a random default value.
-- 
https://code.launchpad.net/~ted/indicator-datetime/generate-at-init/+merge/37131
Your team ayatana-commits is subscribed to branch lp:indicator-datetime.
=== modified file 'src/indicator-datetime.c'
--- src/indicator-datetime.c	2010-08-31 12:57:01 +0000
+++ src/indicator-datetime.c	2010-09-30 14:01:03 +0000
@@ -220,14 +220,14 @@
 	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;


Follow ups