Merge with trunk

diff --git a/doc/lightdm-gobject-1-sections.txt b/doc/lightdm-gobject-1-sections.txt
index 8ac42e18232532287c63f49305a4172d4bbee846..501587f93a1331a9f38aff6a89c77924e31f4b16 100644 (file)
--- a/doc/lightdm-gobject-1-sections.txt
+++ b/doc/lightdm-gobject-1-sections.txt
@@ -62,6 +62,7 @@ lightdm_layout_get_type
 <SECTION>
 <FILE>session</FILE>
 <TITLE>Sessions</TITLE>
+lightdm_get_remote_sessions
 lightdm_get_sessions
 lightdm_session_get_key
 lightdm_session_get_name
@@ -81,11 +82,14 @@ LIGHTDM_SESSION_GET_CLASS
 <FILE>user</FILE>
 <TITLE>User Accounts</TITLE>
 changed
+lightdm_user_get_background
 lightdm_user_get_display_name
+lightdm_user_get_has_messages
 lightdm_user_get_home_directory
 lightdm_user_get_image
 lightdm_user_get_language
 lightdm_user_get_layout
+lightdm_user_get_layouts
 lightdm_user_get_logged_in
 lightdm_user_get_name
 lightdm_user_get_real_name
@@ -128,16 +132,22 @@ lightdm_greeter_new
 lightdm_greeter_connect_sync
 lightdm_greeter_get_default_session_hint
 lightdm_greeter_get_hint
+lightdm_greeter_get_lock_hint
 lightdm_greeter_get_has_guest_account_hint
 lightdm_greeter_get_hide_users_hint
+lightdm_greeter_get_show_manual_login_hint
+lightdm_greeter_get_show_remote_login_hint
 lightdm_greeter_get_select_user_hint
 lightdm_greeter_get_select_guest_hint
 lightdm_greeter_get_autologin_user_hint
 lightdm_greeter_get_autologin_guest_hint
 lightdm_greeter_get_autologin_timeout_hint
+lightdm_greeter_set_language
 lightdm_greeter_cancel_autologin
 lightdm_greeter_authenticate
 lightdm_greeter_authenticate_as_guest
+lightdm_greeter_authenticate_autologin
+lightdm_greeter_authenticate_remote
 lightdm_greeter_respond
 lightdm_greeter_cancel_authentication
 lightdm_greeter_get_in_authentication

diff --git a/doc/tmpl/greeter.sgml b/doc/tmpl/greeter.sgml
index b72e8fd818b37579140786f932d9f24335227dca..c537d21f0d71860bb5a5f96be0e1ad2d830dbcdf 100644 (file)
--- a/doc/tmpl/greeter.sgml
+++ b/doc/tmpl/greeter.sgml
@@ -159,6 +159,15 @@ static void authentication_complete_cb (LightDMGreeter *greeter)
 @Returns: 
 
 
+<!-- ##### FUNCTION lightdm_greeter_get_lock_hint ##### -->
+<para>
+
+</para>
+
+@greeter: 
+@Returns: 
+
+
 <!-- ##### FUNCTION lightdm_greeter_get_has_guest_account_hint ##### -->
 <para>
 
@@ -177,6 +186,24 @@ static void authentication_complete_cb (LightDMGreeter *greeter)
 @Returns: 
 
 
+<!-- ##### FUNCTION lightdm_greeter_get_show_manual_login_hint ##### -->
+<para>
+
+</para>
+
+@greeter: 
+@Returns: 
+
+
+<!-- ##### FUNCTION lightdm_greeter_get_show_remote_login_hint ##### -->
+<para>
+
+</para>
+
+@greeter: 
+@Returns: 
+
+
 <!-- ##### FUNCTION lightdm_greeter_get_select_user_hint ##### -->
 <para>
 
@@ -222,6 +249,15 @@ static void authentication_complete_cb (LightDMGreeter *greeter)
 @Returns: 
 
 
+<!-- ##### FUNCTION lightdm_greeter_set_language ##### -->
+<para>
+
+</para>
+
+@greeter: 
+@language: 
+
+
 <!-- ##### FUNCTION lightdm_greeter_cancel_autologin ##### -->
 <para>
 
@@ -247,6 +283,24 @@ static void authentication_complete_cb (LightDMGreeter *greeter)
 @greeter: 
 
 
+<!-- ##### FUNCTION lightdm_greeter_authenticate_autologin ##### -->
+<para>
+
+</para>
+
+@greeter: 
+
+
+<!-- ##### FUNCTION lightdm_greeter_authenticate_remote ##### -->
+<para>
+
+</para>
+
+@greeter: 
+@session: 
+@username: 
+
+
 <!-- ##### FUNCTION lightdm_greeter_respond ##### -->
 <para>
 

diff --git a/doc/tmpl/language.sgml b/doc/tmpl/language.sgml
index e8f7269b89361f05ab01f567c424505da542fda3..aaeb9d668c78eba69abad48706ce3b1ce8a403de 100644 (file)
--- a/doc/tmpl/language.sgml
+++ b/doc/tmpl/language.sgml
@@ -2,7 +2,7 @@
 Languages
 
 <!-- ##### SECTION Short_Description ##### -->
-Get information on available languges
+Get information on available languages
 
 <!-- ##### SECTION Long_Description ##### -->
 <para>

diff --git a/doc/tmpl/session.sgml b/doc/tmpl/session.sgml
index 96f850ba2d8bb5ef679d0bfe9b6259c875c49613..bb75112a1c1db88036d033492466c696e60deb06 100644 (file)
--- a/doc/tmpl/session.sgml
+++ b/doc/tmpl/session.sgml
@@ -20,6 +20,15 @@ Object containing information about a session type. #LightDMSession objects are
 <!-- ##### SECTION Image ##### -->
 
 
+<!-- ##### FUNCTION lightdm_get_remote_sessions ##### -->
+<para>
+
+</para>
+
+@void: 
+@Returns: 
+
+
 <!-- ##### FUNCTION lightdm_get_sessions ##### -->
 <para>
 

diff --git a/doc/tmpl/user.sgml b/doc/tmpl/user.sgml
index 515d2ba26c8ea901a60922e66a7ead7588a2f879..203fdf7b08a7678b04a05666c617dd269ddb8e7d 100644 (file)
--- a/doc/tmpl/user.sgml
+++ b/doc/tmpl/user.sgml
@@ -44,6 +44,15 @@ A user has the following properties:
 @user: 
 
 
+<!-- ##### FUNCTION lightdm_user_get_background ##### -->
+<para>
+
+</para>
+
+@user: 
+@Returns: 
+
+
 <!-- ##### FUNCTION lightdm_user_get_display_name ##### -->
 <para>
 
@@ -53,6 +62,15 @@ A user has the following properties:
 @Returns: 
 
 
+<!-- ##### FUNCTION lightdm_user_get_has_messages ##### -->
+<para>
+
+</para>
+
+@user: 
+@Returns: 
+
+
 <!-- ##### FUNCTION lightdm_user_get_home_directory ##### -->
 <para>
 
@@ -89,6 +107,15 @@ A user has the following properties:
 @Returns: 
 
 
+<!-- ##### FUNCTION lightdm_user_get_layouts ##### -->
+<para>
+
+</para>
+
+@user: 
+@Returns: 
+
+
 <!-- ##### FUNCTION lightdm_user_get_logged_in ##### -->
 <para>
 

diff --git a/liblightdm-gobject/lightdm/greeter.h b/liblightdm-gobject/lightdm/greeter.h
index af409dee9c621f9800527f82457c9564a55768b5..7d8988f24b447494acd73c66ac6aa1b050f9278f 100644 (file)
--- a/liblightdm-gobject/lightdm/greeter.h
+++ b/liblightdm-gobject/lightdm/greeter.h
@@ -58,13 +58,13 @@ typedef struct
     void (*authentication_complete)(LightDMGreeter *greeter);
     void (*autologin_timer_expired)(LightDMGreeter *greeter);
 
-       /* Reserved */
-       void (*reserved1) (void);
-       void (*reserved2) (void);
-       void (*reserved3) (void);
-       void (*reserved4) (void);
-       void (*reserved5) (void);
-       void (*reserved6) (void);
+    /* Reserved */
+    void (*reserved1) (void);
+    void (*reserved2) (void);
+    void (*reserved3) (void);
+    void (*reserved4) (void);
+    void (*reserved5) (void);
+    void (*reserved6) (void);
 } LightDMGreeterClass;
 
 GType lightdm_greeter_get_type (void);

diff --git a/liblightdm-gobject/lightdm/language.h b/liblightdm-gobject/lightdm/language.h
index 71d9ea1be15df7dff0ebd1256780642928555b25..52caf9c922de14c600d5975432fe2f8751364453 100644 (file)
--- a/liblightdm-gobject/lightdm/language.h
+++ b/liblightdm-gobject/lightdm/language.h
@@ -31,13 +31,13 @@ typedef struct
 {
     GObjectClass parent_class;
 
-       /* Reserved */
-       void (*reserved1) (void);
-       void (*reserved2) (void);
-       void (*reserved3) (void);
-       void (*reserved4) (void);
-       void (*reserved5) (void);
-       void (*reserved6) (void);
+    /* Reserved */
+    void (*reserved1) (void);
+    void (*reserved2) (void);
+    void (*reserved3) (void);
+    void (*reserved4) (void);
+    void (*reserved5) (void);
+    void (*reserved6) (void);
 } LightDMLanguageClass;
 
 GType lightdm_language_get_type (void);

diff --git a/liblightdm-gobject/lightdm/layout.h b/liblightdm-gobject/lightdm/layout.h
index 095a28da78427cffb7f052a2b179fa7ee3a40daf..3e0687d087098ca692ff546e5a5e0dd91219ff81 100644 (file)
--- a/liblightdm-gobject/lightdm/layout.h
+++ b/liblightdm-gobject/lightdm/layout.h
@@ -31,13 +31,13 @@ typedef struct
 {
     GObjectClass parent_class;
 
-       /* Reserved */
-       void (*reserved1) (void);
-       void (*reserved2) (void);
-       void (*reserved3) (void);
-       void (*reserved4) (void);
-       void (*reserved5) (void);
-       void (*reserved6) (void);
+    /* Reserved */
+    void (*reserved1) (void);
+    void (*reserved2) (void);
+    void (*reserved3) (void);
+    void (*reserved4) (void);
+    void (*reserved5) (void);
+    void (*reserved6) (void);
 } LightDMLayoutClass;
 
 GType lightdm_layout_get_type (void);

diff --git a/liblightdm-gobject/lightdm/session.h b/liblightdm-gobject/lightdm/session.h
index 4123888cae3b5c4f70fcaffa99825929f0fc953d..5732117f79ba4c25255ead4c6743bf2b632717e8 100644 (file)
--- a/liblightdm-gobject/lightdm/session.h
+++ b/liblightdm-gobject/lightdm/session.h
@@ -31,13 +31,13 @@ typedef struct
 {
     GObjectClass parent_class;
 
-       /* Reserved */
-       void (*reserved1) (void);
-       void (*reserved2) (void);
-       void (*reserved3) (void);
-       void (*reserved4) (void);
-       void (*reserved5) (void);
-       void (*reserved6) (void);
+    /* Reserved */
+    void (*reserved1) (void);
+    void (*reserved2) (void);
+    void (*reserved3) (void);
+    void (*reserved4) (void);
+    void (*reserved5) (void);
+    void (*reserved6) (void);
 } LightDMSessionClass;
 
 GType lightdm_session_get_type (void);

diff --git a/liblightdm-gobject/lightdm/user.h b/liblightdm-gobject/lightdm/user.h
index 860a1ab4ba02659a9bcaf755fccbb9f22dc91a05..b43fc5160cc9762aeab98976d65161378cd210ab 100644 (file)
--- a/liblightdm-gobject/lightdm/user.h
+++ b/liblightdm-gobject/lightdm/user.h
@@ -39,13 +39,13 @@ typedef struct
     GObjectClass parent_class;
     void (*changed)(LightDMUser *user);
 
-       /* Reserved */
-       void (*reserved1) (void);
-       void (*reserved2) (void);
-       void (*reserved3) (void);
-       void (*reserved4) (void);
-       void (*reserved5) (void);
-       void (*reserved6) (void);
+    /* Reserved */
+    void (*reserved1) (void);
+    void (*reserved2) (void);
+    void (*reserved3) (void);
+    void (*reserved4) (void);
+    void (*reserved5) (void);
+    void (*reserved6) (void);
 } LightDMUserClass;
 
 typedef struct
@@ -61,13 +61,13 @@ typedef struct
     void (*user_changed)(LightDMUserList *user_list, LightDMUser *user);
     void (*user_removed)(LightDMUserList *user_list, LightDMUser *user);
 
-       /* Reserved */
-       void (*reserved1) (void);
-       void (*reserved2) (void);
-       void (*reserved3) (void);
-       void (*reserved4) (void);
-       void (*reserved5) (void);
-       void (*reserved6) (void);
+    /* Reserved */
+    void (*reserved1) (void);
+    void (*reserved2) (void);
+    void (*reserved3) (void);
+    void (*reserved4) (void);
+    void (*reserved5) (void);
+    void (*reserved6) (void);
 } LightDMUserListClass;
 
 GType lightdm_user_list_get_type (void);