fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-02-03 13:40:39 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

2008-11-26 Dan Williams <dcbw@redhat.com>

Browse source 
* 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
This commit is contained in:
Dan Williams 2008-11-27 00:00:14 +00:00
parent 9e156d72f9
commit f6225d7a94
9 changed files with 31 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
ChangeLog
View file

@ -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

4
libnm-glib/nm-dbus-connection.c
View file

@ -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

4
libnm-glib/nm-settings.c
View file

@ -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);

2
libnm-glib/nm-settings.h
View file

@ -78,7 +78,7 @@ typedef struct {
GHashTable *new_settings,
GError **err);
gboolean (*delete) (NMExportedConnection *connection,
gboolean (*do_delete) (NMExportedConnection *connection,
GError **err);
/* signals */

4
system-settings/plugins/ifcfg-rh/nm-ifcfg-connection.c
View file

@ -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

4
system-settings/plugins/ifcfg-suse/nm-suse-connection.c
View file

@ -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;
}

4
system-settings/plugins/ifupdown/nm-ifupdown-connection.c
View file

@ -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 */

6
system-settings/plugins/keyfile/nm-keyfile-connection.c
View file

@ -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

4
system-settings/src/nm-sysconfig-connection.c
View file

@ -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;
}