mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2026-05-24 23:58:12 +02:00
7301a244b2
Add WPA Enterprise support: * gnome/applet/Makefile.am: Build the files nm-gconf-wso-wpa-eap.c and nm-gconf-wso-wpa-eap.h. * gnome/applet/nm-gconf-wso-wpa-eap.c, gnome/applet/nm-gconf-wso-wpa-eap.h: Add WPA Enterprise Gconf serialization and deserialization. * gnome/applet/nm-gconf-wso-wpa-psk.c, gnome/applet/nm-gconf-wso.c, gnome/applet/wireless-security-option.c, gnome/applet/wso-wpa-psk.c, gnome/applet/wso-wpa-psk.h: Clean up, support new defines. * gnome/applet/wireless-applet.glade: Add UI for configurating security settings related to WPA Enterprise. * gnome/applet/wireless-security-manager.c: Invoke wso_wpa_eap_new() to instantiate WPA Enterprise wireless-security-option. * gnome/applet/wso-wpa-eap.c, gnome/applet/wso-wpa-eap.h: New files. Implement WPA Enterprise wireless-security-option object. * include/NetworkManager.h: Add new NM_AUTH_TYPE_* and NM_EAP_METHOD_* defines. Cleanup. * libnm-util/cipher-wpa-psk-hex.c, libnm-util/cipher-wpa-psk-passphrase.c: Cleanup. * libnm-util/dbus-helpers.c, libnm-util/dbus-helpers.h: Add nmu_security_serialize_wpa_eap() to serialize input to DBUS method, nmu_security_serialize_wpa_eap_with_cipher() to serialize input including the cipher to DBUS method, and nmu_security_deserialize_wpa_eap() to deserialize from DBUS return to output. * src/Makefile.am: Build the files nm-ap-security-wpa-eap.c and nm-ap-security-wpa-eap.h * src/NetworkManagerAP.c: Add NM_AUTH_TYPE_WPA_EAP to NM_802_11_CAP_KEY_MGMT_802_1X cipher to capability mapping. * src/nm-ap-security-wpa-eap.c, src/nm-ap-security-wpa-eap.h: New files. Implement NMAPSecurityWPA_EAP object. * src/nm-ap-security-wpa-psk.c: Cleanup. * src/nm-ap-security.c: Support NM_AUTH_TYPE_EAP cipher and instantiate an NMAPSecurityWPA_EAP object via the method nm_ap_security_wpa_eap_new_deserialize(). * src/nm-dbus-nm.c: Cleanup. * test/nm-tool.c: Display "Enterprise" for wireless networks providing WPA Enterprise support. git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1493 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
122 lines
2.7 KiB
Makefile
122 lines
2.7 KiB
Makefile
SUBDIRS=icons
|
|
|
|
NULL=
|
|
|
|
INCLUDES = -I${top_srcdir} -I${top_srcdir}/utils -I${top_srcdir}/include -I${top_srcdir}/libnm-util
|
|
|
|
bin_PROGRAMS = nm-applet
|
|
|
|
nm_applet_CPPFLAGS = \
|
|
$(DBUS_CFLAGS) \
|
|
$(GTHREAD_CFLAGS) \
|
|
$(HAL_CFLAGS) \
|
|
$(DBUS_GLIB_CFLAGS) \
|
|
$(GLADE_CFLAGS) \
|
|
$(GTK_CFLAGS) \
|
|
$(GCONF_CFLAGS) \
|
|
$(LIBGNOMEUI_CFLAGS) \
|
|
$(PANEL_APPLET_CFLAGS) \
|
|
$(GNOME_KEYRING_CFLAGS) \
|
|
$(NOTIFY_CFLAGS) \
|
|
-DICONDIR=\""$(datadir)/pixmaps"\" \
|
|
-DGLADEDIR=\""$(gladedir)"\" \
|
|
-DBINDIR=\""$(bindir)"\" \
|
|
-DSYSCONFDIR=\""$(sysconfdir)"\" \
|
|
-DVPN_NAME_FILES_DIR=\""$(sysconfdir)/NetworkManager/VPN"\" \
|
|
-DDBUS_API_SUBJECT_TO_CHANGE \
|
|
-DG_DISABLE_DEPRECATED \
|
|
-DGDK_DISABLE_DEPRECATED \
|
|
-DGNOME_DISABLE_DEPRECATED \
|
|
-DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
|
|
-DVERSION=\"$(VERSION)\" \
|
|
$(NULL)
|
|
|
|
nm_applet_SOURCES = \
|
|
main.c \
|
|
applet.c \
|
|
applet.h \
|
|
applet-compat.c \
|
|
applet-compat.h \
|
|
applet-dbus.c \
|
|
applet-dbus.h \
|
|
applet-dbus-devices.c \
|
|
applet-dbus-devices.h \
|
|
applet-dbus-vpn.c \
|
|
applet-dbus-vpn.h \
|
|
applet-dbus-info.c \
|
|
applet-dbus-info.h \
|
|
wireless-network.c \
|
|
wireless-network.h \
|
|
nm-device.c \
|
|
nm-device.h \
|
|
other-network-dialog.c \
|
|
other-network-dialog.h \
|
|
passphrase-dialog.c \
|
|
passphrase-dialog.h \
|
|
menu-items.c \
|
|
menu-items.h \
|
|
eggtrayicon.c \
|
|
eggtrayicon.h \
|
|
vpn-password-dialog.c \
|
|
vpn-password-dialog.h \
|
|
vpn-connection.c \
|
|
vpn-connection.h \
|
|
wireless-security-manager.c \
|
|
wireless-security-manager.h \
|
|
wireless-security-option.c \
|
|
wireless-security-option.h \
|
|
wso-none.c \
|
|
wso-none.h \
|
|
wso-private.h \
|
|
wso-wep-ascii.c \
|
|
wso-wep-ascii.h \
|
|
wso-wep-hex.c \
|
|
wso-wep-hex.h \
|
|
wso-wep-passphrase.c \
|
|
wso-wep-passphrase.h \
|
|
wso-wpa-eap.c \
|
|
wso-wpa-eap.h \
|
|
wso-wpa-psk.c \
|
|
wso-wpa-psk.h \
|
|
nm-gconf-wso.c \
|
|
nm-gconf-wso.h \
|
|
nm-gconf-wso-private.h \
|
|
nm-gconf-wso-wep.c \
|
|
nm-gconf-wso-wep.h \
|
|
nm-gconf-wso-wpa-eap.c \
|
|
nm-gconf-wso-wpa-eap.h \
|
|
nm-gconf-wso-wpa-psk.c \
|
|
nm-gconf-wso-wpa-psk.h \
|
|
gconf-helpers.c \
|
|
gconf-helpers.h \
|
|
$(NULL)
|
|
|
|
nm_applet_LDADD = \
|
|
$(DBUS_LIBS) \
|
|
$(HAL_LIBS) \
|
|
$(GTHREAD_LIBS) \
|
|
$(GLADE_LIBS) \
|
|
$(DBUS_GLIB_LIBS) \
|
|
$(PANEL_APPLET_LIBS) \
|
|
$(GTK_LIBS) \
|
|
$(GCONF_LIBS) \
|
|
$(LIBGNOMEUI_LIBS) \
|
|
$(GNOME_KEYRING_LIBS) \
|
|
$(NOTIFY_LIBS) \
|
|
$(top_builddir)/utils/libnmutils.la \
|
|
$(top_builddir)/libnm-util/libnm-util.la \
|
|
$(NULL)
|
|
|
|
|
|
gladedir = $(datadir)/nm-applet
|
|
glade_DATA = wireless-applet.glade keyring.png
|
|
|
|
dbusservicedir = $(DBUS_SYS_DIR)
|
|
dbusservice_DATA = nm-applet.conf
|
|
|
|
CLEANFILES = $(server_DATA) *.bak *.gladep
|
|
|
|
EXTRA_DIST = \
|
|
$(dbusservice_DATA) \
|
|
$(glade_DATA) \
|
|
$(NULL)
|