NetworkManager r4343 - in trunk: . libnm-glib system-settings/plugins/ifcfg-rh system-settings/plugins/ifcfg-suse system-settings/plugins/ifupdown system-settings/plugins/keyfile system-settings/src

[dcbw svn gnome org]

Author: dcbw
Date: Thu Nov 27 00:00:14 2008
New Revision: 4343
URL: http://svn.gnome.org/viewvc/NetworkManager?rev=4343&view=rev

Log:
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'



Modified:
   trunk/ChangeLog
   trunk/libnm-glib/nm-dbus-connection.c
   trunk/libnm-glib/nm-settings.c
   trunk/libnm-glib/nm-settings.h
   trunk/system-settings/plugins/ifcfg-rh/nm-ifcfg-connection.c
   trunk/system-settings/plugins/ifcfg-suse/nm-suse-connection.c
   trunk/system-settings/plugins/ifupdown/nm-ifupdown-connection.c
   trunk/system-settings/plugins/keyfile/nm-keyfile-connection.c
   trunk/system-settings/src/nm-sysconfig-connection.c

Modified: trunk/libnm-glib/nm-dbus-connection.c
==============================================================================
--- trunk/libnm-glib/nm-dbus-connection.c	(original)
+++ trunk/libnm-glib/nm-dbus-connection.c	Thu Nov 27 00:00:14 2008
@@ -82,7 +82,7 @@
 }
 
 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 @@
 
 	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

Modified: trunk/libnm-glib/nm-settings.c
==============================================================================
--- trunk/libnm-glib/nm-settings.c	(original)
+++ trunk/libnm-glib/nm-settings.c	Thu Nov 27 00:00:14 2008
@@ -555,8 +555,8 @@
 
 	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);

Modified: trunk/libnm-glib/nm-settings.h
==============================================================================
--- trunk/libnm-glib/nm-settings.h	(original)
+++ trunk/libnm-glib/nm-settings.h	Thu Nov 27 00:00:14 2008
@@ -78,7 +78,7 @@
 	                    GHashTable *new_settings,
 	                    GError **err);
 
-	gboolean (*delete) (NMExportedConnection *connection,
+	gboolean (*do_delete) (NMExportedConnection *connection,
 	                    GError **err);
 
 	/* signals */

Modified: trunk/system-settings/plugins/ifcfg-rh/nm-ifcfg-connection.c
==============================================================================
--- trunk/system-settings/plugins/ifcfg-rh/nm-ifcfg-connection.c	(original)
+++ trunk/system-settings/plugins/ifcfg-rh/nm-ifcfg-connection.c	Thu Nov 27 00:00:14 2008
@@ -329,7 +329,7 @@
 }
 
 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 @@
 
 	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

Modified: trunk/system-settings/plugins/ifcfg-suse/nm-suse-connection.c
==============================================================================
--- trunk/system-settings/plugins/ifcfg-suse/nm-suse-connection.c	(original)
+++ trunk/system-settings/plugins/ifcfg-suse/nm-suse-connection.c	Thu Nov 27 00:00:14 2008
@@ -124,7 +124,7 @@
 }
 
 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 @@
 
 	connection_class->get_settings = get_settings;
 	connection_class->update       = update;
-	connection_class->delete       = delete;
+	connection_class->do_delete    = do_delete;
 }

Modified: trunk/system-settings/plugins/ifupdown/nm-ifupdown-connection.c
==============================================================================
--- trunk/system-settings/plugins/ifupdown/nm-ifupdown-connection.c	(original)
+++ trunk/system-settings/plugins/ifupdown/nm-ifupdown-connection.c	Thu Nov 27 00:00:14 2008
@@ -85,7 +85,7 @@
 }
 
 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 @@
 
 	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 */

Modified: trunk/system-settings/plugins/keyfile/nm-keyfile-connection.c
==============================================================================
--- trunk/system-settings/plugins/keyfile/nm-keyfile-connection.c	(original)
+++ trunk/system-settings/plugins/keyfile/nm-keyfile-connection.c	Thu Nov 27 00:00:14 2008
@@ -238,12 +238,12 @@
 }
 
 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 @@
 	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

Modified: trunk/system-settings/src/nm-sysconfig-connection.c
==============================================================================
--- trunk/system-settings/src/nm-sysconfig-connection.c	(original)
+++ trunk/system-settings/src/nm-sysconfig-connection.c	Thu Nov 27 00:00:14 2008
@@ -46,7 +46,7 @@
 }
 
 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 @@
 	object_class->finalize = finalize;
 
 	connection_class->update = update;
-	connection_class->delete = delete;
+	connection_class->do_delete = do_delete;
 }