diff options
| author | Dan Williams <dcbw@redhat.com> | 2011-01-12 15:46:37 -0600 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2011-01-12 15:46:37 -0600 |
| commit | f9ceafd4a124142617280101eda5464ac67c5e39 (patch) | |
| tree | cd336e771bf30ba1ee0347037a7f47095fc04c58 /libnm-util/nm-connection.c | |
| parent | 7de13fa58dca796493b623fcba00d468f3aaa9f6 (diff) | |
| parent | 5a35862a1d24fb8d515ea09339123646370c2845 (diff) | |
| download | NetworkManager-f9ceafd4a124142617280101eda5464ac67c5e39.tar.gz | |
Merge remote branch 'origin/master' into rm-userset
Diffstat (limited to 'libnm-util/nm-connection.c')
| -rw-r--r-- | libnm-util/nm-connection.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/libnm-util/nm-connection.c b/libnm-util/nm-connection.c index 105dcbe144..3aa10c6a04 100644 --- a/libnm-util/nm-connection.c +++ b/libnm-util/nm-connection.c @@ -38,6 +38,7 @@ #include "nm-setting-ip6-config.h" #include "nm-setting-ppp.h" #include "nm-setting-pppoe.h" +#include "nm-setting-wimax.h" #include "nm-setting-wired.h" #include "nm-setting-wireless.h" #include "nm-setting-wireless-security.h" @@ -132,7 +133,7 @@ static guint signals[LAST_SIGNAL] = { 0 }; static GHashTable *registered_settings = NULL; -#define DEFAULT_MAP_SIZE 15 +#define DEFAULT_MAP_SIZE 16 static struct SettingInfo { const char *name; @@ -228,6 +229,11 @@ register_default_settings (void) NM_SETTING_BLUETOOTH_ERROR, 1); + register_one_setting (NM_SETTING_WIMAX_SETTING_NAME, + NM_TYPE_SETTING_WIMAX, + NM_SETTING_WIMAX_ERROR, + 1); + register_one_setting (NM_SETTING_WIRELESS_SECURITY_SETTING_NAME, NM_TYPE_SETTING_WIRELESS_SECURITY, NM_SETTING_WIRELESS_SECURITY_ERROR, |