summaryrefslogtreecommitdiff
path: root/libnm-core/nm-setting-private.h
diff options
context:
space:
mode:
authorDan Winship <danw@gnome.org>2014-10-13 11:57:35 -0400
committerDan Winship <danw@gnome.org>2014-10-22 08:29:07 -0400
commita7b1ee77dbc74fa40864e292c75d764b958634b0 (patch)
treee3637575fd8552307493ed88168b6be83f9c799f /libnm-core/nm-setting-private.h
parent63957e0ed23e949ad24290f8f4c02f6925bb6bef (diff)
downloadNetworkManager-a7b1ee77dbc74fa40864e292c75d764b958634b0.tar.gz
libnm-core: drop nm_setting_lookup_type_by_quark()
nm_setting_lookup_type_by_quark() was only ever used in places that were still mistakenly assuming the old style of nm_connection_verify() errors, where the error message would contain only a property name and no further explanation. Fix those places to assume that the error will contain a real error message, and include both the setting name and the property name. Given that, there's no longer any need for nm_setting_lookup_type_by_quark(), so drop it.
Diffstat (limited to 'libnm-core/nm-setting-private.h')
-rw-r--r--libnm-core/nm-setting-private.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/libnm-core/nm-setting-private.h b/libnm-core/nm-setting-private.h
index 9f0c51a983..e6e54983ed 100644
--- a/libnm-core/nm-setting-private.h
+++ b/libnm-core/nm-setting-private.h
@@ -46,13 +46,11 @@ typedef enum {
void _nm_register_setting (const char *name,
const GType type,
- const guint32 priority,
- const GQuark error_quark);
+ const guint32 priority);
#define _nm_register_setting(name, priority) \
G_STMT_START { \
- _nm_register_setting (NM_SETTING_ ## name ## _SETTING_NAME "", g_define_type_id, priority, NM_SETTING_ ## name ## _ERROR); \
- g_type_ensure (NM_TYPE_SETTING_ ## name ## _ERROR); \
+ _nm_register_setting (NM_SETTING_ ## name ## _SETTING_NAME "", g_define_type_id, priority); \
} G_STMT_END
gboolean _nm_setting_is_base_type (NMSetting *setting);