diff options
author | Dan Williams <dcbw@redhat.com> | 2008-11-27 00:00:14 +0000 |
---|---|---|
committer | Dan Williams <dcbw@redhat.com> | 2008-11-27 00:00:14 +0000 |
commit | f6225d7a948599719e8cd47db6450230aafaea9f (patch) | |
tree | be9eb8d36cbfd0c28fdc8af98e037f321c74745a | |
parent | 9e156d72f97daedea012eef4c29712dde81c9e09 (diff) | |
download | NetworkManager-f6225d7a948599719e8cd47db6450230aafaea9f.tar.gz |
2008-11-26 Dan Williams <dcbw@redhat.com>
* libnm-glib/nm-settings.c
libnm-glib/nm-settings.h
- (nm_exported_connection_delete): rename 'delete' to 'do_delete' to
avoid using C++ reserved keywords in headers
* libnm-glib/nm-dbus-connection.c
system-settings/plugins/ifcfg-rh/nm-ifcfg-connection.c
system-settings/plugins/ifcfg-suse/nm-suse-connection.c
system-settings/plugins/ifupdown/nm-ifupdown-connection.c
system-settings/plugins/keyfile/nm-keyfile-connection.c
system-settings/src/nm-sysconfig-connection.c
- Change 'delete' to 'do_delete'
git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@4343 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
-rw-r--r-- | ChangeLog | 15 | ||||
-rw-r--r-- | libnm-glib/nm-dbus-connection.c | 4 | ||||
-rw-r--r-- | libnm-glib/nm-settings.c | 4 | ||||
-rw-r--r-- | libnm-glib/nm-settings.h | 2 | ||||
-rw-r--r-- | system-settings/plugins/ifcfg-rh/nm-ifcfg-connection.c | 4 | ||||
-rw-r--r-- | system-settings/plugins/ifcfg-suse/nm-suse-connection.c | 4 | ||||
-rw-r--r-- | system-settings/plugins/ifupdown/nm-ifupdown-connection.c | 4 | ||||
-rw-r--r-- | system-settings/plugins/keyfile/nm-keyfile-connection.c | 6 | ||||
-rw-r--r-- | system-settings/src/nm-sysconfig-connection.c | 4 |
9 files changed, 31 insertions, 16 deletions
@@ -1,3 +1,18 @@ +2008-11-26 Dan Williams <dcbw@redhat.com> + + * libnm-glib/nm-settings.c + libnm-glib/nm-settings.h + - (nm_exported_connection_delete): rename 'delete' to 'do_delete' to + avoid using C++ reserved keywords in headers + + * libnm-glib/nm-dbus-connection.c + system-settings/plugins/ifcfg-rh/nm-ifcfg-connection.c + system-settings/plugins/ifcfg-suse/nm-suse-connection.c + system-settings/plugins/ifupdown/nm-ifupdown-connection.c + system-settings/plugins/keyfile/nm-keyfile-connection.c + system-settings/src/nm-sysconfig-connection.c + - Change 'delete' to 'do_delete' + 2008-11-25 Dan Williams <dcbw@redhat.com> * system-settings/plugins/ifcfg-rh diff --git a/libnm-glib/nm-dbus-connection.c b/libnm-glib/nm-dbus-connection.c index 631ee3c871..25085b7d1b 100644 --- a/libnm-glib/nm-dbus-connection.c +++ b/libnm-glib/nm-dbus-connection.c @@ -82,7 +82,7 @@ update (NMExportedConnection *exported, GHashTable *new_settings, GError **err) } static gboolean -delete (NMExportedConnection *exported, GError **err) +do_delete (NMExportedConnection *exported, GError **err) { NMDBusConnectionPrivate *priv = NM_DBUS_CONNECTION_GET_PRIVATE (exported); @@ -292,7 +292,7 @@ nm_dbus_connection_class_init (NMDBusConnectionClass *dbus_connection_class) connection_class->get_settings = get_settings; connection_class->update = update; - connection_class->delete = delete; + connection_class->do_delete = do_delete; /* Properties */ g_object_class_install_property diff --git a/libnm-glib/nm-settings.c b/libnm-glib/nm-settings.c index 34516b766b..d4f1b86ec6 100644 --- a/libnm-glib/nm-settings.c +++ b/libnm-glib/nm-settings.c @@ -555,8 +555,8 @@ nm_exported_connection_delete (NMExportedConnection *connection, GError **err) g_return_val_if_fail (NM_IS_EXPORTED_CONNECTION (connection), FALSE); - if (EXPORTED_CONNECTION_CLASS (connection)->delete) - success = EXPORTED_CONNECTION_CLASS (connection)->delete (connection, err); + if (EXPORTED_CONNECTION_CLASS (connection)->do_delete) + success = EXPORTED_CONNECTION_CLASS (connection)->do_delete (connection, err); if (success) nm_exported_connection_signal_removed (connection); diff --git a/libnm-glib/nm-settings.h b/libnm-glib/nm-settings.h index 680b6001f6..1651b823b0 100644 --- a/libnm-glib/nm-settings.h +++ b/libnm-glib/nm-settings.h @@ -78,7 +78,7 @@ typedef struct { GHashTable *new_settings, GError **err); - gboolean (*delete) (NMExportedConnection *connection, + gboolean (*do_delete) (NMExportedConnection *connection, GError **err); /* signals */ diff --git a/system-settings/plugins/ifcfg-rh/nm-ifcfg-connection.c b/system-settings/plugins/ifcfg-rh/nm-ifcfg-connection.c index 844525f646..14468b02ff 100644 --- a/system-settings/plugins/ifcfg-rh/nm-ifcfg-connection.c +++ b/system-settings/plugins/ifcfg-rh/nm-ifcfg-connection.c @@ -329,7 +329,7 @@ update (NMExportedConnection *exported, GHashTable *new_settings, GError **error } static gboolean -delete (NMExportedConnection *exported, GError **error) +do_delete (NMExportedConnection *exported, GError **error) { NMIfcfgConnectionPrivate *priv = NM_IFCFG_CONNECTION_GET_PRIVATE (exported); @@ -446,7 +446,7 @@ nm_ifcfg_connection_class_init (NMIfcfgConnectionClass *ifcfg_connection_class) connection_class->get_settings = get_settings; connection_class->update = update; - connection_class->delete = delete; + connection_class->do_delete = do_delete; /* Properties */ g_object_class_install_property diff --git a/system-settings/plugins/ifcfg-suse/nm-suse-connection.c b/system-settings/plugins/ifcfg-suse/nm-suse-connection.c index a3a9fbf1f1..ccdcc7fa3c 100644 --- a/system-settings/plugins/ifcfg-suse/nm-suse-connection.c +++ b/system-settings/plugins/ifcfg-suse/nm-suse-connection.c @@ -124,7 +124,7 @@ update (NMExportedConnection *exported, } static gboolean -delete (NMExportedConnection *exported, GError **err) +do_delete (NMExportedConnection *exported, GError **err) { g_set_error (err, NM_SYSCONFIG_SETTINGS_ERROR, NM_SYSCONFIG_SETTINGS_ERROR_DELETE_NOT_SUPPORTED, @@ -171,5 +171,5 @@ nm_suse_connection_class_init (NMSuseConnectionClass *suse_connection_class) connection_class->get_settings = get_settings; connection_class->update = update; - connection_class->delete = delete; + connection_class->do_delete = do_delete; } diff --git a/system-settings/plugins/ifupdown/nm-ifupdown-connection.c b/system-settings/plugins/ifupdown/nm-ifupdown-connection.c index cf203e9fcd..0b9bd2a624 100644 --- a/system-settings/plugins/ifupdown/nm-ifupdown-connection.c +++ b/system-settings/plugins/ifupdown/nm-ifupdown-connection.c @@ -85,7 +85,7 @@ update (NMExportedConnection *exported, } static gboolean -delete (NMExportedConnection *exported, GError **err) +do_delete (NMExportedConnection *exported, GError **err) { g_set_error (err, NM_SYSCONFIG_SETTINGS_ERROR, NM_SYSCONFIG_SETTINGS_ERROR_DELETE_NOT_SUPPORTED, @@ -187,7 +187,7 @@ nm_ifupdown_connection_class_init (NMIfupdownConnectionClass *ifupdown_connectio connection_class->get_settings = get_settings; connection_class->update = update; - connection_class->delete = delete; + connection_class->do_delete = do_delete; connection_class->service_get_secrets = service_get_secrets; /* Properties */ diff --git a/system-settings/plugins/keyfile/nm-keyfile-connection.c b/system-settings/plugins/keyfile/nm-keyfile-connection.c index c65b1b636e..0e4031b074 100644 --- a/system-settings/plugins/keyfile/nm-keyfile-connection.c +++ b/system-settings/plugins/keyfile/nm-keyfile-connection.c @@ -238,12 +238,12 @@ update (NMExportedConnection *exported, } static gboolean -delete (NMExportedConnection *exported, GError **err) +do_delete (NMExportedConnection *exported, GError **err) { NMKeyfileConnectionPrivate *priv = NM_KEYFILE_CONNECTION_GET_PRIVATE (exported); gboolean success; - success = NM_EXPORTED_CONNECTION_CLASS (nm_keyfile_connection_parent_class)->delete (exported, err); + success = NM_EXPORTED_CONNECTION_CLASS (nm_keyfile_connection_parent_class)->do_delete (exported, err); if (success) g_unlink (priv->filename); @@ -373,7 +373,7 @@ nm_keyfile_connection_class_init (NMKeyfileConnectionClass *keyfile_connection_c connection_class->get_settings = get_settings; connection_class->service_get_secrets = service_get_secrets; connection_class->update = update; - connection_class->delete = delete; + connection_class->do_delete = do_delete; /* Properties */ g_object_class_install_property diff --git a/system-settings/src/nm-sysconfig-connection.c b/system-settings/src/nm-sysconfig-connection.c index 7e533ffcd9..09a3d9db48 100644 --- a/system-settings/src/nm-sysconfig-connection.c +++ b/system-settings/src/nm-sysconfig-connection.c @@ -46,7 +46,7 @@ update (NMExportedConnection *exported, } static gboolean -delete (NMExportedConnection *exported, GError **err) +do_delete (NMExportedConnection *exported, GError **err) { NMSysconfigConnectionPrivate *priv = NM_SYSCONFIG_CONNECTION_GET_PRIVATE (exported); DBusGMethodInvocation *context; @@ -100,5 +100,5 @@ nm_sysconfig_connection_class_init (NMSysconfigConnectionClass *sysconfig_connec object_class->finalize = finalize; connection_class->update = update; - connection_class->delete = delete; + connection_class->do_delete = do_delete; } |