mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2026-05-02 23:38:11 +02:00
db5a10dc4d
Merge the beginnings of the new GSM card support.
* src/ppp-manager/nm-ppp-manager.c (nm_ppp_manager_stop): Remove
* the
ppp watch source before killing pppd - If this happens from
g_object_unref()
then the ppp manager is already destroyed by the time the watch
callback runs.
* src/nm-hal-manager.c: Add a device_type_name string to the
* device
creators, so that we can print a nice human readable string when
a
device is added.
* src/nm-umts-device.c (automatic_registration_get_network):
* Query
for the activated network, not much is done with the result
thought.
* src/nm-serial-device.c (nm_serial_device_get_reply):
* Implement.
(ppp_ip4_config): Change the device state to activated here for
now.
(real_check_connection): Make sure the connection includes ppp
setting.
* libnm-glib/nm-client.c (get_device): Handle umts devices.
* libnm-glib/Makefile.am: Add the new files to build.
* libnm-glib/nm-umts-device.c:
* libnm-glib/nm-umts-device.h: Implement.
2007-11-26 Tambet Ingo <tambet@gmail.com>
* src/nm-umts-device.c (automatic_registration_get_network): For
* now, dial
immediately, nm_serial_device_get_reply() isn't implemented
correctly yet.
* src/nm-serial-device.c (wait_for_reply_info_destroy): Don't
* try to remove
the timeout source - this function is only called when the
timeout source has
been removed.
(nm_serial_device_wait_for_reply): Allocate the duplicate
responses array
to be big enough to contain the terminating zero element as
well.
The timeout argument is meant to be in seconds now.
(real_deactivate_quickly): Implement.
* src/NetworkManager.conf: Allow root to own
"org.freedesktop.NetworkManager.PPP", deny it for everybody
else.
* libnm-util/nm-setting-umts.c: Network type and band properties
* are ints,
(not unsigned ints).
* libnm-util/nm-setting-serial.c (nm_setting_serial_class_init):
* Fix a
small issue with parity bounds - capital letters have lower
ascii codes
than lower case letters.
* libnm-util/nm-connection.c (register_default_settings):
* Register serial
and umts settings.
2007-11-22 Tambet Ingo <tambet@gmail.com>
Remove the "index" property from devices as not all device types
have this.
* include/NetworkManager.h (NM_DBUS_PATH_DEVICE): Remove.
* src/nm-hal-manager.c (nm_get_device_index_from_hal): Remove.
(wired_device_creator): Get the device interface from hal to
create the device.
(wireless_device_creator): Ditto.
* src/nm-device.c (nm_device_init): Remove the index member.
(constructor): Remove the checks for index property, make
interface property
a require constructor property.
Use the HAL udi for DBus path for devices.
(nm_device_get_index): Remove.
(set_property): Remove index handling.
(get_property): Ditto.
(nm_device_get_dbus_path): Remove.
* src/nm-device-interface.c (nm_device_interface_init): Remove
* the index
property.
* src/nm-device-802-3-ethernet.c
* (nm_device_802_3_ethernet_link_activated):
Access the device index through it's interface.
(nm_device_802_3_ethernet_link_deactivated): Ditto.
(nm_device_802_3_ethernet_new): Remove the useless argument
test_dev. Remove
index argument. Add interface argument.
* src/nm-device-802-11-wireless.c
* (nm_device_802_11_wireless_new): Remove
the useless test_dev argument. Remove index argument. Add
interface arugment.
* src/NetworkManagerSystem.c
* (nm_system_device_set_from_ip4_config): Get the
device index through interface.
(nm_system_set_mtu): Ditto.
* introspection/nm-device.xml: Remove the "Index" property.
2007-11-21 Tambet Ingo <tambet@gmail.com>
* src/nm-serial-device.c:
* src/nm-serial-device.c:
* src/nm-umts-device.c:
* src/nm-umts-device.h: Implement.
* src/nm-hal-manager.c (nm_get_device_driver_name):
* libhal_free_string the string
allocated by libhal.
(modem_device_creator): Implement.
(register_built_in_creators): Register the modem creator.
* src/nm-device-802-11-wireless.c
* (nm_device_802_11_wireless_new):
Remove the unused test_dev argument.
* src/nm-device-802-3-ethernet.c (nm_device_802_3_ethernet_new):
* Ditto.
* src/Makefile.am: Add new files to build.
Link in ppp-manager.
* libnm-util/nm-setting-umts.c:
* libnm-util/nm-setting-umts.h:
* libnm-util/nm-setting-serial.c:
* libnm-util/nm-setting-serial.h: Implement.
* libnm-util/Makefile.am: Add new files to build.
git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3116 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
132 lines
4.7 KiB
Makefile
132 lines
4.7 KiB
Makefile
INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/libnm-util
|
|
|
|
BUILT_SOURCES = \
|
|
nm-access-point-bindings.h \
|
|
nm-client-bindings.h \
|
|
nm-device-bindings.h \
|
|
nm-device-802-3-ethernet-bindings.h \
|
|
nm-device-802-11-wireless-bindings.h \
|
|
nm-marshal.h \
|
|
nm-marshal.c \
|
|
nm-settings-connection-glue.h \
|
|
nm-settings-glue.h \
|
|
nm-vpn-manager-bindings.h \
|
|
nm-vpn-connection-bindings.h \
|
|
nm-vpn-plugin-glue.h
|
|
|
|
lib_LTLIBRARIES = libnm_glib.la libnm_glib_vpn.la
|
|
|
|
libnm_glib_la_CFLAGS = \
|
|
$(GLIB_CFLAGS) \
|
|
$(GTHREAD_CFLAGS) \
|
|
$(DBUS_CFLAGS) \
|
|
$(GCONF_CFLAGS) \
|
|
$(GNOME_KEYRING_CFLAGS)
|
|
|
|
libnmincludedir = $(includedir)/libnm-glib
|
|
|
|
libnminclude_HEADERS = \
|
|
libnm_glib.h \
|
|
nm-object.h \
|
|
nm-client.h \
|
|
nm-device.h \
|
|
nm-device-802-3-ethernet.h \
|
|
nm-device-802-11-wireless.h \
|
|
nm-access-point.h \
|
|
nm-ip4-config.h \
|
|
nm-settings.h \
|
|
nm-umts-device.h \
|
|
nm-vpn-connection.h \
|
|
nm-vpn-manager.h \
|
|
nm-vpn-plugin.h
|
|
|
|
libnm_glib_la_SOURCES = \
|
|
libnm_glib.c \
|
|
nm-object.c \
|
|
nm-client.c \
|
|
nm-dbus-utils.c \
|
|
nm-dbus-utils.h \
|
|
nm-device.c \
|
|
nm-device-private.h \
|
|
nm-device-802-3-ethernet.c \
|
|
nm-device-802-11-wireless.c \
|
|
nm-access-point.c \
|
|
nm-ip4-config.c \
|
|
nm-settings.c \
|
|
nm-umts-device.c \
|
|
nm-vpn-connection.c \
|
|
nm-vpn-manager.c \
|
|
nm-marshal-main.c
|
|
|
|
libnm_glib_la_LIBADD = \
|
|
$(top_builddir)/libnm-util/libnm-util.la \
|
|
$(GLIB_LIBS) \
|
|
$(GTHREAD_LIBS) \
|
|
$(DBUS_LIBS) \
|
|
$(GCONF_LIBS) \
|
|
$(GNOME_KEYRING_LIBS)
|
|
|
|
noinst_PROGRAMS = libnm-glib-test
|
|
|
|
libnm_glib_test_SOURCES = libnm-glib-test.c
|
|
libnm_glib_test_CFLAGS = $(GLIB_CFLAGS) $(DBUS_CFLAGS)
|
|
libnm_glib_test_LDADD = libnm_glib.la $(top_builddir)/libnm-util/libnm-util.la $(GLIB_LIBS) $(DBUS_LIBS)
|
|
|
|
libnm_glib_vpn_la_SOURCES = nm-vpn-plugin.c
|
|
libnm_glib_vpn_la_CFLAGS = $(GLIB_CFLAGS) $(DBUS_CFLAGS)
|
|
libnm_glib_vpn_la_LIBADD = $(top_builddir)/libnm-util/libnm-util.la $(GLIB_LIBS) $(DBUS_LIBS)
|
|
|
|
|
|
nm-marshal.h: Makefile.am nm-marshal.list
|
|
$(GLIB_GENMARSHAL) --prefix=nm_marshal $(srcdir)/nm-marshal.list --header > \
|
|
xgen-gmh \
|
|
&& (cmp -s xgen-gmh nm-marshal.h || cp xgen-gmh nm-marshal.h) \
|
|
&& rm -f xgen-gmh xgen-gmh~
|
|
|
|
nm-marshal.c: Makefile.am nm-marshal.list
|
|
$(GLIB_GENMARSHAL) --prefix=nm_marshal $(srcdir)/nm-marshal.list --body > \
|
|
xgen-gmc \
|
|
&& cp xgen-gmc nm-marshal.c \
|
|
&& rm -f xgen-gmc xgen-gmc~
|
|
|
|
nm-marshal-main.c: nm-marshal.c nm-marshal.h
|
|
|
|
nm-client-bindings.h: $(top_srcdir)/introspection/nm-manager-client.xml
|
|
dbus-binding-tool --prefix=nm_client --mode=glib-client --output=nm-client-bindings.h $(top_srcdir)/introspection/nm-manager-client.xml
|
|
|
|
nm-device-bindings.h: $(top_srcdir)/introspection/nm-device.xml
|
|
dbus-binding-tool --prefix=nm_device --mode=glib-client --output=nm-device-bindings.h $(top_srcdir)/introspection/nm-device.xml
|
|
|
|
nm-device-802-3-ethernet-bindings.h: $(top_srcdir)/introspection/nm-device-802-3-ethernet.xml
|
|
dbus-binding-tool --prefix=nm_device_802_3_ethernet --mode=glib-client --output=nm-device-802-3-ethernet-bindings.h $(top_srcdir)/introspection/nm-device-802-3-ethernet.xml
|
|
|
|
nm-device-802-11-wireless-bindings.h: $(top_srcdir)/introspection/nm-device-802-11-wireless.xml
|
|
dbus-binding-tool --prefix=nm_device_802_11_wireless --mode=glib-client --output=nm-device-802-11-wireless-bindings.h $(top_srcdir)/introspection/nm-device-802-11-wireless.xml
|
|
|
|
nm-access-point-bindings.h: $(top_srcdir)/introspection/nm-access-point.xml
|
|
dbus-binding-tool --prefix=nm_access_point --mode=glib-client --output=nm-access-point-bindings.h $(top_srcdir)/introspection/nm-access-point.xml
|
|
|
|
nm-settings-glue.h: $(top_srcdir)/introspection/nm-settings.xml
|
|
dbus-binding-tool --prefix=nm_settings --mode=glib-server --output=nm-settings-glue.h $(top_srcdir)/introspection/nm-settings.xml
|
|
|
|
nm-settings-connection-glue.h: $(top_srcdir)/introspection/nm-settings-connection.xml
|
|
dbus-binding-tool --prefix=nm_connection_settings --mode=glib-server --output=nm-settings-connection-glue.h $(top_srcdir)/introspection/nm-settings-connection.xml
|
|
|
|
nm-vpn-manager-bindings.h: $(top_srcdir)/introspection/nm-vpn-manager.xml
|
|
dbus-binding-tool --prefix=nm_vpn_manager --mode=glib-client --output=nm-vpn-manager-bindings.h $(top_srcdir)/introspection/nm-vpn-manager.xml
|
|
|
|
nm-vpn-connection-bindings.h: $(top_srcdir)/introspection/nm-vpn-connection.xml
|
|
dbus-binding-tool --prefix=nm_vpn_connection --mode=glib-client --output=nm-vpn-connection-bindings.h $(top_srcdir)/introspection/nm-vpn-connection.xml
|
|
|
|
nm-vpn-plugin-glue.h: $(top_srcdir)/introspection/nm-vpn-plugin.xml
|
|
dbus-binding-tool --prefix=nm_vpn_plugin --mode=glib-server --output=nm-vpn-plugin-glue.h $(top_srcdir)/introspection/nm-vpn-plugin.xml
|
|
|
|
pkgconfigdir = $(libdir)/pkgconfig
|
|
pkgconfig_DATA = libnm_glib.pc
|
|
|
|
DISTCLEANFILES = libnm_glib.pc
|
|
|
|
EXTRA_DIST = libnm_glib.pc.in nm-marshal.list
|
|
|
|
CLEANFILES = \
|
|
$(BUILT_SOURCES)
|