diff options
| author | Michael Biebl <biebl@debian.org> | 2015-07-14 19:39:12 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2015-07-14 19:39:12 +0200 |
| commit | 34b1c46437df982495d08a8bbb8bd0b262d8af48 (patch) | |
| tree | 1db29ec39d9f733922b3a33cabcc8e6486fa06aa /libnm/nm-device.c | |
| parent | 50fc50153b0036516b853aa576dc435bd53ce736 (diff) | |
| parent | 50a58f0fabd8a34c1b6108a107e08abe3c1ccd24 (diff) | |
Merge tag 'upstream/1.0.4'
Upstream version 1.0.4
Diffstat (limited to 'libnm/nm-device.c')
| -rw-r--r-- | libnm/nm-device.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libnm/nm-device.c b/libnm/nm-device.c index e80ac707..cd14c0e9 100644 --- a/libnm/nm-device.c +++ b/libnm/nm-device.c @@ -979,6 +979,9 @@ nm_device_get_type_description (NMDevice *device) NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (device); const char *desc, *typename; + /* BEWARE: this function should return the same value + * as nm_device_get_type_description() in nm-core. */ + g_return_val_if_fail (NM_IS_DEVICE (device), NULL); if (priv->type_description) |