mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager
synced 2024-10-15 12:34:55 +00:00
api: remove deprecated methods and signals
sleep, wake, StateChange, all deprecated in 0.8, are now removed. sleep & wake are replaced with the Sleep() method, while StateChange is replaced with the StateChanged signal which has the same arguments.
This commit is contained in:
parent
85e87bd509
commit
a661f78890
|
@ -16,7 +16,6 @@ EXTRA_DIST = \
|
|||
nm-ip4-config.xml \
|
||||
nm-ip6-config.xml \
|
||||
nm-manager.xml \
|
||||
nm-manager-client.xml \
|
||||
nm-settings.xml \
|
||||
nm-settings-connection.xml \
|
||||
nm-vpn-plugin.xml \
|
||||
|
|
|
@ -1,94 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
|
||||
<!--
|
||||
READ ME! READ ME! READ ME! READ ME! READ ME!
|
||||
|
||||
This file needs to be kept in sync with nm-manager.xml with the exception of
|
||||
the legacy methods at the end of nm-manager.xml.
|
||||
|
||||
This file is only used to ensure that a few legacy 0.6 D-DBus methods that
|
||||
NM supports don't leak into libnm-glib, but are only exposed by the NMManager
|
||||
object. dbus-glib generates the same bound function names for D-Bus the methods
|
||||
"sleep" and "Sleep", unfortunately.
|
||||
-->
|
||||
|
||||
<node name="/">
|
||||
<interface name="org.freedesktop.NetworkManager">
|
||||
<method name="GetDevices">
|
||||
<annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_manager_get_devices"/>
|
||||
<arg name="devices" type="ao" direction="out"/>
|
||||
</method>
|
||||
|
||||
<method name="ActivateConnection">
|
||||
<annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_manager_activate_connection"/>
|
||||
<annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
|
||||
<arg name="connection" type="o" direction="in"/>
|
||||
<arg name="device" type="o" direction="in"/>
|
||||
<arg name="specific_object" type="o" direction="in"/>
|
||||
<arg name="active_connection" type="o" direction="out"/>
|
||||
</method>
|
||||
|
||||
<method name="AddAndActivateConnection">
|
||||
<annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_manager_add_and_activate_connection"/>
|
||||
<annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
|
||||
<arg name="connection" type="a{sa{sv}}" direction="in"/>
|
||||
<arg name="device" type="o" direction="in"/>
|
||||
<arg name="specific_object" type="o" direction="in"/>
|
||||
<arg name="path" type="o" direction="out"/>
|
||||
<arg name="active_connection" type="o" direction="out"/>
|
||||
</method>
|
||||
|
||||
<method name="DeactivateConnection">
|
||||
<annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_manager_deactivate_connection"/>
|
||||
<annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
|
||||
<arg name="active_connection" type="o" direction="in"/>
|
||||
</method>
|
||||
|
||||
<method name="Sleep">
|
||||
<annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_manager_sleep"/>
|
||||
<annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
|
||||
<arg name="sleep" type="b" direction="in"/>
|
||||
</method>
|
||||
|
||||
<method name="Enable">
|
||||
<annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_manager_enable"/>
|
||||
<annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
|
||||
<arg name="enable" type="b" direction="in"/>
|
||||
</method>
|
||||
|
||||
<method name="GetPermissions">
|
||||
<annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_manager_get_permissions"/>
|
||||
<annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
|
||||
<arg name="permissions" type="a{ss}" direction="out"/>
|
||||
</method>
|
||||
|
||||
<signal name="CheckPermissions"/>
|
||||
|
||||
<property name="NetworkingEnabled" type="b" access="read"/>
|
||||
<property name="WirelessEnabled" type="b" access="readwrite"/>
|
||||
<property name="WirelessHardwareEnabled" type="b" access="read"/>
|
||||
<property name="WwanEnabled" type="b" access="readwrite"/>
|
||||
<property name="WwanHardwareEnabled" type="b" access="read"/>
|
||||
<property name="WimaxEnabled" type="b" access="readwrite"/>
|
||||
<property name="WimaxHardwareEnabled" type="b" access="read"/>
|
||||
<property name="ActiveConnections" type="ao" access="read"/>
|
||||
<property name="Version" type="s" access="read"/>
|
||||
<property name="State" type="u" access="read"/>
|
||||
|
||||
<signal name="StateChanged">
|
||||
<arg name="state" type="u"/>
|
||||
</signal>
|
||||
|
||||
<signal name="PropertiesChanged">
|
||||
<arg name="properties" type="a{sv}"/>
|
||||
</signal>
|
||||
|
||||
<signal name="DeviceAdded">
|
||||
<arg name="state" type="o"/>
|
||||
</signal>
|
||||
|
||||
<signal name="DeviceRemoved">
|
||||
<arg name="state" type="o"/>
|
||||
</signal>
|
||||
</interface>
|
||||
</node>
|
|
@ -348,42 +348,5 @@
|
|||
</tp:enumvalue>
|
||||
</tp:enum>
|
||||
|
||||
<!-- Legacy methods to maintain backwards compatibility for 0.6 branch. -->
|
||||
|
||||
<signal name="StateChange">
|
||||
<tp:docstring>
|
||||
DEPRECATED. NetworkManager's state changed. Use the 'StateChanged' signal instead.
|
||||
</tp:docstring>
|
||||
<arg name="state" type="u" tp:type="NM_STATE">
|
||||
<tp:docstring>
|
||||
The new state of NetworkManager.
|
||||
</tp:docstring>
|
||||
</arg>
|
||||
</signal>
|
||||
|
||||
<method name="sleep">
|
||||
<tp:docstring>
|
||||
DEPRECATED. Control the NetworkManager daemon's sleep state. When asleep, all interfaces that it manages are deactivated.
|
||||
</tp:docstring>
|
||||
<annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_manager_legacy_sleep"/>
|
||||
<annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
|
||||
</method>
|
||||
|
||||
<method name="wake">
|
||||
<tp:docstring>
|
||||
DEPRECATED. Control the NetworkManager daemon's sleep state. When awake, all known interfaces are available to be activated.
|
||||
</tp:docstring>
|
||||
<annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_manager_legacy_wake"/>
|
||||
<annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
|
||||
</method>
|
||||
|
||||
<method name="state">
|
||||
<tp:docstring>
|
||||
DEPRECATED. The overall state of the NetworkManager daemon.
|
||||
</tp:docstring>
|
||||
<annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_manager_legacy_state"/>
|
||||
<arg name="state" type="u" direction="out" tp:type="NM_STATE"/>
|
||||
</method>
|
||||
|
||||
</interface>
|
||||
</node>
|
||||
|
|
|
@ -181,7 +181,7 @@ libnm_glib_test_la_LIBADD = \
|
|||
|
||||
#####################################################
|
||||
|
||||
nm-client-bindings.h: $(top_srcdir)/introspection/nm-manager-client.xml
|
||||
nm-client-bindings.h: $(top_srcdir)/introspection/nm-manager.xml
|
||||
$(AM_V_GEN) dbus-binding-tool --prefix=nm_client --mode=glib-client --output=$@ $<
|
||||
|
||||
nm-device-bindings.h: $(top_srcdir)/introspection/nm-device.xml
|
||||
|
|
|
@ -31,7 +31,6 @@
|
|||
#include "libnm_glib.h"
|
||||
|
||||
#define DBUS_NO_SERVICE_ERROR "org.freedesktop.DBus.Error.ServiceDoesNotExist"
|
||||
#define NM_DBUS_SIGNAL_STATE_CHANGE "StateChange"
|
||||
|
||||
|
||||
struct libnm_glib_ctx
|
||||
|
@ -272,7 +271,7 @@ libnm_glib_dbus_filter (DBusConnection *connection,
|
|||
{
|
||||
libnm_glib_get_nm_state (ctx);
|
||||
}
|
||||
else if (dbus_message_is_signal (message, NM_DBUS_INTERFACE, NM_DBUS_SIGNAL_STATE_CHANGE))
|
||||
else if (dbus_message_is_signal (message, NM_DBUS_INTERFACE, "StateChanged"))
|
||||
{
|
||||
NMState state = NM_STATE_UNKNOWN;
|
||||
|
||||
|
|
|
@ -99,12 +99,6 @@ static gboolean impl_manager_set_logging (NMManager *manager,
|
|||
const char *domains,
|
||||
GError **error);
|
||||
|
||||
/* Legacy 0.6 compatibility interface */
|
||||
|
||||
static void impl_manager_legacy_sleep (NMManager *manager, DBusGMethodInvocation *context);
|
||||
static void impl_manager_legacy_wake (NMManager *manager, DBusGMethodInvocation *context);
|
||||
static gboolean impl_manager_legacy_state (NMManager *manager, guint32 *state, GError **err);
|
||||
|
||||
#include "nm-manager-glue.h"
|
||||
|
||||
static void udev_device_added_cb (NMUdevManager *udev_mgr,
|
||||
|
@ -251,7 +245,6 @@ enum {
|
|||
DEVICE_ADDED,
|
||||
DEVICE_REMOVED,
|
||||
STATE_CHANGED,
|
||||
STATE_CHANGE, /* DEPRECATED */
|
||||
PROPERTIES_CHANGED,
|
||||
CHECK_PERMISSIONS,
|
||||
USER_PERMISSIONS_CHANGED,
|
||||
|
@ -472,9 +465,6 @@ nm_manager_update_state (NMManager *manager)
|
|||
g_object_notify (G_OBJECT (manager), NM_MANAGER_STATE);
|
||||
|
||||
g_signal_emit (manager, signals[STATE_CHANGED], 0, priv->state);
|
||||
|
||||
/* Emit StateChange too for backwards compatibility */
|
||||
g_signal_emit (manager, signals[STATE_CHANGE], 0, priv->state);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -2767,30 +2757,6 @@ impl_manager_get_permissions (NMManager *self,
|
|||
nm_auth_chain_add_call (chain, NM_AUTH_PERMISSION_SETTINGS_MODIFY_HOSTNAME, FALSE);
|
||||
}
|
||||
|
||||
/* Legacy 0.6 compatibility interface */
|
||||
|
||||
static void
|
||||
impl_manager_legacy_sleep (NMManager *manager, DBusGMethodInvocation *context)
|
||||
{
|
||||
return impl_manager_sleep (manager, TRUE, context);
|
||||
}
|
||||
|
||||
static void
|
||||
impl_manager_legacy_wake (NMManager *manager, DBusGMethodInvocation *context)
|
||||
{
|
||||
return impl_manager_sleep (manager, FALSE, context);
|
||||
}
|
||||
|
||||
static gboolean
|
||||
impl_manager_legacy_state (NMManager *manager, guint32 *state, GError **err)
|
||||
{
|
||||
NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE (manager);
|
||||
|
||||
nm_manager_update_state (manager);
|
||||
*state = priv->state;
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
static gboolean
|
||||
impl_manager_set_logging (NMManager *manager,
|
||||
const char *level,
|
||||
|
@ -3679,15 +3645,6 @@ nm_manager_class_init (NMManagerClass *manager_class)
|
|||
g_cclosure_marshal_VOID__VOID,
|
||||
G_TYPE_NONE, 0);
|
||||
|
||||
/* StateChange is DEPRECATED */
|
||||
signals[STATE_CHANGE] =
|
||||
g_signal_new ("state-change",
|
||||
G_OBJECT_CLASS_TYPE (object_class),
|
||||
G_SIGNAL_RUN_FIRST,
|
||||
0, NULL, NULL,
|
||||
g_cclosure_marshal_VOID__UINT,
|
||||
G_TYPE_NONE, 1, G_TYPE_UINT);
|
||||
|
||||
dbus_g_object_type_install_info (G_TYPE_FROM_CLASS (manager_class),
|
||||
&dbus_glib_nm_manager_object_info);
|
||||
|
||||
|
|
Loading…
Reference in a new issue