From e173df7e3a29a17a7158c9c39117c1fcd9c6ed85 Mon Sep 17 00:00:00 2001
From: Dan Williams <dcbw@redhat.com>
Date: Thu, 3 Mar 2011 01:19:09 -0600
Subject: [PATCH] settings: fix some code that required glib 2.26

Stable branch must be compatible with glib 2.18 or later.  Thus
we can't use g_key_file_get_uint64().
---
 src/system-settings/nm-sysconfig-settings.c |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/system-settings/nm-sysconfig-settings.c b/src/system-settings/nm-sysconfig-settings.c
index 49b903e..75ac987 100644
--- a/src/system-settings/nm-sysconfig-settings.c
+++ b/src/system-settings/nm-sysconfig-settings.c
@@ -520,9 +520,10 @@ claim_connection (NMSysconfigSettings *self,
 
 	NMSettingConnection *s_con;
 	const char *connection_uuid;
-	guint64 timestamp;
+	guint64 timestamp = 0;
 	GKeyFile *timestamps_file;
 	GError *err = NULL;
+	char *tmp_str;
 
 	g_return_if_fail (NM_IS_SYSCONFIG_SETTINGS (self));
 	g_return_if_fail (NM_IS_SETTINGS_CONNECTION_INTERFACE (connection));
@@ -538,7 +539,11 @@ claim_connection (NMSysconfigSettings *self,
 
 	timestamps_file = g_key_file_new ();
 	g_key_file_load_from_file (timestamps_file, NM_SYSCONFIG_SETTINGS_TIMESTAMPS_FILE, G_KEY_FILE_KEEP_COMMENTS, NULL);
-	timestamp = g_key_file_get_uint64 (timestamps_file, "timestamps", connection_uuid, &err);
+	tmp_str = g_key_file_get_value (timestamps_file, "timestamps", connection_uuid, &err);
+	if (tmp_str) {
+		timestamp = g_ascii_strtoull (tmp_str, NULL, 10);
+		g_free (tmp_str);
+	}
 
 	/* Update connection's timestamp */
 	if (!err) {
-- 
1.7.4

From aee725fe9f9fc956bd5a75a37ef1c7f2ca168702 Mon Sep 17 00:00:00 2001
From: Dan Williams <dcbw@redhat.com>
Date: Thu, 3 Mar 2011 01:32:26 -0600
Subject: [PATCH] core: fix some code that required glib 2.26

Stable branch must be compatible with glib 2.18 or later.  Thus
we can't use g_key_file_set_uint64().
---
 src/nm-manager.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/nm-manager.c b/src/nm-manager.c
index 8cb28c6..8b24aa5 100644
--- a/src/nm-manager.c
+++ b/src/nm-manager.c
@@ -474,7 +474,7 @@ update_active_connection_timestamp (NMManager *manager, NMDevice *device)
 	guint64 timestamp;
 	guint64 *ts_ptr;
 	GKeyFile *timestamps_file;
-	char *data;
+	char *data, *tmp;
 	gsize len;
 	GError *error = NULL;
 
@@ -509,7 +509,9 @@ update_active_connection_timestamp (NMManager *manager, NMDevice *device)
 		g_clear_error (&error);
 	}
 
-	g_key_file_set_uint64 (timestamps_file, "timestamps", connection_uuid, timestamp);
+	tmp = g_strdup_printf ("%" G_GUINT64_FORMAT, timestamp);
+	g_key_file_set_value (timestamps_file, "timestamps", connection_uuid, tmp);
+	g_free (tmp);
 
 	data = g_key_file_to_data (timestamps_file, &len, &error);
 	if (data) {
-- 
1.7.4