From f3c6d0765dff885e168b94f28e06ecc640315a74 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 31 Jan 2020 12:10:14 +0100 Subject: New upstream version 1.22.6 --- shared/nm-glib-aux/nm-shared-utils.h | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'shared/nm-glib-aux/nm-shared-utils.h') diff --git a/shared/nm-glib-aux/nm-shared-utils.h b/shared/nm-glib-aux/nm-shared-utils.h index 3bd1afae..3ec19ee1 100644 --- a/shared/nm-glib-aux/nm-shared-utils.h +++ b/shared/nm-glib-aux/nm-shared-utils.h @@ -973,6 +973,14 @@ NM_AUTO_DEFINE_FCN0 (GSource *, _nm_auto_destroy_and_unref_gsource, nm_g_source_ NM_AUTO_DEFINE_FCN0 (GMainContext *, _nm_auto_pop_gmaincontext, g_main_context_pop_thread_default) #define nm_auto_pop_gmaincontext nm_auto (_nm_auto_pop_gmaincontext) +static inline gboolean +nm_source_func_unref_gobject (gpointer user_data) +{ + nm_assert (G_IS_OBJECT (user_data)); + g_object_unref (user_data); + return G_SOURCE_REMOVE; +} + GSource *nm_g_idle_source_new (int priority, GSourceFunc func, gpointer user_data, -- cgit 1.3.0-6-gf8a5 From e536d40eaea5dcdc0743b0a5e8e17faa46608a50 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 19 Feb 2020 23:31:24 +0100 Subject: New upstream version 1.22.8 --- shared/nm-glib-aux/nm-shared-utils.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'shared/nm-glib-aux/nm-shared-utils.h') diff --git a/shared/nm-glib-aux/nm-shared-utils.h b/shared/nm-glib-aux/nm-shared-utils.h index 3ec19ee1..740e61d0 100644 --- a/shared/nm-glib-aux/nm-shared-utils.h +++ b/shared/nm-glib-aux/nm-shared-utils.h @@ -1440,4 +1440,17 @@ guint nm_utils_parse_debug_string (const char *string, const GDebugKey *keys, guint nkeys); +/*****************************************************************************/ + +typedef enum { + NMU_IFACE_KERNEL = 0, + NMU_IFACE_OVS, +} NMUtilsIfaceType; + +gboolean nm_utils_ifname_valid_kernel (const char *name, GError **error); + +gboolean nm_utils_ifname_valid (const char* name, + NMUtilsIfaceType type, + GError **error); + #endif /* __NM_SHARED_UTILS_H__ */ -- cgit 1.3.0-6-gf8a5