From 2012b49219a1df79ffb37a262cb326fbc723aba5 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Mon, 19 Feb 2018 19:47:26 +0100 Subject: [PATCH] connectivity/trivial: move code nm_connectivity_state_to_string() is entirely independent of the GObject implementation of NMConnectivity. Move it to the beginning of the source file. It will be useful next because we will *always* build "nm-connectivity.c" source file, but disable various parts with #if. Hence, move the part that should always be build to the top. --- src/nm-connectivity.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/nm-connectivity.c b/src/nm-connectivity.c index ffe350ead..10aab9067 100644 --- a/src/nm-connectivity.c +++ b/src/nm-connectivity.c @@ -32,6 +32,17 @@ /*****************************************************************************/ +NM_UTILS_LOOKUP_STR_DEFINE (nm_connectivity_state_to_string, NMConnectivityState, + NM_UTILS_LOOKUP_DEFAULT_WARN ("???"), + NM_UTILS_LOOKUP_STR_ITEM (NM_CONNECTIVITY_UNKNOWN, "UNKNOWN"), + NM_UTILS_LOOKUP_STR_ITEM (NM_CONNECTIVITY_NONE, "NONE"), + NM_UTILS_LOOKUP_STR_ITEM (NM_CONNECTIVITY_LIMITED, "LIMITED"), + NM_UTILS_LOOKUP_STR_ITEM (NM_CONNECTIVITY_PORTAL, "PORTAL"), + NM_UTILS_LOOKUP_STR_ITEM (NM_CONNECTIVITY_FULL, "FULL"), +); + +/*****************************************************************************/ + typedef struct { GSimpleAsyncResult *simple; char *response; @@ -99,17 +110,6 @@ NM_DEFINE_SINGLETON_GETTER (NMConnectivity, nm_connectivity_get, NM_TYPE_CONNECT /*****************************************************************************/ -NM_UTILS_LOOKUP_STR_DEFINE (nm_connectivity_state_to_string, NMConnectivityState, - NM_UTILS_LOOKUP_DEFAULT_WARN ("???"), - NM_UTILS_LOOKUP_STR_ITEM (NM_CONNECTIVITY_UNKNOWN, "UNKNOWN"), - NM_UTILS_LOOKUP_STR_ITEM (NM_CONNECTIVITY_NONE, "NONE"), - NM_UTILS_LOOKUP_STR_ITEM (NM_CONNECTIVITY_LIMITED, "LIMITED"), - NM_UTILS_LOOKUP_STR_ITEM (NM_CONNECTIVITY_PORTAL, "PORTAL"), - NM_UTILS_LOOKUP_STR_ITEM (NM_CONNECTIVITY_FULL, "FULL"), -); - -/*****************************************************************************/ - static void finish_cb_data (NMConnectivityCheckHandle *cb_data, NMConnectivityState new_state) {