From 8baa1aca8dfd35e3190d7d5655eb83b5b901e263 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 21 Apr 2011 10:42:53 +0200 Subject: Imported Upstream version 0.8.4.0 --- cli/src/nmcli.h | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'cli/src/nmcli.h') diff --git a/cli/src/nmcli.h b/cli/src/nmcli.h index 90091b36..a208e79e 100644 --- a/cli/src/nmcli.h +++ b/cli/src/nmcli.h @@ -24,6 +24,7 @@ #include #include +#include /* nmcli exit codes */ typedef enum { @@ -49,10 +50,7 @@ typedef enum { NMC_RESULT_ERROR_DEV_DISCONNECT = 6, /* NetworkManager is not running */ - NMC_RESULT_ERROR_NM_NOT_RUNNING = 7, - - /* nmcli and NetworkManager versions mismatch */ - NMC_RESULT_ERROR_VERSIONS_MISMATCH = 8 + NMC_RESULT_ERROR_NM_NOT_RUNNING = 7 } NMCResultCode; typedef enum { @@ -97,9 +95,14 @@ typedef struct _NmCli { int timeout; /* Operation timeout */ - NMRemoteSettings *system_settings; /* System settings */ + NMRemoteSettingsSystem *system_settings; /* System settings */ + NMRemoteSettings *user_settings; /* User settings */ + gboolean system_settings_running; /* Is system settings service running? */ + gboolean user_settings_running; /* Is user settings service running? */ + GSList *system_connections; /* List of system connections */ + GSList *user_connections; /* List of user connections */ gboolean should_wait; /* Indication that nmcli should not end yet */ gboolean nowait_flag; /* '--nowait' option; used for passing to callbacks */ @@ -110,7 +113,6 @@ typedef struct _NmCli { char *required_fields; /* Required fields in output: '--fields' option */ NmcOutputField *allowed_fields; /* Array of allowed fields for particular commands */ NmcPrintFields print_fields; /* Structure with field indices to print */ - gboolean nocheck_ver; /* Don't check nmcli and NM versions: option '--nocheck' */ } NmCli; #endif /* NMC_NMCLI_H */ -- cgit 1.3.0-6-gf8a5