diff options
| author | Sjoerd Simons <sjoerd@luon.net> | 2013-10-25 21:21:07 +0200 |
|---|---|---|
| committer | Sjoerd Simons <sjoerd@luon.net> | 2013-10-25 21:21:07 +0200 |
| commit | e83d1de9b746dbc078ac1cf45f1798e1bc6b7e2f (patch) | |
| tree | c36a40d79a5ae7d2bbca7d240d0a6f664049b435 /docs/libnm-glib/tmpl/nm-object.sgml | |
| parent | 26283b4c9e5035574a6c168003e7f1da53a8f32a (diff) | |
| parent | a4256940da049f91bbbea5e53e469a59ea9c10f7 (diff) | |
Merge tag 'upstream/0.9.8.8' into experimental
Upstream version 0.9.8.8
Diffstat (limited to 'docs/libnm-glib/tmpl/nm-object.sgml')
| -rw-r--r-- | docs/libnm-glib/tmpl/nm-object.sgml | 60 |
1 files changed, 30 insertions, 30 deletions
diff --git a/docs/libnm-glib/tmpl/nm-object.sgml b/docs/libnm-glib/tmpl/nm-object.sgml index 93b2441e..bb17ec37 100644 --- a/docs/libnm-glib/tmpl/nm-object.sgml +++ b/docs/libnm-glib/tmpl/nm-object.sgml @@ -22,82 +22,82 @@ NMObject <!-- ##### SECTION Image ##### --> -<!-- ##### STRUCT NMObject ##### --> +<!-- ##### ENUM NMObjectError ##### --> <para> </para> +@NM_OBJECT_ERROR_UNKNOWN: +@NM_OBJECT_ERROR_OBJECT_CREATION_FAILURE: -<!-- ##### SIGNAL NMObject::object-creation-failed ##### --> +<!-- ##### MACRO NM_OBJECT_ERROR ##### --> <para> </para> -@nmobject: the object which received the signal. -@arg1: -@arg2: -<!-- ##### ARG NMObject:dbus-connection ##### --> + +<!-- ##### FUNCTION nm_object_error_quark ##### --> <para> </para> -<!-- ##### ARG NMObject:dbus-path ##### --> -<para> +@void: +@Returns: -</para> -<!-- ##### STRUCT NMObjectClass ##### --> +<!-- ##### MACRO NM_OBJECT_DBUS_CONNECTION ##### --> <para> </para> -@parent: -@object_creation_failed: -@_reserved1: -@_reserved2: -@_reserved3: -@_reserved4: -@_reserved5: -@_reserved6: -<!-- ##### ENUM NMObjectError ##### --> + +<!-- ##### MACRO NM_OBJECT_DBUS_PATH ##### --> <para> </para> -@NM_OBJECT_ERROR_UNKNOWN: -@NM_OBJECT_ERROR_OBJECT_CREATION_FAILURE: -<!-- ##### MACRO NM_OBJECT_DBUS_CONNECTION ##### --> + +<!-- ##### STRUCT NMObject ##### --> <para> </para> - -<!-- ##### MACRO NM_OBJECT_DBUS_PATH ##### --> +<!-- ##### SIGNAL NMObject::object-creation-failed ##### --> <para> </para> +@nmobject: the object which received the signal. +@arg1: +@arg2: - -<!-- ##### MACRO NM_OBJECT_ERROR ##### --> +<!-- ##### ARG NMObject:dbus-connection ##### --> <para> </para> +<!-- ##### ARG NMObject:dbus-path ##### --> +<para> +</para> -<!-- ##### FUNCTION nm_object_error_quark ##### --> +<!-- ##### STRUCT NMObjectClass ##### --> <para> </para> -@void: -@Returns: - +@parent: +@object_creation_failed: +@_reserved1: +@_reserved2: +@_reserved3: +@_reserved4: +@_reserved5: +@_reserved6: <!-- ##### FUNCTION nm_object_get_connection ##### --> <para> |