diff --git a/introspection/Makefile.am b/introspection/Makefile.am
index 6cf8dc6069..a469a87976 100644
--- a/introspection/Makefile.am
+++ b/introspection/Makefile.am
@@ -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 \
diff --git a/introspection/nm-manager-client.xml b/introspection/nm-manager-client.xml
deleted file mode 100644
index ba2b25b91a..0000000000
--- a/introspection/nm-manager-client.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/introspection/nm-manager.xml b/introspection/nm-manager.xml
index 9a8f34dea7..d80b3d9415 100644
--- a/introspection/nm-manager.xml
+++ b/introspection/nm-manager.xml
@@ -348,42 +348,5 @@
-
-
-
-
- DEPRECATED. NetworkManager's state changed. Use the 'StateChanged' signal instead.
-
-
-
- The new state of NetworkManager.
-
-
-
-
-
-
- DEPRECATED. Control the NetworkManager daemon's sleep state. When asleep, all interfaces that it manages are deactivated.
-
-
-
-
-
-
-
- DEPRECATED. Control the NetworkManager daemon's sleep state. When awake, all known interfaces are available to be activated.
-
-
-
-
-
-
-
- DEPRECATED. The overall state of the NetworkManager daemon.
-
-
-
-
-
diff --git a/libnm-glib/Makefile.am b/libnm-glib/Makefile.am
index 9f36cea4e9..4878e81315 100644
--- a/libnm-glib/Makefile.am
+++ b/libnm-glib/Makefile.am
@@ -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
diff --git a/libnm-glib/libnm_glib.c b/libnm-glib/libnm_glib.c
index 5e0e5cf570..a37881e0f9 100644
--- a/libnm-glib/libnm_glib.c
+++ b/libnm-glib/libnm_glib.c
@@ -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;
diff --git a/src/nm-manager.c b/src/nm-manager.c
index 4b2332b840..287462e134 100644
--- a/src/nm-manager.c
+++ b/src/nm-manager.c
@@ -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);