From de06e5715e780baade318f3490ac7a4c9ce84e32 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sat, 24 Mar 2012 01:37:02 +0100 Subject: Imported Upstream version 0.9.4.0 --- libnm-util/nm-setting-wireless.c | 29 ----------------------------- 1 file changed, 29 deletions(-) (limited to 'libnm-util/nm-setting-wireless.c') diff --git a/libnm-util/nm-setting-wireless.c b/libnm-util/nm-setting-wireless.c index 37ad07ab..31882516 100644 --- a/libnm-util/nm-setting-wireless.c +++ b/libnm-util/nm-setting-wireless.c @@ -28,8 +28,6 @@ #include #include -#include "wireless-helper.h" - #include "NetworkManager.h" #include "nm-setting-wireless.h" #include "nm-param-spec-specialized.h" @@ -63,33 +61,6 @@ nm_setting_wireless_error_quark (void) return quark; } -/* This should really be standard. */ -#define ENUM_ENTRY(NAME, DESC) { NAME, "" #NAME "", DESC } - -GType -nm_setting_wireless_error_get_type (void) -{ - static GType etype = 0; - - if (etype == 0) { - static const GEnumValue values[] = { - /* Unknown error. */ - ENUM_ENTRY (NM_SETTING_WIRELESS_ERROR_UNKNOWN, "UnknownError"), - /* The specified property was invalid. */ - ENUM_ENTRY (NM_SETTING_WIRELESS_ERROR_INVALID_PROPERTY, "InvalidProperty"), - /* The specified property was missing and is required. */ - ENUM_ENTRY (NM_SETTING_WIRELESS_ERROR_MISSING_PROPERTY, "MissingProperty"), - /* The required security setting is missing */ - ENUM_ENTRY (NM_SETTING_WIRELESS_ERROR_MISSING_SECURITY_SETTING, "MissingSecuritySetting"), - /* The 'channel' property requires a valid 'band' */ - ENUM_ENTRY (NM_SETTING_WIRELESS_ERROR_CHANNEL_REQUIRES_BAND, "ChannelRequiresBand"), - { 0, 0, 0 } - }; - etype = g_enum_register_static ("NMSettingWirelessError", values); - } - return etype; -} - G_DEFINE_TYPE (NMSettingWireless, nm_setting_wireless, NM_TYPE_SETTING) -- cgit 1.3.0-6-gf8a5