diff options
| author | Dan Williams <dcbw@redhat.com> | 2008-11-19 16:20:47 +0000 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2008-11-19 16:20:47 +0000 |
| commit | c47cdcf0e745adefb662c747da3c2ec370fab53a (patch) | |
| tree | 29b7bd2393530378627a92c16d03d7bcd61c3c37 /src | |
| parent | 3c2d8253ec19ac1659c0b8f6981efd971315779c (diff) | |
| download | NetworkManager-c47cdcf0e745adefb662c747da3c2ec370fab53a.tar.gz | |
2008-11-19 Dan Williams <dcbw@redhat.com>
* libnm-util/nm-setting.h
libnm-util/nm-setting.c
src/nm-device.c
src/nm-manager.c
system-settings/plugins/ifcfg-fedora/plugin.c
- Prefix compare flag defines with NM_SETTING_
git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@4299 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
Diffstat (limited to 'src')
| -rw-r--r-- | src/nm-device.c | 2 | ||||
| -rw-r--r-- | src/nm-manager.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/nm-device.c b/src/nm-device.c index 5cf26d905b..02e4fc19cf 100644 --- a/src/nm-device.c +++ b/src/nm-device.c @@ -1625,7 +1625,7 @@ device_activation_precheck (NMDevice *self, NMConnection *connection, GError **e // FIXME: why not just check connection path & service? current_connection = nm_act_request_get_connection (nm_device_get_act_request (self)); - if (nm_connection_compare (connection, current_connection, COMPARE_FLAGS_EXACT)) { + if (nm_connection_compare (connection, current_connection, NM_SETTING_COMPARE_FLAG_EXACT)) { /* Already activating or activated with the same connection */ g_set_error (error, NM_DEVICE_INTERFACE_ERROR, diff --git a/src/nm-manager.c b/src/nm-manager.c index bf0b40252b..9133368918 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -845,7 +845,7 @@ connection_get_settings_cb (DBusGProxy *proxy, switch (scope) { case NM_CONNECTION_SCOPE_USER: existing = g_hash_table_lookup (priv->user_connections, path); - if (!existing || !nm_connection_compare (existing, connection, COMPARE_FLAGS_EXACT)) { + if (!existing || !nm_connection_compare (existing, connection, NM_SETTING_COMPARE_FLAG_EXACT)) { g_hash_table_insert (priv->user_connections, g_strdup (path), connection); @@ -856,7 +856,7 @@ connection_get_settings_cb (DBusGProxy *proxy, break; case NM_CONNECTION_SCOPE_SYSTEM: existing = g_hash_table_lookup (priv->system_connections, path); - if (!existing || !nm_connection_compare (existing, connection, COMPARE_FLAGS_EXACT)) { + if (!existing || !nm_connection_compare (existing, connection, NM_SETTING_COMPARE_FLAG_EXACT)) { g_hash_table_insert (priv->system_connections, g_strdup (path), connection); |