diff options
| author | Robert Ancell <robert.ancell@canonical.com> | 2014-04-29 13:23:43 +1200 |
|---|---|---|
| committer | Robert Ancell <robert.ancell@canonical.com> | 2014-04-29 13:23:43 +1200 |
| commit | 5002c392c7754a801cb886cab5d6ce95b18670f7 (patch) | |
| tree | 9f49138c7e93448d03ef6bce462228c300430e6d | |
| parent | 66fbd496813ddcb805ad2b61e423501eadcac9e4 (diff) | |
| parent | b885e0d5ddc6ae9942d75da234646a8c5c824d38 (diff) | |
| download | lightdm-5002c392c7754a801cb886cab5d6ce95b18670f7.tar.gz | |
Merge with trunk
| -rw-r--r-- | doc/lightdm-gobject-1-sections.txt | 3 | ||||
| -rw-r--r-- | doc/tmpl/greeter.sgml | 25 |
2 files changed, 28 insertions, 0 deletions
diff --git a/doc/lightdm-gobject-1-sections.txt b/doc/lightdm-gobject-1-sections.txt index aff5bc54..231c9dfc 100644 --- a/doc/lightdm-gobject-1-sections.txt +++ b/doc/lightdm-gobject-1-sections.txt @@ -127,9 +127,12 @@ show_message show_prompt authentication_complete autologin_timer_expired +idle +reset LightDMMessageType LightDMPromptType lightdm_greeter_new +lightdm_greeter_set_resettable lightdm_greeter_connect lightdm_greeter_connect_finish lightdm_greeter_connect_sync diff --git a/doc/tmpl/greeter.sgml b/doc/tmpl/greeter.sgml index fec80598..35258096 100644 --- a/doc/tmpl/greeter.sgml +++ b/doc/tmpl/greeter.sgml @@ -105,6 +105,22 @@ static void authentication_complete_cb (LightDMGreeter *greeter) @greeter: +<!-- ##### USER_FUNCTION idle ##### --> +<para> + +</para> + +@greeter: + + +<!-- ##### USER_FUNCTION reset ##### --> +<para> + +</para> + +@greeter: + + <!-- ##### ENUM LightDMMessageType ##### --> <para> @@ -130,6 +146,15 @@ static void authentication_complete_cb (LightDMGreeter *greeter) @Returns: +<!-- ##### FUNCTION lightdm_greeter_set_resettable ##### --> +<para> + +</para> + +@greeter: +@resettable: + + <!-- ##### FUNCTION lightdm_greeter_connect ##### --> <para> |