diff options
| author | Michael Biebl <biebl@debian.org> | 2016-01-20 16:27:43 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2016-01-20 16:27:43 +0100 |
| commit | cbb3b57b5b60dbf1eadb795c834ac511f5e1ba21 (patch) | |
| tree | a97e7cf8b8903a2902c34f586661a13da2a9f2ea /src/nm-rfkill-manager.h | |
| parent | 5ddbb9de1f57acaeb47a151404bcf5f8c9729276 (diff) | |
| parent | 494f296a3baab08522617b24b1f126d8f9a17502 (diff) | |
Merge tag 'upstream/1.1.90' into experimental
Upstream version 1.1.90
Diffstat (limited to 'src/nm-rfkill-manager.h')
| -rw-r--r-- | src/nm-rfkill-manager.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/nm-rfkill-manager.h b/src/nm-rfkill-manager.h index 220f3c2c..0084364c 100644 --- a/src/nm-rfkill-manager.h +++ b/src/nm-rfkill-manager.h @@ -19,29 +19,27 @@ * Copyright (C) 2007 - 2013 Red Hat, Inc. */ -#include <glib-object.h> -#include "nm-types.h" +#include "nm-default.h" #ifndef __NETWORKMANAGER_RFKILL_MANAGER_H__ #define __NETWORKMANAGER_RFKILL_MANAGER_H__ -typedef enum { +typedef enum { /*< skip >*/ RFKILL_UNBLOCKED = 0, RFKILL_SOFT_BLOCKED = 1, RFKILL_HARD_BLOCKED = 2 } RfKillState; -typedef enum { +typedef enum { /*< skip >*/ RFKILL_TYPE_WLAN = 0, RFKILL_TYPE_WWAN = 1, - RFKILL_TYPE_WIMAX = 2, /* UNKNOWN and MAX should always be 1 more than * the last rfkill type since RFKILL_TYPE_MAX is * used as an array size. */ - RFKILL_TYPE_UNKNOWN = 3, /* KEEP LAST */ + RFKILL_TYPE_UNKNOWN, /* KEEP LAST */ RFKILL_TYPE_MAX = RFKILL_TYPE_UNKNOWN } RfKillType; |