3392e41b22
- Merge fixes from lp:timezonemap - Add cc-timezone-location.h to timezonemapincludes_HEADERS so it gets installed (iain.lane) - Set en_name correctly (iain.lane) - Don't call g_type_init() on glib >= 2.35; it's deprecated (iain.lane)
26 lines
823 B
Diff
26 lines
823 B
Diff
From 6dced294369ce9b47d793b959d1cc3acfd1e86d1 Mon Sep 17 00:00:00 2001
|
|
From: Iain Lane <iain.lane@canonical.com>
|
|
Date: Fri, 29 Nov 2013 12:23:12 +0000
|
|
Subject: [PATCH 17/18] Set en_name correctly
|
|
|
|
---
|
|
src/cc-timezone-location.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/src/cc-timezone-location.c b/src/cc-timezone-location.c
|
|
index 3bf4cad..31ceb56 100644
|
|
--- a/src/cc-timezone-location.c
|
|
+++ b/src/cc-timezone-location.c
|
|
@@ -315,7 +315,7 @@ const gchar *cc_timezone_location_get_en_name(CcTimezoneLocation *loc)
|
|
void cc_timezone_location_set_en_name(CcTimezoneLocation *loc, const gchar *en_name)
|
|
{
|
|
g_free(loc->priv->en_name);
|
|
- loc->priv->full_country = g_strdup(en_name);
|
|
+ loc->priv->en_name = g_strdup(en_name);
|
|
|
|
g_object_notify(G_OBJECT(loc), "en_name");
|
|
}
|
|
--
|
|
1.8.4.2
|
|
|