diff options
| author | Michael Biebl <biebl@debian.org> | 2013-02-03 14:49:30 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2013-02-03 14:49:30 +0100 |
| commit | 02d69323d320e0df4d7daa6115ee1ac1239b1a58 (patch) | |
| tree | b83a6b9a01b302117d31476361971212f9fd1750 /libnm-util/nm-setting-wired.c | |
| parent | d31839fb4152978db9734e24c00fbac4f42debb7 (diff) | |
| parent | 9c202e3e860b3be9e1f8882630b69affbb130102 (diff) | |
Merge tag 'upstream/0.9.7.995' into experimental
Upstream version 0.9.7.995
Diffstat (limited to 'libnm-util/nm-setting-wired.c')
| -rw-r--r-- | libnm-util/nm-setting-wired.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/libnm-util/nm-setting-wired.c b/libnm-util/nm-setting-wired.c index fb21711d..f44d6df6 100644 --- a/libnm-util/nm-setting-wired.c +++ b/libnm-util/nm-setting-wired.c @@ -24,7 +24,6 @@ */ #include <string.h> -#include <ctype.h> #include <net/ethernet.h> #include <dbus/dbus-glib.h> #include <netinet/ether.h> @@ -34,6 +33,7 @@ #include "nm-utils.h" #include "nm-utils-private.h" #include "nm-dbus-glib-types.h" +#include "nm-setting-private.h" /** * SECTION:nm-setting-wired @@ -62,7 +62,12 @@ nm_setting_wired_error_quark (void) } -G_DEFINE_TYPE (NMSettingWired, nm_setting_wired, NM_TYPE_SETTING) +G_DEFINE_TYPE_WITH_CODE (NMSettingWired, nm_setting_wired, NM_TYPE_SETTING, + _nm_register_setting (NM_SETTING_WIRED_SETTING_NAME, + g_define_type_id, + 1, + NM_SETTING_WIRED_ERROR)) +NM_SETTING_REGISTER_TYPE (NM_TYPE_SETTING_WIRED) #define NM_SETTING_WIRED_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_WIRED, NMSettingWiredPrivate)) |