summaryrefslogtreecommitdiff
path: root/libnm/nm-client.h
diff options
context:
space:
mode:
authorDan Winship <danw@gnome.org>2014-08-05 10:05:26 -0400
committerDan Winship <danw@gnome.org>2014-08-07 15:43:43 -0400
commit8ce06b814c7ba217a62fbfa944ba90dc2eeac12f (patch)
tree76b34ed082b94e4aa34d1bcb988bff317594b83e /libnm/nm-client.h
parent7e791ce3fe250190db9a54ce95490e90bc6e26b3 (diff)
downloadNetworkManager-8ce06b814c7ba217a62fbfa944ba90dc2eeac12f.tar.gz
libnm: synchronize NMClient and NMRemoteSettings "is NM running" properties
Rename NMClient:manager-running and NMRemoteSettings:service-running to both be :nm-running.
Diffstat (limited to 'libnm/nm-client.h')
-rw-r--r--libnm/nm-client.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/libnm/nm-client.h b/libnm/nm-client.h
index 8fc676b8f2..52d59d4bd4 100644
--- a/libnm/nm-client.h
+++ b/libnm/nm-client.h
@@ -48,7 +48,7 @@ G_BEGIN_DECLS
#define NM_CLIENT_VERSION "version"
#define NM_CLIENT_STATE "state"
#define NM_CLIENT_STARTUP "startup"
-#define NM_CLIENT_MANAGER_RUNNING "manager-running"
+#define NM_CLIENT_NM_RUNNING "nm-running"
#define NM_CLIENT_NETWORKING_ENABLED "networking-enabled"
#define NM_CLIENT_WIRELESS_ENABLED "wireless-enabled"
#define NM_CLIENT_WIRELESS_HARDWARE_ENABLED "wireless-hardware-enabled"
@@ -222,7 +222,7 @@ gboolean nm_client_wimax_hardware_get_enabled (NMClient *client);
const char *nm_client_get_version (NMClient *client);
NMState nm_client_get_state (NMClient *client);
gboolean nm_client_get_startup (NMClient *client);
-gboolean nm_client_get_manager_running (NMClient *client);
+gboolean nm_client_get_nm_running (NMClient *client);
const GPtrArray *nm_client_get_active_connections (NMClient *client);
NMClientPermissionResult nm_client_get_permission_result (NMClient *client,