* Upstream Merge

  * indicator-datetime-preferences crashed with SIGSEGV in
    g_utf8_normalize() (LP: #727089)
  * Uninstalling Evolution removes calendar from clock applet (LP: #691953)
  * clock doesn't update on timezone change (LP: #735445)
  * Cannot change main location (LP: #729029)
  * indicator-datetime-preferences crashed with SIGSEGV in
    g_simple_async_result_complete() (LP: #734951)
  * Time zone map looks identical when sensitive vs. insensitive (LP: #740846)
  * "Locations" window behaves like a modal dialog (LP: #740924)
  * Added location for clock menu isn't used or remembered (LP: #740930)
  * Time not displayed for added location in "Locations" window (LP: #740931)
  * "UTC" location can be removed but not re-added (LP: #740938)
  * "Locations" window bottom bar is missing a border (LP: #740941)
  * Add and Remove buttons in "Locations" window have unnecessary tooltips
    (LP: #740944)
  * No separator between "Add Event" and locations (LP: #740971)
  * indicator-datetime-preferences crashed with SIGSEGV in
    g_atomic_int_exchange_and_add() (LP: #740978)
  * inicator-datetime dosen't show corretly the time when changing from 24
    hours format to 12 hours (LP: #743394)

1 files changed, 10 insertions, 6 deletions

diff --git a/src/indicator-datetime.c b/src/indicator-datetime.c
index 1cdcd3f..aed498d 100644
--- a/src/indicator-datetime.c
+++ b/src/indicator-datetime.c
@@ -525,7 +525,7 @@ set_property (GObject * object, guint prop_id, const GValue * value, GParamSpec
 		}
 		break;
 	}
-	case PROP_SHOW_SECONDS:
+	case PROP_SHOW_SECONDS: {
 		if (g_value_get_boolean(value) != self->priv->show_seconds) {
 			self->priv->show_seconds = !self->priv->show_seconds;
 			if (self->priv->time_mode != SETTINGS_TIME_CUSTOM) {
@@ -534,7 +534,8 @@ set_property (GObject * object, guint prop_id, const GValue * value, GParamSpec
 			}
 		}
 		break;
-	case PROP_SHOW_DAY:
+	}
+	case PROP_SHOW_DAY: {
 		if (g_value_get_boolean(value) != self->priv->show_day) {
 			self->priv->show_day = !self->priv->show_day;
 			if (self->priv->time_mode != SETTINGS_TIME_CUSTOM) {
@@ -542,7 +543,8 @@ set_property (GObject * object, guint prop_id, const GValue * value, GParamSpec
 			}
 		}
 		break;
-	case PROP_SHOW_DATE:
+	}
+	case PROP_SHOW_DATE: {
 		if (g_value_get_boolean(value) != self->priv->show_date) {
 			self->priv->show_date = !self->priv->show_date;
 			if (self->priv->time_mode != SETTINGS_TIME_CUSTOM) {
@@ -550,6 +552,7 @@ set_property (GObject * object, guint prop_id, const GValue * value, GParamSpec
 			}
 		}
 		break;
+	}
 	case PROP_CUSTOM_TIME_FORMAT: {
 		const gchar * newstr = g_value_get_string(value);
 		if (g_strcmp0(newstr, self->priv->custom_string) != 0) {
@@ -585,11 +588,12 @@ set_property (GObject * object, guint prop_id, const GValue * value, GParamSpec
 			gtk_widget_set_visible (GTK_WIDGET (self->priv->ido_calendar), self->priv->show_calendar);
 		}
 		break;
-	}
-	default:
+	} 
+	default: {
 		G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
 		return;
 	}
+	}
 
 	if (!update) {
 		return;
@@ -813,7 +817,7 @@ setup_timer (IndicatorDatetime * self, GDateTime * datetime)
 	
 	if (self->priv->show_seconds ||
 		(self->priv->time_mode == SETTINGS_TIME_CUSTOM && self->priv->custom_show_seconds)) {
-		self->priv->timer = g_timeout_add_full(G_PRIORITY_HIGH, 865, timer_func, self, NULL);
+		self->priv->timer = g_timeout_add_full(G_PRIORITY_HIGH, 999, timer_func, self, NULL);
 	} else {
 		if (datetime == NULL) {
 			datetime = g_date_time_new_now_local();