summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2017-06-21 15:17:31 +0200
committerThomas Haller <thaller@redhat.com>2017-06-29 09:58:28 +0200
commitefac9ecadd52b00dddd43eea20a78ac506aacb25 (patch)
tree42b5da6ece9740ffccf11385574a4871b1d36c70
parentd5efcc1115a2ff86009cc01751a4e8a009a7e470 (diff)
downloadNetworkManager-efac9ecadd52b00dddd43eea20a78ac506aacb25.tar.gz
libnm/trivial: move code
-rw-r--r--libnm/nm-client.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/libnm/nm-client.c b/libnm/nm-client.c
index ca11a92074..e4073dfd32 100644
--- a/libnm/nm-client.c
+++ b/libnm/nm-client.c
@@ -92,6 +92,13 @@ G_DEFINE_TYPE_WITH_CODE (NMClient, nm_client, G_TYPE_OBJECT,
#define NM_CLIENT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_CLIENT, NMClientPrivate))
typedef struct {
+ NMClient *client;
+ GCancellable *cancellable;
+ GSimpleAsyncResult *result;
+ int pending_init;
+} NMClientInitData;
+
+typedef struct {
NMManager *manager;
NMRemoteSettings *settings;
NMDnsManager *dns_manager;
@@ -2316,13 +2323,6 @@ init_sync (GInitable *initable, GCancellable *cancellable, GError **error)
/* Asynchronous initialization. */
-typedef struct {
- NMClient *client;
- GCancellable *cancellable;
- GSimpleAsyncResult *result;
- int pending_init;
-} NMClientInitData;
-
static void
init_async_complete (NMClientInitData *init_data)
{