fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-02-08 15:00:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

settings: fix some code that required glib 2.26

Browse source 
Should be compatible with at least glib 2.24 and hopefully earlier.
This commit is contained in:
Dan Williams 2011-03-08 10:18:29 -06:00
parent 089e2f5847
commit 9a3d762fdf
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/settings/nm-settings-connection.c
View file

@ -1275,7 +1275,7 @@ nm_settings_connection_update_timestamp (NMSettingsConnection *connection, guint
NMSettingsConnectionPrivate *priv = NM_SETTINGS_CONNECTION_GET_PRIVATE (connection);
const char *connection_uuid;
GKeyFile *timestamps_file;
char *data;
char *data, *tmp;
gsize len;
GError *error = NULL;
@ -1291,7 +1291,9 @@ nm_settings_connection_update_timestamp (NMSettingsConnection *connection, guint
}
connection_uuid = nm_connection_get_uuid (NM_CONNECTION (connection));
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) {
@ -1317,15 +1319,20 @@ nm_settings_connection_read_and_fill_timestamp (NMSettingsConnection *connection
{
NMSettingsConnectionPrivate *priv = NM_SETTINGS_CONNECTION_GET_PRIVATE (connection);
const char *connection_uuid;
guint64 timestamp;
guint64 timestamp = 0;
GKeyFile *timestamps_file;
GError *err = NULL;
char *tmp_str;
/* Get timestamp from database file */
timestamps_file = g_key_file_new ();
g_key_file_load_from_file (timestamps_file, SETTINGS_TIMESTAMPS_FILE, G_KEY_FILE_KEEP_COMMENTS, NULL);
connection_uuid = nm_connection_get_uuid (NM_CONNECTION (connection));
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)