diff options
| author | Dan Winship <danw@gnome.org> | 2014-10-15 10:38:01 -0400 |
|---|---|---|
| committer | Dan Winship <danw@gnome.org> | 2014-10-22 08:29:08 -0400 |
| commit | 5632ac6730b2bc35c8a3ec1d40b921dfadaef110 (patch) | |
| tree | 3e2123894d125a0e54538f7374591d2e9f4489dc | |
| parent | 9c67b6fb08e4b2794ccab461f0ac9a6cffac33ee (diff) | |
libnm: drop unused NMRemoteConnectionError
NMRemoteConnection used to return
NM_REMOTE_CONNECTION_ERROR_DISCONNECTED if you tried to operate on a
connection that had been disconnected from its D-Bus proxy. But this
disappeared in the gdbus port (since gdbus doesn't emit a signal when
it happens, so it's harder to notice. And it's not clear why
NMRemoteConnection did this when no other class did anyway...).
| -rw-r--r-- | libnm/libnm.ver | 2 | ||||
| -rw-r--r-- | libnm/nm-remote-connection.c | 17 | ||||
| -rw-r--r-- | libnm/nm-remote-connection.h | 13 |
3 files changed, 0 insertions, 32 deletions
diff --git a/libnm/libnm.ver b/libnm/libnm.ver index f48582a178..89db1a7ac4 100644 --- a/libnm/libnm.ver +++ b/libnm/libnm.ver @@ -369,8 +369,6 @@ global: nm_remote_connection_delete; nm_remote_connection_delete_async; nm_remote_connection_delete_finish; - nm_remote_connection_error_get_type; - nm_remote_connection_error_quark; nm_remote_connection_get_secrets; nm_remote_connection_get_secrets_async; nm_remote_connection_get_secrets_finish; diff --git a/libnm/nm-remote-connection.c b/libnm/nm-remote-connection.c index 210c62cffc..a1f4dc9f5f 100644 --- a/libnm/nm-remote-connection.c +++ b/libnm/nm-remote-connection.c @@ -64,23 +64,6 @@ typedef struct { #define NM_REMOTE_CONNECTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_REMOTE_CONNECTION, NMRemoteConnectionPrivate)) -/** - * nm_remote_connection_error_quark: - * - * Registers an error quark for #NMRemoteConnection if necessary. - * - * Returns: the error quark used for #NMRemoteConnection errors. - **/ -GQuark -nm_remote_connection_error_quark (void) -{ - static GQuark quark = 0; - - if (G_UNLIKELY (quark == 0)) - quark = g_quark_from_static_string ("nm-remote-connection-error-quark"); - return quark; -} - /****************************************************************/ /** diff --git a/libnm/nm-remote-connection.h b/libnm/nm-remote-connection.h index 191a8c3fa9..3ea8037fba 100644 --- a/libnm/nm-remote-connection.h +++ b/libnm/nm-remote-connection.h @@ -38,19 +38,6 @@ G_BEGIN_DECLS #define NM_REMOTE_CONNECTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_REMOTE_CONNECTION, NMRemoteConnectionClass)) -/** - * NMRemoteConnectionError: - * @NM_REMOTE_CONNECTION_ERROR_UNKNOWN: unknown or unclassified error - * @NM_REMOTE_CONNECTION_ERROR_DISCONNECTED: dbus disconnected - */ -typedef enum { - NM_REMOTE_CONNECTION_ERROR_UNKNOWN = 0, /*< nick=UnknownError >*/ - NM_REMOTE_CONNECTION_ERROR_DISCONNECTED, /*< nick=Disconnected >*/ -} NMRemoteConnectionError; - -#define NM_REMOTE_CONNECTION_ERROR (nm_remote_connection_error_quark ()) -GQuark nm_remote_connection_error_quark (void); - /* Properties */ #define NM_REMOTE_CONNECTION_DBUS_CONNECTION "dbus-connection" #define NM_REMOTE_CONNECTION_PATH "path" |