NetworkManager r3464 - in trunk: . src

[dcbw svn gnome org]

Author: dcbw
Date: Fri Mar 14 22:05:17 2008
New Revision: 3464
URL: http://svn.gnome.org/viewvc/NetworkManager?rev=3464&view=rev

Log:
2008-03-14  Tambet Ingo  <tambet gmail com>

	* src/nm-manager.c
		- (nm_device_interface_get_iface): g_object_get() will return an
			allocated value, so this function must not return const
		- (nm_device_interface_activate): free returned iface



Modified:
   trunk/ChangeLog
   trunk/src/nm-device-interface.c

Modified: trunk/src/nm-device-interface.c
==============================================================================
--- trunk/src/nm-device-interface.c	(original)
+++ trunk/src/nm-device-interface.c	Fri Mar 14 22:05:17 2008
@@ -164,10 +164,10 @@
 }
 
 /* FIXME: This should be public and nm_device_get_iface() should be removed. */
-static const char *
+static char *
 nm_device_interface_get_iface (NMDeviceInterface *device)
 {
-	const char *iface = NULL;
+	char *iface = NULL;
 
 	g_return_val_if_fail (NM_IS_DEVICE_INTERFACE (device), NULL);
 
@@ -199,6 +199,7 @@
 	gboolean success;
 	NMConnection *connection;
 	NMSettingConnection *s_con;
+	char *iface;
 
 	g_return_val_if_fail (NM_IS_DEVICE_INTERFACE (device), FALSE);
 	g_return_val_if_fail (NM_IS_ACT_REQUEST (req), FALSE);
@@ -208,7 +209,10 @@
 	s_con = NM_SETTING_CONNECTION (nm_connection_get_setting (connection, NM_TYPE_SETTING_CONNECTION));
 	g_assert (s_con);
 
-	nm_info ("Activation (%s) starting connection '%s'", nm_device_interface_get_iface (device), s_con->id);
+	iface = nm_device_interface_get_iface (device);
+	nm_info ("Activation (%s) starting connection '%s'", iface, s_con->id);
+	g_free (iface);
+
 	success = NM_DEVICE_INTERFACE_GET_INTERFACE (device)->activate (device, req, error);
 	if (!success)
 		g_assert (*error);