summaryrefslogtreecommitdiff
path: root/dispatcher-daemon
diff options
context:
space:
mode:
authorTambet Ingo <tambet@ximian.com>2007-05-07 15:17:45 +0000
committerTambet Ingo <tambet@gmail.com>2007-05-07 15:17:45 +0000
commitff0fd77b089162999efcf6ff272a340010d3a6e9 (patch)
tree9214c20e1d4fbca500d6fdf0ceddc905b71e21da /dispatcher-daemon
parent6c51badc692e62a8f2f65c8bd675389f37db21a1 (diff)
downloadNetworkManager-ff0fd77b089162999efcf6ff272a340010d3a6e9.tar.gz
2007-05-07 Tambet Ingo <tambet@ximian.com>
* 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
Diffstat (limited to 'dispatcher-daemon')
-rw-r--r--dispatcher-daemon/Makefile.am4
1 files changed, 2 insertions, 2 deletions
diff --git a/dispatcher-daemon/Makefile.am b/dispatcher-daemon/Makefile.am
index 980fd8f453..933ab2b153 100644
--- a/dispatcher-daemon/Makefile.am
+++ b/dispatcher-daemon/Makefile.am
@@ -1,4 +1,5 @@
-INCLUDES = -I${top_srcdir} -I${top_srcdir}/utils -I${top_srcdir}/include
+INCLUDES = -I${top_srcdir} -I${top_srcdir}/utils -I${top_srcdir}/include -I$(top_srcdir)/libnm-glib -I$(top_srcdir)/libnm-util
+
NULL=
@@ -7,7 +8,6 @@ sbin_PROGRAMS = NetworkManagerDispatcher
NetworkManagerDispatcher_CPPFLAGS = \
$(DBUS_CFLAGS) \
$(GTHREAD_CFLAGS) \
- -I$(top_builddir)/libnm-glib \
-Wall \
-DDBUS_API_SUBJECT_TO_CHANGE \
-DBINDIR=\"$(bindir)\" \