From ff0fd77b089162999efcf6ff272a340010d3a6e9 Mon Sep 17 00:00:00 2001 From: Tambet Ingo Date: Mon, 7 May 2007 15:17:45 +0000 Subject: 2007-05-07 Tambet Ingo * libnm-glib/Makefile.am: Link with libnm-util to gain access to NMConnection. * libnm-glib/nm-device-802-11-wireless.c: (nm_device_802_3_ethernet_activate): Remove. * libnm-glib/nm-device-802-3-ethernet.c (nm_device_802_3_ethernet_activate): Remove. * libnm-glib/nm-device.c (nm_device_activate): Implement. * src/nm-device-802-3-ethernet.c: Implement the new activation using NMConnection. * src/nm-device-802-11-wireless.c: Store an activation AP once the activation has started. Implement the new activation using NMConnection. * src/nm-activation-request.c: Store a generic connection object instead of a wireless-specific AP. * src/NetworkManagerPolicy.c (create_connection): Implement. Depending on device type, create a device specific connection object suitable for device activation. * src/nm-device.c (nm_device_activate): Re-implement. Call the device specific check to validate the connection and on success start the activation. * src/nm-device-interface.h: Add a activate virtual function to the interface definition. * src/nm-device-interface.c (nm_device_interface_activate): Implement. (impl_device_activate): Implement. * introspection/nm-device.xml: Add a generic device activation interface that accepts an abstract NMConnection structure that has device-specific information in it. * introspection/nm-device-802-3-ethernet.xml: Remove the wired-specific activation interface. * introspection/nm-device-802-11-wireless.xml: Remove the wireless-specific activation interface. git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@2569 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- test/Makefile.am | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'test') diff --git a/test/Makefile.am b/test/Makefile.am index 8d3402abe3..8f7a03cf97 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1,6 +1,7 @@ SUBDIRS=test-common libnm-util INCLUDES = -I${top_srcdir} \ + -I${top_srcdir}/libnm-util \ -I${top_srcdir}/libnm-glib \ -I${top_srcdir}/gnome/libnm_glib \ -I${top_srcdir}/utils \ @@ -24,7 +25,8 @@ noinst_PROGRAMS = nm-tool \ nm_tool_SOURCES = nm-tool.c nm_tool_LDADD = $(DBUS_LIBS) $(GTHREAD_LIBS) $(HAL_LIBS) \ - $(top_builddir)/libnm-glib/libnm-glib.la + $(top_builddir)/libnm-glib/libnm-glib.la \ + $(top_builddir)/libnm-util/libnm-util.la nm_online_SOURCES = nm-online.c nm_online_LDADD = $(DBUS_LIBS) $(GTHREAD_LIBS) $(HAL_LIBS) \ @@ -41,7 +43,8 @@ nmtestdevices_LDADD = $(DBUS_LIBS) $(GTHREAD_LIBS) \ libnm_glib_test_SOURCES = libnm_glib_test.c libnm_glib_test_LDADD = $(DBUS_LIBS) $(GTHREAD_LIBS) \ $(top_builddir)/utils/libnmutils.la \ - $(top_builddir)/gnome/libnm_glib/libnm_glib.la + $(top_builddir)/gnome/libnm_glib/libnm_glib.la \ + $(top_builddir)/libnm-util/libnm-util.la nm_supplicant_test_SOURCES = nm-supplicant-test.c nm_supplicant_test_LDADD = $(GLIB_LIBS) $(GTHREAD_LIBS) -- cgit v1.2.1