summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBeniamino Galvani <bgalvani@redhat.com>2015-08-21 18:44:32 +0200
committerBeniamino Galvani <bgalvani@redhat.com>2015-08-25 10:23:57 +0200
commit0969d16ad86367eb035e384cc539fcc74d4e006b (patch)
tree1065256523d2ddacabda385efa240fe1f9b0aeae
parentb2a66d59c8532228906bc554ac94717b1937882d (diff)
downloadNetworkManager-0969d16ad86367eb035e384cc539fcc74d4e006b.tar.gz
libnm: backport enum conversion utilities to 1.0.6
Backport to 1.0.6 the following symbols: - nm_utils_enum_from_str - nm_utils_enum_to_str added to 1.0.6 with commit f4ce6760e0ebb66aee3df35e9618be656355f318
-rw-r--r--libnm-core/nm-utils.c5
-rw-r--r--libnm/libnm.ver2
2 files changed, 7 insertions, 0 deletions
diff --git a/libnm-core/nm-utils.c b/libnm-core/nm-utils.c
index bee263ba38..7c32695a2b 100644
--- a/libnm-core/nm-utils.c
+++ b/libnm-core/nm-utils.c
@@ -4043,6 +4043,8 @@ char *nm_utils_enum_to_str (GType type, int value)
g_type_class_unref (class);
return ret;
}
+NM_BACKPORT_SYMBOL (libnm_1_0_6, char *, nm_utils_enum_to_str,
+ (GType type, int value), (type, value));
/**
* nm_utils_enum_from_str:
@@ -4114,4 +4116,7 @@ gboolean nm_utils_enum_from_str (GType type, const char *str,
g_type_class_unref (class);
return ret;
}
+NM_BACKPORT_SYMBOL (libnm_1_0_6, gboolean, nm_utils_enum_from_str,
+ (GType type, const char *str, int *out_value, char **err_token),
+ (type, str, out_value, err_token));
diff --git a/libnm/libnm.ver b/libnm/libnm.ver
index 681c8265b8..5ad41c24f5 100644
--- a/libnm/libnm.ver
+++ b/libnm/libnm.ver
@@ -846,6 +846,8 @@ libnm_1_0_6 {
#nm_device_wifi_request_scan_options_async@libnm_1_0_6;
#nm_metered_get_type@libnm_1_0_6;
#nm_setting_connection_get_metered@libnm_1_0_6;
+ #nm_utils_enum_from_str@libnm_1_0_6;
+ #nm_utils_enum_to_str@libnm_1_0_6;
#nm_utils_wifi_2ghz_freqs@libnm_1_0_6;
#nm_utils_wifi_5ghz_freqs@libnm_1_0_6;
} libnm_1_0_4;