diff options
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | doc/Makefile.am | 2 | ||||
| -rw-r--r-- | doc/lightdm-gobject-0-sections.txt | 222 | ||||
| -rw-r--r-- | doc/lightdm-gobject-0.types | 10 | ||||
| -rw-r--r-- | doc/tmpl/greeter.sgml | 118 | ||||
| -rw-r--r-- | doc/tmpl/language.sgml | 12 | ||||
| -rw-r--r-- | doc/tmpl/layout.sgml | 10 | ||||
| -rw-r--r-- | doc/tmpl/session.sgml | 10 | ||||
| -rw-r--r-- | doc/tmpl/user.sgml | 22 | ||||
| -rw-r--r-- | greeters/gtk/lightdm-gtk-greeter.c | 154 | ||||
| -rw-r--r-- | liblightdm-gobject/Makefile.am | 2 | ||||
| -rw-r--r-- | liblightdm-gobject/greeter.c | 658 | ||||
| -rw-r--r-- | liblightdm-gobject/language.c | 82 | ||||
| -rw-r--r-- | liblightdm-gobject/layout.c | 68 | ||||
| -rw-r--r-- | liblightdm-gobject/liblightdm-gobject-0.vapi | 2 | ||||
| -rw-r--r-- | liblightdm-gobject/lightdm/greeter.h | 152 | ||||
| -rw-r--r-- | liblightdm-gobject/lightdm/language.h | 34 | ||||
| -rw-r--r-- | liblightdm-gobject/lightdm/layout.h | 32 | ||||
| -rw-r--r-- | liblightdm-gobject/lightdm/session.h | 32 | ||||
| -rw-r--r-- | liblightdm-gobject/lightdm/user.h | 42 | ||||
| -rw-r--r-- | liblightdm-gobject/session.c | 68 | ||||
| -rw-r--r-- | liblightdm-gobject/user-private.h | 14 | ||||
| -rw-r--r-- | liblightdm-gobject/user.c | 188 | ||||
| -rw-r--r-- | tests/src/test-gobject-greeter.c | 38 |
24 files changed, 987 insertions, 986 deletions
@@ -17,6 +17,7 @@ Overview of changes in lightdm 0.9.0 * liblightdm API changes: - Added a session-failed signal to indicate if the session didn't start and the greeter should try authorizing again. + - liblightdm-gobject now uses lightdm_ prefix instead of ldm_ * Drop most of the configure options, they aren't necessary * Removed the Vala and Python GTK+ greeters, they weren't being well maintained. diff --git a/doc/Makefile.am b/doc/Makefile.am index d5345989..c054b8af 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -15,7 +15,7 @@ GTKDOC_LIBS = \ $(LIBLIGHTDM_GOBJECT_LIBS) \ $(top_builddir)/liblightdm-gobject/liblightdm-gobject-0.la -MKDB_OPTIONS=--sgml-mode --output-format=xml --name-space=ldm +MKDB_OPTIONS=--sgml-mode --output-format=xml --name-space=LightDM DISTCLEANFILES = \ $(DOC_MODULE)-docs.xml \ diff --git a/doc/lightdm-gobject-0-sections.txt b/doc/lightdm-gobject-0-sections.txt index 2c5814be..06002e30 100644 --- a/doc/lightdm-gobject-0-sections.txt +++ b/doc/lightdm-gobject-0-sections.txt @@ -2,141 +2,141 @@ <SECTION> <FILE>language</FILE> -<TITLE>LdmLanguage</TITLE> -ldm_language_get_code -ldm_language_get_name -ldm_language_get_territory -ldm_language_matches +<TITLE>LightDMLanguage</TITLE> +lightdm_language_get_code +lightdm_language_get_name +lightdm_language_get_territory +lightdm_language_matches <SUBSECTION Standard> -LDM_IS_LANGUAGE -LDM_IS_LANGUAGE_CLASS -LDM_LANGUAGE -LDM_LANGUAGE_CLASS -LDM_LANGUAGE_GET_CLASS -LDM_TYPE_LANGUAGE -ldm_language_get_type +LIGHTDM_IS_LANGUAGE +LIGHTDM_IS_LANGUAGE_CLASS +LIGHTDM_LANGUAGE +LIGHTDM_LANGUAGE_CLASS +LIGHTDM_LANGUAGE_GET_CLASS +LIGHTDM_TYPE_LANGUAGE +lightdm_language_get_type <SUBSECTION Private> -ldm_language_new +lightdm_language_new </SECTION> <SECTION> <FILE>layout</FILE> -<TITLE>LdmLayout</TITLE> -ldm_layout_get_name -ldm_layout_get_short_description -ldm_layout_get_description +<TITLE>LightDMLayout</TITLE> +lightdm_layout_get_name +lightdm_layout_get_short_description +lightdm_layout_get_description <SUBSECTION Standard> -LDM_IS_LAYOUT -LDM_IS_LAYOUT_CLASS -LDM_LAYOUT -LDM_LAYOUT_CLASS -LDM_LAYOUT_GET_CLASS -LDM_TYPE_LAYOUT -ldm_layout_get_type +LIGHTDM_IS_LAYOUT +LIGHTDM_IS_LAYOUT_CLASS +LIGHTDM_LAYOUT +LIGHTDM_LAYOUT_CLASS +LIGHTDM_LAYOUT_GET_CLASS +LIGHTDM_TYPE_LAYOUT +lightdm_layout_get_type <SUBSECTION Private> -ldm_layout_new +lightdm_layout_new </SECTION> <SECTION> <FILE>user</FILE> -<TITLE>LdmUser</TITLE> -ldm_user_get_name -ldm_user_get_real_name -ldm_user_get_display_name -ldm_user_get_home_directory -ldm_user_get_image -ldm_user_get_language -ldm_user_get_layout -ldm_user_get_session -ldm_user_get_logged_in +<TITLE>LightDMUser</TITLE> +lightdm_user_get_name +lightdm_user_get_real_name +lightdm_user_get_display_name +lightdm_user_get_home_directory +lightdm_user_get_image +lightdm_user_get_language +lightdm_user_get_layout +lightdm_user_get_session +lightdm_user_get_logged_in <SUBSECTION Standard> -LDM_USER -LDM_IS_USER -LDM_TYPE_USER -ldm_user_get_type -LDM_USER_CLASS -LDM_IS_USER_CLASS -LDM_USER_GET_CLASS +LIGHTDM_USER +LIGHTDM_IS_USER +LIGHTDM_TYPE_USER +lightdm_user_get_type +LIGHTDM_USER_CLASS +LIGHTDM_IS_USER_CLASS +LIGHTDM_USER_GET_CLASS <SUBSECTION Private> -ldm_user_new -ldm_user_set_name -ldm_user_set_real_name -ldm_user_set_home_directory -ldm_user_set_image -ldm_user_set_logged_in -ldm_user_update +lightdm_user_new +lightdm_user_set_name +lightdm_user_set_real_name +lightdm_user_set_home_directory +lightdm_user_set_image +lightdm_user_set_logged_in +lightdm_user_update </SECTION> <SECTION> <FILE>session</FILE> -<TITLE>LdmSession</TITLE> -ldm_session_get_key -ldm_session_get_name -ldm_session_get_comment +<TITLE>LightDMSession</TITLE> +lightdm_session_get_key +lightdm_session_get_name +lightdm_session_get_comment <SUBSECTION Standard> -LDM_SESSION -LDM_IS_SESSION -LDM_TYPE_SESSION -ldm_session_get_type -LDM_SESSION_CLASS -LDM_IS_SESSION_CLASS -LDM_SESSION_GET_CLASS +LIGHTDM_SESSION +LIGHTDM_IS_SESSION +LIGHTDM_TYPE_SESSION +lightdm_session_get_type +LIGHTDM_SESSION_CLASS +LIGHTDM_IS_SESSION_CLASS +LIGHTDM_SESSION_GET_CLASS <SUBSECTION Private> -ldm_session_new +lightdm_session_new </SECTION> <SECTION> <FILE>greeter</FILE> -<TITLE>LdmGreeter</TITLE> -LdmMessageType -LdmPromptType -ldm_greeter_new -ldm_greeter_connect_to_server -ldm_greeter_get_hostname -ldm_greeter_get_num_users -ldm_greeter_get_users -ldm_greeter_get_user_by_name -ldm_greeter_get_default_language -ldm_greeter_get_languages -ldm_greeter_get_layouts -ldm_greeter_get_layout -ldm_greeter_set_layout -ldm_greeter_get_sessions -ldm_greeter_get_default_session_hint -ldm_greeter_get_hint -ldm_greeter_get_has_guest_account_hint -ldm_greeter_get_hide_users_hint -ldm_greeter_get_select_user_hint -ldm_greeter_get_select_guest_hint -ldm_greeter_get_autologin_user_hint -ldm_greeter_get_autologin_guest_hint -ldm_greeter_get_autologin_timeout_hint -ldm_greeter_cancel_timed_login -ldm_greeter_login -ldm_greeter_login_with_user_prompt -ldm_greeter_login_as_guest -ldm_greeter_respond -ldm_greeter_cancel_authentication -ldm_greeter_get_in_authentication -ldm_greeter_get_is_authenticated -ldm_greeter_get_authentication_user -ldm_greeter_start_session -ldm_greeter_start_default_session -ldm_greeter_get_can_suspend -ldm_greeter_suspend -ldm_greeter_get_can_hibernate -ldm_greeter_hibernate -ldm_greeter_get_can_restart -ldm_greeter_restart -ldm_greeter_get_can_shutdown -ldm_greeter_shutdown +<TITLE>LightDMGreeter</TITLE> +LightDMMessageType +LightDMPromptType +lightdm_greeter_new +lightdm_greeter_connect_to_server +lightdm_greeter_get_hostname +lightdm_greeter_get_num_users +lightdm_greeter_get_users +lightdm_greeter_get_user_by_name +lightdm_greeter_get_default_language +lightdm_greeter_get_languages +lightdm_greeter_get_layouts +lightdm_greeter_get_layout +lightdm_greeter_set_layout +lightdm_greeter_get_sessions +lightdm_greeter_get_default_session_hint +lightdm_greeter_get_hint +lightdm_greeter_get_has_guest_account_hint +lightdm_greeter_get_hide_users_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_cancel_timed_login +lightdm_greeter_login +lightdm_greeter_login_with_user_prompt +lightdm_greeter_login_as_guest +lightdm_greeter_respond +lightdm_greeter_cancel_authentication +lightdm_greeter_get_in_authentication +lightdm_greeter_get_is_authenticated +lightdm_greeter_get_authentication_user +lightdm_greeter_start_session +lightdm_greeter_start_default_session +lightdm_greeter_get_can_suspend +lightdm_greeter_suspend +lightdm_greeter_get_can_hibernate +lightdm_greeter_hibernate +lightdm_greeter_get_can_restart +lightdm_greeter_restart +lightdm_greeter_get_can_shutdown +lightdm_greeter_shutdown <SUBSECTION Standard> -LDM_GREETER -LDM_IS_GREETER -LDM_TYPE_GREETER -ldm_greeter_get_type -LDM_GREETER_CLASS -LDM_IS_GREETER_CLASS -LDM_GREETER_GET_CLASS +LIGHTDM_GREETER +LIGHTDM_IS_GREETER +LIGHTDM_TYPE_GREETER +lightdm_greeter_get_type +LIGHTDM_GREETER_CLASS +LIGHTDM_IS_GREETER_CLASS +LIGHTDM_GREETER_GET_CLASS <SUBSECTION Private> </SECTION> diff --git a/doc/lightdm-gobject-0.types b/doc/lightdm-gobject-0.types index c0150a70..3ea90fed 100644 --- a/doc/lightdm-gobject-0.types +++ b/doc/lightdm-gobject-0.types @@ -1,5 +1,5 @@ -ldm_greeter_get_type -ldm_language_get_type -ldm_layout_get_type -ldm_session_get_type -ldm_user_get_type +lightdm_greeter_get_type +lightdm_language_get_type +lightdm_layout_get_type +lightdm_session_get_type +lightdm_user_get_type diff --git a/doc/tmpl/greeter.sgml b/doc/tmpl/greeter.sgml index 33d9172e..e56b6c29 100644 --- a/doc/tmpl/greeter.sgml +++ b/doc/tmpl/greeter.sgml @@ -1,12 +1,12 @@ <!-- ##### SECTION Title ##### --> -LdmGreeter +LightDMGreeter <!-- ##### SECTION Short_Description ##### --> Manages connection to LightDM server and provides greeter functionality <!-- ##### SECTION Long_Description ##### --> <para> -#LdmGreeter is an object that manages the connection to the LightDM server and provides common greeter functionality. +#LightDMGreeter is an object that manages the connection to the LightDM server and provides common greeter functionality. </para> <para> <example> @@ -14,7 +14,7 @@ Manages connection to LightDM server and provides greeter functionality <programlisting><![CDATA[ int main () { - LdmGreeter *greeter = ldm_greeter_new (); + LightDMGreeter *greeter = lightdm_greeter_new (); g_object_connect (greeter, "connected", G_CALLBACK (connected_cb), NULL); g_object_connect (greeter, "show-prompt", G_CALLBACK (show_prompt_cb), NULL); @@ -22,32 +22,32 @@ int main () g_object_connect (greeter, "session-failed", G_CALLBACK (session_failed_cb), NULL); g_object_connect (greeter, "quit", G_CALLBACK (quit_cb), NULL); - if (!ldm_greeter_connect_to_server (LDM_GREETER (greeter))) { + if (!lightdm_greeter_connect_to_server (LIGHTDM_GREETER (greeter))) { // Log an error return 0; } } -static void connected_cb (LdmGreeter *greeter) +static void connected_cb (LightDMGreeter *greeter) { // Start authentication - ldm_greeter_login_with_user_prompt (greeter); + lightdm_greeter_login_with_user_prompt (greeter); } -static void show_prompt_cb (LdmGreeter *greeter, const char *text, LdmPromptType type) +static void show_prompt_cb (LightDMGreeter *greeter, const char *text, LightDMPromptType type) { // Show the user the message and prompt for some response gchar *secret = prompt_user (text, type); // Give the result to the user - ldm_greeter_respond (greeter, response); + lightdm_greeter_respond (greeter, response); } -static void authentication_complete_cb (LdmGreeter *greeter) +static void authentication_complete_cb (LightDMGreeter *greeter) { - if (ldm_greeter_get_is_authenticated (greeter)) { + if (lightdm_greeter_get_is_authenticated (greeter)) { // Start the user session - ldm_greeter_start_default_session (greeter); + lightdm_greeter_start_default_session (greeter); } else { // Display a warning and reset the greeter @@ -55,13 +55,13 @@ static void authentication_complete_cb (LdmGreeter *greeter) } } -static void session_failed_cb (LdmGreeter *greeter) +static void session_failed_cb (LightDMGreeter *greeter) { // Display a warning and reset the greeter reset_login_screen (``Failed to login''); } -static void quit_cb (LdmGreeter *greeter) +static void quit_cb (LightDMGreeter *greeter) { // Clean up // ... @@ -83,23 +83,23 @@ static void quit_cb (LdmGreeter *greeter) <!-- ##### SECTION Image ##### --> -<!-- ##### ENUM LdmMessageType ##### --> +<!-- ##### ENUM LightDMMessageType ##### --> <para> </para> -@LDM_MESSAGE_TYPE_INFO: -@LDM_MESSAGE_TYPE_ERROR: +@LIGHTDM_MESSAGE_TYPE_INFO: +@LIGHTDM_MESSAGE_TYPE_ERROR: -<!-- ##### ENUM LdmPromptType ##### --> +<!-- ##### ENUM LightDMPromptType ##### --> <para> </para> -@LDM_PROMPT_TYPE_QUESTION: -@LDM_PROMPT_TYPE_SECRET: +@LIGHTDM_PROMPT_TYPE_QUESTION: +@LIGHTDM_PROMPT_TYPE_SECRET: -<!-- ##### FUNCTION ldm_greeter_new ##### --> +<!-- ##### FUNCTION lightdm_greeter_new ##### --> <para> </para> @@ -108,7 +108,7 @@ static void quit_cb (LdmGreeter *greeter) @Returns: -<!-- ##### FUNCTION ldm_greeter_connect_to_server ##### --> +<!-- ##### FUNCTION lightdm_greeter_connect_to_server ##### --> <para> </para> @@ -117,7 +117,7 @@ static void quit_cb (LdmGreeter *greeter) @Returns: -<!-- ##### FUNCTION ldm_greeter_get_hostname ##### --> +<!-- ##### FUNCTION lightdm_greeter_get_hostname ##### --> <para> </para> @@ -126,7 +126,7 @@ static void quit_cb (LdmGreeter *greeter) @Returns: -<!-- ##### FUNCTION ldm_greeter_get_num_users ##### --> +<!-- ##### FUNCTION lightdm_greeter_get_num_users ##### --> <para> </para> @@ -135,7 +135,7 @@ static void quit_cb (LdmGreeter *greeter) @Returns: -<!-- ##### FUNCTION ldm_greeter_get_users ##### --> +<!-- ##### FUNCTION lightdm_greeter_get_users ##### --> <para> </para> @@ -144,7 +144,7 @@ static void quit_cb (LdmGreeter *greeter) @Returns: -<!-- ##### FUNCTION ldm_greeter_get_user_by_name ##### --> +<!-- ##### FUNCTION lightdm_greeter_get_user_by_name ##### --> <para> </para> @@ -154,7 +154,7 @@ static void quit_cb (LdmGreeter *greeter) @Returns: -<!-- ##### FUNCTION ldm_greeter_get_default_language ##### --> +<!-- ##### FUNCTION lightdm_greeter_get_default_language ##### --> <para> </para> @@ -163,7 +163,7 @@ static void quit_cb (LdmGreeter *greeter) @Returns: -<!-- ##### FUNCTION ldm_greeter_get_languages ##### --> +<!-- ##### FUNCTION lightdm_greeter_get_languages ##### --> <para> </para> @@ -172,7 +172,7 @@ static void quit_cb (LdmGreeter *greeter) @Returns: -<!-- ##### FUNCTION ldm_greeter_get_layouts ##### --> +<!-- ##### FUNCTION lightdm_greeter_get_layouts ##### --> <para> </para> @@ -181,7 +181,7 @@ static void quit_cb (LdmGreeter *greeter) @Returns: -<!-- ##### FUNCTION ldm_greeter_get_layout ##### --> +<!-- ##### FUNCTION lightdm_greeter_get_layout ##### --> <para> </para> @@ -190,7 +190,7 @@ static void quit_cb (LdmGreeter *greeter) @Returns: -<!-- ##### FUNCTION ldm_greeter_set_layout ##### --> +<!-- ##### FUNCTION lightdm_greeter_set_layout ##### --> <para> </para> @@ -199,7 +199,7 @@ static void quit_cb (LdmGreeter *greeter) @layout: -<!-- ##### FUNCTION ldm_greeter_get_sessions ##### --> +<!-- ##### FUNCTION lightdm_greeter_get_sessions ##### --> <para> </para> @@ -208,7 +208,7 @@ static void quit_cb (LdmGreeter *greeter) @Returns: -<!-- ##### FUNCTION ldm_greeter_get_default_session_hint ##### --> +<!-- ##### FUNCTION lightdm_greeter_get_default_session_hint ##### --> <para> </para> @@ -217,7 +217,7 @@ static void quit_cb (LdmGreeter *greeter) @Returns: -<!-- ##### FUNCTION ldm_greeter_get_hint ##### --> +<!-- ##### FUNCTION lightdm_greeter_get_hint ##### --> <para> </para> @@ -227,7 +227,7 @@ static void quit_cb (LdmGreeter *greeter) @Returns: -<!-- ##### FUNCTION ldm_greeter_get_has_guest_account_hint ##### --> +<!-- ##### FUNCTION lightdm_greeter_get_has_guest_account_hint ##### --> <para> </para> @@ -236,7 +236,7 @@ static void quit_cb (LdmGreeter *greeter) @Returns: -<!-- ##### FUNCTION ldm_greeter_get_hide_users_hint ##### --> +<!-- ##### FUNCTION lightdm_greeter_get_hide_users_hint ##### --> <para> </para> @@ -245,7 +245,7 @@ static void quit_cb (LdmGreeter *greeter) @Returns: -<!-- ##### FUNCTION ldm_greeter_get_select_user_hint ##### --> +<!-- ##### FUNCTION lightdm_greeter_get_select_user_hint ##### --> <para> </para> @@ -254,7 +254,7 @@ static void quit_cb (LdmGreeter *greeter) @Returns: -<!-- ##### FUNCTION ldm_greeter_get_select_guest_hint ##### --> +<!-- ##### FUNCTION lightdm_greeter_get_select_guest_hint ##### --> <para> </para> @@ -263,7 +263,7 @@ static void quit_cb (LdmGreeter *greeter) @Returns: -<!-- ##### FUNCTION ldm_greeter_get_autologin_user_hint ##### --> +<!-- ##### FUNCTION lightdm_greeter_get_autologin_user_hint ##### --> <para> </para> @@ -272,7 +272,7 @@ static void quit_cb (LdmGreeter *greeter) @Returns: -<!-- ##### FUNCTION ldm_greeter_get_autologin_guest_hint ##### --> +<!-- ##### FUNCTION lightdm_greeter_get_autologin_guest_hint ##### --> <para> </para> @@ -281,7 +281,7 @@ static void quit_cb (LdmGreeter *greeter) @Returns: -<!-- ##### FUNCTION ldm_greeter_get_autologin_timeout_hint ##### --> +<!-- ##### FUNCTION lightdm_greeter_get_autologin_timeout_hint ##### --> <para> </para> @@ -290,7 +290,7 @@ static void quit_cb (LdmGreeter *greeter) @Returns: -<!-- ##### FUNCTION ldm_greeter_cancel_timed_login ##### --> +<!-- ##### FUNCTION lightdm_greeter_cancel_timed_login ##### --> <para> </para> @@ -298,7 +298,7 @@ static void quit_cb (LdmGreeter *greeter) @greeter: -<!-- ##### FUNCTION ldm_greeter_login ##### --> +<!-- ##### FUNCTION lightdm_greeter_login ##### --> <para> </para> @@ -307,7 +307,7 @@ static void quit_cb (LdmGreeter *greeter) @username: -<!-- ##### FUNCTION ldm_greeter_login_with_user_prompt ##### --> +<!-- ##### FUNCTION lightdm_greeter_login_with_user_prompt ##### --> <para> </para> @@ -315,7 +315,7 @@ static void quit_cb (LdmGreeter *greeter) @greeter: -<!-- ##### FUNCTION ldm_greeter_login_as_guest ##### --> +<!-- ##### FUNCTION lightdm_greeter_login_as_guest ##### --> <para> </para> @@ -323,7 +323,7 @@ static void quit_cb (LdmGreeter *greeter) @greeter: -<!-- ##### FUNCTION ldm_greeter_respond ##### --> +<!-- ##### FUNCTION lightdm_greeter_respond ##### --> <para> </para> @@ -332,7 +332,7 @@ static void quit_cb (LdmGreeter *greeter) @response: -<!-- ##### FUNCTION ldm_greeter_cancel_authentication ##### --> +<!-- ##### FUNCTION lightdm_greeter_cancel_authentication ##### --> <para> </para> @@ -340,7 +340,7 @@ static void quit_cb (LdmGreeter *greeter) @greeter: -<!-- ##### FUNCTION ldm_greeter_get_in_authentication ##### --> +<!-- ##### FUNCTION lightdm_greeter_get_in_authentication ##### --> <para> </para> @@ -349,7 +349,7 @@ static void quit_cb (LdmGreeter *greeter) @Returns: -<!-- ##### FUNCTION ldm_greeter_get_is_authenticated ##### --> +<!-- ##### FUNCTION lightdm_greeter_get_is_authenticated ##### --> <para> </para> @@ -358,7 +358,7 @@ static void quit_cb (LdmGreeter *greeter) @Returns: -<!-- ##### FUNCTION ldm_greeter_get_authentication_user ##### --> +<!-- ##### FUNCTION lightdm_greeter_get_authentication_user ##### --> <para> </para> @@ -367,7 +367,7 @@ static void quit_cb (LdmGreeter *greeter) @Returns: -<!-- ##### FUNCTION ldm_greeter_start_session ##### --> +<!-- ##### FUNCTION lightdm_greeter_start_session ##### --> <para> </para> @@ -376,7 +376,7 @@ static void quit_cb (LdmGreeter *greeter) @session: -<!-- ##### FUNCTION ldm_greeter_start_default_session ##### --> +<!-- ##### FUNCTION lightdm_greeter_start_default_session ##### --> <para> </para> @@ -384,7 +384,7 @@ static void quit_cb (LdmGreeter *greeter) @greeter: -<!-- ##### FUNCTION ldm_greeter_get_can_suspend ##### --> +<!-- ##### FUNCTION lightdm_greeter_get_can_suspend ##### --> <para> </para> @@ -393,7 +393,7 @@ static void quit_cb (LdmGreeter *greeter) @Returns: -<!-- ##### FUNCTION ldm_greeter_suspend ##### --> +<!-- ##### FUNCTION lightdm_greeter_suspend ##### --> <para> </para> @@ -401,7 +401,7 @@ static void quit_cb (LdmGreeter *greeter) @greeter: -<!-- ##### FUNCTION ldm_greeter_get_can_hibernate ##### --> +<!-- ##### FUNCTION lightdm_greeter_get_can_hibernate ##### --> <para> </para> @@ -410,7 +410,7 @@ static void quit_cb (LdmGreeter *greeter) @Returns: -<!-- ##### FUNCTION ldm_greeter_hibernate ##### --> +<!-- ##### FUNCTION lightdm_greeter_hibernate ##### --> <para> </para> @@ -418,7 +418,7 @@ static void quit_cb (LdmGreeter *greeter) @greeter: -<!-- ##### FUNCTION ldm_greeter_get_can_restart ##### --> +<!-- ##### FUNCTION lightdm_greeter_get_can_restart ##### --> <para> </para> @@ -427,7 +427,7 @@ static void quit_cb (LdmGreeter *greeter) @Returns: -<!-- ##### FUNCTION ldm_greeter_restart ##### --> +<!-- ##### FUNCTION lightdm_greeter_restart ##### --> <para> </para> @@ -435,7 +435,7 @@ static void quit_cb (LdmGreeter *greeter) @greeter: -<!-- ##### FUNCTION ldm_greeter_get_can_shutdown ##### --> +<!-- ##### FUNCTION lightdm_greeter_get_can_shutdown ##### --> <para> </para> @@ -444,7 +444,7 @@ static void quit_cb (LdmGreeter *greeter) @Returns: -<!-- ##### FUNCTION ldm_greeter_shutdown ##### --> +<!-- ##### FUNCTION lightdm_greeter_shutdown ##### --> <para> </para> diff --git a/doc/tmpl/language.sgml b/doc/tmpl/language.sgml index 3c7c59d8..c78ffc5d 100644 --- a/doc/tmpl/language.sgml +++ b/doc/tmpl/language.sgml @@ -1,12 +1,12 @@ <!-- ##### SECTION Title ##### --> -LdmLanguage +LightDMLanguage <!-- ##### SECTION Short_Description ##### --> Information about an available language <!-- ##### SECTION Long_Description ##### --> <para> -#LdmLanguage is an object that describes a language that is available on the system. +#LightDMLanguage is an object that describes a language that is available on the system. </para> <!-- ##### SECTION See_Also ##### --> @@ -20,7 +20,7 @@ Information about an available language <!-- ##### SECTION Image ##### --> -<!-- ##### FUNCTION ldm_language_get_code ##### --> +<!-- ##### FUNCTION lightdm_language_get_code ##### --> <para> </para> @@ -29,7 +29,7 @@ Information about an available language @Returns: -<!-- ##### FUNCTION ldm_language_get_name ##### --> +<!-- ##### FUNCTION lightdm_language_get_name ##### --> <para> </para> @@ -38,7 +38,7 @@ Information about an available language @Returns: -<!-- ##### FUNCTION ldm_language_get_territory ##### --> +<!-- ##### FUNCTION lightdm_language_get_territory ##### --> <para> </para> @@ -47,7 +47,7 @@ Information about an available language @Returns: -<!-- ##### FUNCTION ldm_language_matches ##### --> +<!-- ##### FUNCTION lightdm_language_matches ##### --> <para> </para> diff --git a/doc/tmpl/layout.sgml b/doc/tmpl/layout.sgml index d12d921c..5dc905c6 100644 --- a/doc/tmpl/layout.sgml +++ b/doc/tmpl/layout.sgml @@ -1,12 +1,12 @@ <!-- ##### SECTION Title ##### --> -LdmLayout +LightDMLayout <!-- ##### SECTION Short_Description ##### --> Information about an available keyboard layout <!-- ##### SECTION Long_Description ##### --> <para> -#LdmLayout is an object that describes a keyboard that is available on the system. +#LightDMLayout is an object that describes a keyboard that is available on the system. </para> <!-- ##### SECTION See_Also ##### --> @@ -20,7 +20,7 @@ Information about an available keyboard layout <!-- ##### SECTION Image ##### --> -<!-- ##### FUNCTION ldm_layout_get_name ##### --> +<!-- ##### FUNCTION lightdm_layout_get_name ##### --> <para> </para> @@ -29,7 +29,7 @@ Information about an available keyboard layout @Returns: -<!-- ##### FUNCTION ldm_layout_get_short_description ##### --> +<!-- ##### FUNCTION lightdm_layout_get_short_description ##### --> <para> </para> @@ -38,7 +38,7 @@ Information about an available keyboard layout @Returns: -<!-- ##### FUNCTION ldm_layout_get_description ##### --> +<!-- ##### FUNCTION lightdm_layout_get_description ##### --> <para> </para> diff --git a/doc/tmpl/session.sgml b/doc/tmpl/session.sgml index 8f947783..7fe247c7 100644 --- a/doc/tmpl/session.sgml +++ b/doc/tmpl/session.sgml @@ -1,12 +1,12 @@ <!-- ##### SECTION Title ##### --> -LdmSession +LightDMSession <!-- ##### SECTION Short_Description ##### --> Information about an available session <!-- ##### SECTION Long_Description ##### --> <para> -Object containing information about a session type. #LdmSession objects are not created by the user, but provided by the #LdmGreeter object. +Object containing information about a session type. #LightDMSession objects are not created by the user, but provided by the #LightDMGreeter object. </para> <!-- ##### SECTION See_Also ##### --> @@ -20,7 +20,7 @@ Object containing information about a session type. #LdmSession objects are not <!-- ##### SECTION Image ##### --> -<!-- ##### FUNCTION ldm_session_get_key ##### --> +<!-- ##### FUNCTION lightdm_session_get_key ##### --> <para> </para> @@ -29,7 +29,7 @@ Object containing information about a session type. #LdmSession objects are not @Returns: -<!-- ##### FUNCTION ldm_session_get_name ##### --> +<!-- ##### FUNCTION lightdm_session_get_name ##### --> <para> </para> @@ -38,7 +38,7 @@ Object containing information about a session type. #LdmSession objects are not @Returns: -<!-- ##### FUNCTION ldm_session_get_comment ##### --> +<!-- ##### FUNCTION lightdm_session_get_comment ##### --> <para> </para> diff --git a/doc/tmpl/user.sgml b/doc/tmpl/user.sgml index 0fae16c7..fcfa9a92 100644 --- a/doc/tmpl/user.sgml +++ b/doc/tmpl/user.sgml @@ -1,12 +1,12 @@ <!-- ##### SECTION Title ##### --> -LdmUser +LightDMUser <!-- ##### SECTION Short_Description ##### --> Information about a user account <!-- ##### SECTION Long_Description ##### --> <para> -Object containing information about a user present on this system. #LdmUser objects are not created by the user, but provided by the #LdmGreeter object. +Object containing information about a user present on this system. #LightDMUser objects are not created by the user, but provided by the #LightDMGreeter object. </para> <para> A user has the following properties: @@ -36,7 +36,7 @@ A user has the following properties: <!-- ##### SECTION Image ##### --> -<!-- ##### FUNCTION ldm_user_get_name ##### --> +<!-- ##### FUNCTION lightdm_user_get_name ##### --> <para> </para> @@ -45,7 +45,7 @@ A user has the following properties: @Returns: -<!-- ##### FUNCTION ldm_user_get_real_name ##### --> +<!-- ##### FUNCTION lightdm_user_get_real_name ##### --> <para> </para> @@ -54,7 +54,7 @@ A user has the following properties: @Returns: -<!-- ##### FUNCTION ldm_user_get_display_name ##### --> +<!-- ##### FUNCTION lightdm_user_get_display_name ##### --> <para> </para> @@ -63,7 +63,7 @@ A user has the following properties: @Returns: -<!-- ##### FUNCTION ldm_user_get_home_directory ##### --> +<!-- ##### FUNCTION lightdm_user_get_home_directory ##### --> <para> </para> @@ -72,7 +72,7 @@ A user has the following properties: @Returns: -<!-- ##### FUNCTION ldm_user_get_image ##### --> +<!-- ##### FUNCTION lightdm_user_get_image ##### --> <para> </para> @@ -81,7 +81,7 @@ A user has the following properties: @Returns: -<!-- ##### FUNCTION ldm_user_get_language ##### --> +<!-- ##### FUNCTION lightdm_user_get_language ##### --> <para> </para> @@ -90,7 +90,7 @@ A user has the following properties: @Returns: -<!-- ##### FUNCTION ldm_user_get_layout ##### --> +<!-- ##### FUNCTION lightdm_user_get_layout ##### --> <para> </para> @@ -99,7 +99,7 @@ A user has the following properties: @Returns: -<!-- ##### FUNCTION ldm_user_get_session ##### --> +<!-- ##### FUNCTION lightdm_user_get_session ##### --> <para> </para> @@ -108,7 +108,7 @@ A user has the following properties: @Returns: -<!-- ##### FUNCTION ldm_user_get_logged_in ##### --> +<!-- ##### FUNCTION lightdm_user_get_logged_in ##### --> <para> </para> diff --git a/greeters/gtk/lightdm-gtk-greeter.c b/greeters/gtk/lightdm-gtk-greeter.c index 711a7416..01d19498 100644 --- a/greeters/gtk/lightdm-gtk-greeter.c +++ b/greeters/gtk/lightdm-gtk-greeter.c @@ -18,7 +18,7 @@ #include "lightdm/greeter.h" -static LdmGreeter *greeter; +static LightDMGreeter *greeter; static GtkWidget *window, *message_label, *user_view; static GdkPixbuf *background_pixbuf = NULL; static GtkWidget *prompt_box, *prompt_label, *prompt_entry, *session_combo; @@ -31,7 +31,7 @@ get_session () gchar *session; if (!gtk_combo_box_get_active_iter (GTK_COMBO_BOX (session_combo), &iter)) - return g_strdup (ldm_greeter_get_default_session_hint (greeter)); + return g_strdup (lightdm_greeter_get_default_session_hint (greeter)); gtk_tree_model_get (gtk_combo_box_get_model (GTK_COMBO_BOX (session_combo)), &iter, 1, &session, -1); @@ -70,22 +70,22 @@ start_authentication (const gchar *username) if (strcmp (username, "*other") == 0) { - ldm_greeter_login_with_user_prompt (greeter); + lightdm_greeter_login_with_user_prompt (greeter); } else if (strcmp (username, "*guest") == 0) { - ldm_greeter_login_as_guest (greeter); + lightdm_greeter_login_as_guest (greeter); } else { - LdmUser *user; - user = ldm_greeter_get_user_by_name (greeter, username); + LightDMUser *user; + user = lightdm_greeter_get_user_by_name (greeter, username); if (user) - set_session (ldm_user_get_session (user)); + set_session (lightdm_user_get_session (user)); else - set_session (ldm_greeter_get_default_session_hint (greeter)); + set_session (lightdm_greeter_get_default_session_hint (greeter)); - ldm_greeter_login (greeter, username); + lightdm_greeter_login (greeter, username); } } @@ -138,10 +138,10 @@ void login_cb (GtkWidget *widget) { gtk_widget_set_sensitive (prompt_entry, FALSE); - if (!ldm_greeter_get_in_authentication (greeter)) + if (!lightdm_greeter_get_in_authentication (greeter)) start_authentication (gtk_entry_get_text (GTK_ENTRY (prompt_entry))); else - ldm_greeter_respond (greeter, gtk_entry_get_text (GTK_ENTRY (prompt_entry))); + lightdm_greeter_respond (greeter, gtk_entry_get_text (GTK_ENTRY (prompt_entry))); gtk_entry_set_text (GTK_ENTRY (prompt_entry), ""); } @@ -150,29 +150,29 @@ G_MODULE_EXPORT void cancel_cb (GtkWidget *widget) { - ldm_greeter_cancel_authentication (greeter); + lightdm_greeter_cancel_authentication (greeter); } static void -show_prompt_cb (LdmGreeter *greeter, const gchar *text, LdmPromptType type) +show_prompt_cb (LightDMGreeter *greeter, const gchar *text, LightDMPromptType type) { gtk_label_set_text (GTK_LABEL (prompt_label), text); gtk_widget_set_sensitive (prompt_entry, TRUE); gtk_entry_set_text (GTK_ENTRY (prompt_entry), ""); - gtk_entry_set_visibility (GTK_ENTRY (prompt_entry), type != LDM_PROMPT_TYPE_SECRET); + gtk_entry_set_visibility (GTK_ENTRY (prompt_entry), type != LIGHTDM_PROMPT_TYPE_SECRET); gtk_widget_show (prompt_box); gtk_widget_grab_focus (prompt_entry); } static void -show_message_cb (LdmGreeter *greeter, const gchar *text, LdmMessageType type) +show_message_cb (LightDMGreeter *greeter, const gchar *text, LightDMMessageType type) { gtk_label_set_text (GTK_LABEL (message_label), text); gtk_widget_show (message_label); } static void -authentication_complete_cb (LdmGreeter *greeter) +authentication_complete_cb (LightDMGreeter *greeter) { gtk_widget_hide (prompt_box); gtk_label_set_text (GTK_LABEL (prompt_label), ""); @@ -180,45 +180,45 @@ authentication_complete_cb (LdmGreeter *greeter) gtk_widget_grab_focus (user_view); - if (ldm_greeter_get_is_authenticated (greeter)) + if (lightdm_greeter_get_is_authenticated (greeter)) { gchar *session = get_session (); - ldm_greeter_start_session (greeter, session); + lightdm_greeter_start_session (greeter, session); g_free (session); } else { gtk_label_set_text (GTK_LABEL (message_label), "Failed to authenticate"); gtk_widget_show (message_label); - if (ldm_greeter_get_hide_users_hint (greeter)) - ldm_greeter_login_with_user_prompt (greeter); + if (lightdm_greeter_get_hide_users_hint (greeter)) + lightdm_greeter_login_with_user_prompt (greeter); } } static void -autologin_timer_expired_cb (LdmGreeter *greeter) +autologin_timer_expired_cb (LightDMGreeter *greeter) { - set_session (ldm_greeter_get_default_session_hint (greeter)); - if (ldm_greeter_get_autologin_guest_hint (greeter)) - ldm_greeter_login_as_guest (greeter); - else if (ldm_greeter_get_autologin_user_hint (greeter)) - ldm_greeter_login (greeter, ldm_greeter_get_autologin_user_hint (greeter)); + set_session (lightdm_greeter_get_default_session_hint (greeter)); + if (lightdm_greeter_get_autologin_guest_hint (greeter)) + lightdm_greeter_login_as_guest (greeter); + else if (lightdm_greeter_get_autologin_user_hint (greeter)) + lightdm_greeter_login (greeter, lightdm_greeter_get_autologin_user_hint (greeter)); } -void suspend_cb (GtkWidget *widget, LdmGreeter *greeter); +void suspend_cb (GtkWidget *widget, LightDMGreeter *greeter); G_MODULE_EXPORT void -suspend_cb (GtkWidget *widget, LdmGreeter *greeter) +suspend_cb (GtkWidget *widget, LightDMGreeter *greeter) { - ldm_greeter_suspend (greeter); + lightdm_greeter_suspend (greeter); } -void hibernate_cb (GtkWidget *widget, LdmGreeter *greeter); +void hibernate_cb (GtkWidget *widget, LightDMGreeter *greeter); G_MODULE_EXPORT void -hibernate_cb (GtkWidget *widget, LdmGreeter *greeter) +hibernate_cb (GtkWidget *widget, LightDMGreeter *greeter) { - ldm_greeter_hibernate (greeter); + lightdm_greeter_hibernate (greeter); } static void @@ -239,10 +239,10 @@ center_window (GtkWindow *window) (screen_height - allocation.height) / 2); } -void restart_cb (GtkWidget *widget, LdmGreeter *greeter); +void restart_cb (GtkWidget *widget, LightDMGreeter *greeter); G_MODULE_EXPORT void -restart_cb (GtkWidget *widget, LdmGreeter *greeter) +restart_cb (GtkWidget *widget, LightDMGreeter *greeter) { GtkWidget *dialog; @@ -257,14 +257,14 @@ restart_cb (GtkWidget *widget, LdmGreeter *greeter) center_window (GTK_WINDOW (dialog)); if (gtk_dialog_run (GTK_DIALOG (dialog))) - ldm_greeter_restart (greeter); + lightdm_greeter_restart (greeter); gtk_widget_destroy (dialog); } -void shutdown_cb (GtkWidget *widget, LdmGreeter *greeter); +void shutdown_cb (GtkWidget *widget, LightDMGreeter *greeter); G_MODULE_EXPORT void -shutdown_cb (GtkWidget *widget, LdmGreeter *greeter) +shutdown_cb (GtkWidget *widget, LightDMGreeter *greeter) { GtkWidget *dialog; @@ -279,7 +279,7 @@ shutdown_cb (GtkWidget *widget, LdmGreeter *greeter) center_window (GTK_WINDOW (dialog)); if (gtk_dialog_run (GTK_DIALOG (dialog))) - ldm_greeter_shutdown (greeter); + lightdm_greeter_shutdown (greeter); gtk_widget_destroy (dialog); } @@ -301,7 +301,7 @@ fade_timer_cb (gpointer data) } static void -user_added_cb (LdmGreeter *greeter, LdmUser *user) +user_added_cb (LightDMGreeter *greeter, LightDMUser *user) { GtkTreeModel *model; GtkTreeIter iter; @@ -310,8 +310,8 @@ user_added_cb (LdmGreeter *greeter, LdmUser *user) gtk_list_store_append (GTK_LIST_STORE (model), &iter); gtk_list_store_set (GTK_LIST_STORE (model), &iter, - 0, ldm_user_get_name (user), - 1, ldm_user_get_display_name (user), + 0, lightdm_user_get_name (user), + 1, lightdm_user_get_display_name (user), /*2, pixbuf,*/ -1); } @@ -341,29 +341,29 @@ get_user_iter (const gchar *username, GtkTreeIter *iter) } static void -user_changed_cb (LdmGreeter *greeter, LdmUser *user) +user_changed_cb (LightDMGreeter *greeter, LightDMUser *user) { GtkTreeModel *model; GtkTreeIter iter; - if (!get_user_iter (ldm_user_get_name (user), &iter)) + if (!get_user_iter (lightdm_user_get_name (user), &iter)) return; model = gtk_tree_view_get_model (GTK_TREE_VIEW (user_view)); gtk_list_store_set (GTK_LIST_STORE (model), &iter, - 0, ldm_user_get_name (user), - 1, ldm_user_get_display_name (user), + 0, lightdm_user_get_name (user), + 1, lightdm_user_get_display_name (user), /*2, pixbuf,*/ -1); } static void -user_removed_cb (LdmGreeter *greeter, LdmUser *user) +user_removed_cb (LightDMGreeter *greeter, LightDMUser *user) { GtkTreeModel *model; GtkTreeIter iter; - if (!get_user_iter (ldm_user_get_name (user), &iter)) + if (!get_user_iter (lightdm_user_get_name (user), &iter)) return; model = gtk_tree_view_get_model (GTK_TREE_VIEW (user_view)); @@ -371,7 +371,7 @@ user_removed_cb (LdmGreeter *greeter, LdmUser *user) } static void -quit_cb (LdmGreeter *greeter, const gchar *username) +quit_cb (LightDMGreeter *greeter, const gchar *username) { /* Fade out the greeter */ g_timeout_add (40, (GSourceFunc) fade_timer_cb, NULL); @@ -436,16 +436,16 @@ load_user_list () g_signal_connect (greeter, "user-added", G_CALLBACK (user_added_cb), NULL); g_signal_connect (greeter, "user-changed", G_CALLBACK (user_changed_cb), NULL); - items = ldm_greeter_get_users (greeter); + items = lightdm_greeter_get_users (greeter); model = gtk_tree_view_get_model (GTK_TREE_VIEW (user_view)); for (item = items; item; item = item->next) { - LdmUser *user = item->data; + LightDMUser *user = item->data; const gchar *image; GdkPixbuf *pixbuf = NULL; - image = ldm_user_get_image (user); + image = lightdm_user_get_image (user); if (image) { gchar *path; @@ -469,12 +469,12 @@ load_user_list () gtk_list_store_append (GTK_LIST_STORE (model), &iter); gtk_list_store_set (GTK_LIST_STORE (model), &iter, - 0, ldm_user_get_name (user), - 1, ldm_user_get_display_name (user), + 0, lightdm_user_get_name (user), + 1, lightdm_user_get_display_name (user), 2, pixbuf, -1); } - if (ldm_greeter_get_has_guest_account_hint (greeter)) + if (lightdm_greeter_get_has_guest_account_hint (greeter)) { gtk_list_store_append (GTK_LIST_STORE (model), &iter); gtk_list_store_set (GTK_LIST_STORE (model), &iter, @@ -493,7 +493,7 @@ load_user_list () } static void -connected_cb (LdmGreeter *greeter) +connected_cb (LightDMGreeter *greeter) { GdkWindow *root; GdkDisplay *display; @@ -536,7 +536,7 @@ connected_cb (LdmGreeter *greeter) message_label = GTK_WIDGET (gtk_builder_get_object (builder, "message_label")); session_combo = GTK_WIDGET (gtk_builder_get_object (builder, "session_combobox")); - gtk_label_set_text (GTK_LABEL (gtk_builder_get_object (builder, "hostname_label")), ldm_greeter_get_hostname (greeter)); + gtk_label_set_text (GTK_LABEL (gtk_builder_get_object (builder, "hostname_label")), lightdm_greeter_get_hostname (greeter)); background_image = NULL; // FIXME if (background_image) @@ -571,45 +571,45 @@ connected_cb (LdmGreeter *greeter) gdk_window_set_back_pixmap (root, pixmap, FALSE); } - if (!ldm_greeter_get_can_suspend (greeter)) + if (!lightdm_greeter_get_can_suspend (greeter)) gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (builder, "suspend_menuitem"))); - if (!ldm_greeter_get_can_hibernate (greeter)) + if (!lightdm_greeter_get_can_hibernate (greeter)) gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (builder, "hibernate_menuitem"))); - if (!ldm_greeter_get_can_restart (greeter)) + if (!lightdm_greeter_get_can_restart (greeter)) gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (builder, "restart_menuitem"))); - if (!ldm_greeter_get_can_shutdown (greeter)) + if (!lightdm_greeter_get_can_shutdown (greeter)) gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (builder, "shutdown_menuitem"))); user_view = GTK_WIDGET (gtk_builder_get_object (builder, "user_treeview")); gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (user_view), 0, "Face", gtk_cell_renderer_pixbuf_new(), "pixbuf", 2, NULL); gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (user_view), 1, "Name", gtk_cell_renderer_text_new(), "text", 1, NULL); - if (ldm_greeter_get_hide_users_hint (greeter)) - ldm_greeter_login_with_user_prompt (greeter); + if (lightdm_greeter_get_hide_users_hint (greeter)) + lightdm_greeter_login_with_user_prompt (greeter); else { load_user_list (); gtk_widget_show (user_view); } - // FIXME: Select the requested user if ldm_greeter_get_timed_login_user () && ldm_greeter_get_timed_login_delay () == 0 + // FIXME: Select the requested user if lightdm_greeter_get_timed_login_user () && lightdm_greeter_get_timed_login_delay () == 0 renderer = gtk_cell_renderer_text_new(); gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (session_combo), renderer, TRUE); gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (session_combo), renderer, "text", 0); model = gtk_combo_box_get_model (GTK_COMBO_BOX (session_combo)); - items = ldm_greeter_get_sessions (greeter); + items = lightdm_greeter_get_sessions (greeter); for (item = items; item; item = item->next) { - LdmSession *session = item->data; + LightDMSession *session = item->data; gtk_list_store_append (GTK_LIST_STORE (model), &iter); gtk_list_store_set (GTK_LIST_STORE (model), &iter, - 0, ldm_session_get_name (session), - 1, ldm_session_get_key (session), + 0, lightdm_session_get_name (session), + 1, lightdm_session_get_key (session), -1); } - set_session (ldm_greeter_get_default_session_hint (greeter)); + set_session (lightdm_greeter_get_default_session_hint (greeter)); gtk_window_set_default_size (GTK_WINDOW (window), screen_width, screen_height); gtk_builder_connect_signals(builder, greeter); @@ -628,15 +628,15 @@ main(int argc, char **argv) g_type_init (); - greeter = ldm_greeter_new (); - g_signal_connect (G_OBJECT (greeter), "connected", G_CALLBACK (connected_cb), NULL); - g_signal_connect (G_OBJECT (greeter), "show-prompt", G_CALLBACK (show_prompt_cb), NULL); - g_signal_connect (G_OBJECT (greeter), "show-message", G_CALLBACK (show_message_cb), NULL); - g_signal_connect (G_OBJECT (greeter), "authentication-complete", G_CALLBACK (authentication_complete_cb), NULL); - g_signal_connect (G_OBJECT (greeter), "autologin-timer-expired", G_CALLBACK (autologin_timer_expired_cb), NULL); - g_signal_connect (G_OBJECT (greeter), "user-removed", G_CALLBACK (user_removed_cb), NULL); - g_signal_connect (G_OBJECT (greeter), "quit", G_CALLBACK (quit_cb), NULL); - ldm_greeter_connect_to_server (greeter); + greeter = lightdm_greeter_new (); + g_signal_connect (greeter, "connected", G_CALLBACK (connected_cb), NULL); + g_signal_connect (greeter, "show-prompt", G_CALLBACK (show_prompt_cb), NULL); + g_signal_connect (greeter, "show-message", G_CALLBACK (show_message_cb), NULL); + g_signal_connect (greeter, "authentication-complete", G_CALLBACK (authentication_complete_cb), NULL); + g_signal_connect (greeter, "autologin-timer-expired", G_CALLBACK (autologin_timer_expired_cb), NULL); + g_signal_connect (greeter, "user-removed", G_CALLBACK (user_removed_cb), NULL); + g_signal_connect (greeter, "quit", G_CALLBACK (quit_cb), NULL); + lightdm_greeter_connect_to_server (greeter); gtk_init (&argc, &argv); diff --git a/liblightdm-gobject/Makefile.am b/liblightdm-gobject/Makefile.am index ebf68049..47379454 100644 --- a/liblightdm-gobject/Makefile.am +++ b/liblightdm-gobject/Makefile.am @@ -32,7 +32,7 @@ INTROSPECTION_GIRS = LightDM-0.gir LightDM-0.gir: liblightdm-gobject-0.la LightDM_0_gir_INCLUDES = GObject-2.0 -LightDM_0_gir_CFLAGS = $(INCLUDES) --identifier-prefix=Ldm +LightDM_0_gir_CFLAGS = $(INCLUDES) --identifier-prefix=LightDM LightDM_0_gir_LIBS = liblightdm-gobject-0.la LightDM_0_gir_FILES = $(liblightdm_gobject_0_la_SOURCES) diff --git a/liblightdm-gobject/greeter.c b/liblightdm-gobject/greeter.c index 636bba1c..c1ed7457 100644 --- a/liblightdm-gobject/greeter.c +++ b/liblightdm-gobject/greeter.c @@ -109,11 +109,11 @@ typedef struct GHashTable *hints; guint login_timeout; -} LdmGreeterPrivate; +} LightDMGreeterPrivate; -G_DEFINE_TYPE (LdmGreeter, ldm_greeter, G_TYPE_OBJECT); +G_DEFINE_TYPE (LightDMGreeter, lightdm_greeter, G_TYPE_OBJECT); -#define GET_PRIVATE(obj) G_TYPE_INSTANCE_GET_PRIVATE ((obj), LDM_TYPE_GREETER, LdmGreeterPrivate) +#define GET_PRIVATE(obj) G_TYPE_INSTANCE_GET_PRIVATE ((obj), LIGHTDM_TYPE_GREETER, LightDMGreeterPrivate) #define HEADER_SIZE 8 #define MAX_MESSAGE_LENGTH 1024 @@ -143,23 +143,23 @@ typedef enum } ServerMessage; /** - * ldm_greeter_new: + * lightdm_greeter_new: * * Create a new greeter. * - * Return value: the new #LdmGreeter + * Return value: the new #LightDMGreeter **/ -LdmGreeter * -ldm_greeter_new () +LightDMGreeter * +lightdm_greeter_new () { - return g_object_new (LDM_TYPE_GREETER, NULL); + return g_object_new (LIGHTDM_TYPE_GREETER, NULL); } static gboolean timed_login_cb (gpointer data) { - LdmGreeter *greeter = data; - LdmGreeterPrivate *priv = GET_PRIVATE (greeter); + LightDMGreeter *greeter = data; + LightDMGreeterPrivate *priv = GET_PRIVATE (greeter); priv->login_timeout = 0; g_signal_emit (G_OBJECT (greeter), signals[AUTOLOGIN_TIMER_EXPIRED], 0); @@ -174,9 +174,9 @@ int_length () } static void -write_message (LdmGreeter *greeter, guint8 *message, gsize message_length) +write_message (LightDMGreeter *greeter, guint8 *message, gsize message_length) { - LdmGreeterPrivate *priv = GET_PRIVATE (greeter); + LightDMGreeterPrivate *priv = GET_PRIVATE (greeter); GError *error = NULL; if (g_io_channel_write_chars (priv->to_server_channel, (gchar *) message, message_length, NULL, NULL) != G_IO_STATUS_NORMAL) @@ -211,9 +211,9 @@ write_string (guint8 *buffer, gint buffer_length, const gchar *value, gsize *off } static guint32 -read_int (LdmGreeter *greeter, gsize *offset) +read_int (LightDMGreeter *greeter, gsize *offset) { - LdmGreeterPrivate *priv = GET_PRIVATE (greeter); + LightDMGreeterPrivate *priv = GET_PRIVATE (greeter); guint32 value; guint8 *buffer; @@ -231,9 +231,9 @@ read_int (LdmGreeter *greeter, gsize *offset) } static gchar * -read_string (LdmGreeter *greeter, gsize *offset) +read_string (LightDMGreeter *greeter, gsize *offset) { - LdmGreeterPrivate *priv = GET_PRIVATE (greeter); + LightDMGreeterPrivate *priv = GET_PRIVATE (greeter); guint32 length; gchar *value; @@ -265,16 +265,16 @@ write_header (guint8 *buffer, gint buffer_length, guint32 id, guint32 length, gs write_int (buffer, buffer_length, length, offset); } -static guint32 get_packet_length (LdmGreeter *greeter) +static guint32 get_packet_length (LightDMGreeter *greeter) { gsize offset = 4; return read_int (greeter, &offset); } static void -handle_connected (LdmGreeter *greeter, guint32 length, gsize *offset) +handle_connected (LightDMGreeter *greeter, guint32 length, gsize *offset) { - LdmGreeterPrivate *priv = GET_PRIVATE (greeter); + LightDMGreeterPrivate *priv = GET_PRIVATE (greeter); gchar *version; GString *hint_string; int timeout; @@ -296,7 +296,7 @@ handle_connected (LdmGreeter *greeter, guint32 length, gsize *offset) g_string_free (hint_string, TRUE); /* Set timeout for default login */ - timeout = ldm_greeter_get_autologin_timeout_hint (greeter); + timeout = lightdm_greeter_get_autologin_timeout_hint (greeter); if (timeout) { g_debug ("Setting autologin timer for %d seconds", timeout); @@ -306,9 +306,9 @@ handle_connected (LdmGreeter *greeter, guint32 length, gsize *offset) } static void -handle_prompt_authentication (LdmGreeter *greeter, gsize *offset) +handle_prompt_authentication (LightDMGreeter *greeter, gsize *offset) { - LdmGreeterPrivate *priv = GET_PRIVATE (greeter); + LightDMGreeterPrivate *priv = GET_PRIVATE (greeter); guint32 sequence_number, n_messages, i; sequence_number = read_int (greeter, offset); @@ -339,16 +339,16 @@ handle_prompt_authentication (LdmGreeter *greeter, gsize *offset) switch (msg_style) { case PAM_PROMPT_ECHO_OFF: - g_signal_emit (G_OBJECT (greeter), signals[SHOW_PROMPT], 0, msg, LDM_PROMPT_TYPE_SECRET); + g_signal_emit (G_OBJECT (greeter), signals[SHOW_PROMPT], 0, msg, LIGHTDM_PROMPT_TYPE_SECRET); break; case PAM_PROMPT_ECHO_ON: - g_signal_emit (G_OBJECT (greeter), signals[SHOW_PROMPT], 0, msg, LDM_PROMPT_TYPE_QUESTION); + g_signal_emit (G_OBJECT (greeter), signals[SHOW_PROMPT], 0, msg, LIGHTDM_PROMPT_TYPE_QUESTION); break; case PAM_ERROR_MSG: - g_signal_emit (G_OBJECT (greeter), signals[SHOW_MESSAGE], 0, msg, LDM_MESSAGE_TYPE_ERROR); + g_signal_emit (G_OBJECT (greeter), signals[SHOW_MESSAGE], 0, msg, LIGHTDM_MESSAGE_TYPE_ERROR); break; case PAM_TEXT_INFO: - g_signal_emit (G_OBJECT (greeter), signals[SHOW_MESSAGE], 0, msg, LDM_MESSAGE_TYPE_INFO); + g_signal_emit (G_OBJECT (greeter), signals[SHOW_MESSAGE], 0, msg, LIGHTDM_MESSAGE_TYPE_INFO); break; } @@ -357,9 +357,9 @@ handle_prompt_authentication (LdmGreeter *greeter, gsize *offset) } static void -handle_end_authentication (LdmGreeter *greeter, gsize *offset) +handle_end_authentication (LightDMGreeter *greeter, gsize *offset) { - LdmGreeterPrivate *priv = GET_PRIVATE (greeter); + LightDMGreeterPrivate *priv = GET_PRIVATE (greeter); guint32 sequence_number, return_code; sequence_number = read_int (greeter, offset); @@ -384,23 +384,23 @@ handle_end_authentication (LdmGreeter *greeter, gsize *offset) } static void -handle_session_failed (LdmGreeter *greeter, gsize *offset) +handle_session_failed (LightDMGreeter *greeter, gsize *offset) { g_debug ("Session failed to start"); g_signal_emit (G_OBJECT (greeter), signals[SESSION_FAILED], 0); } static void -handle_quit (LdmGreeter *greeter, gsize *offset) +handle_quit (LightDMGreeter *greeter, gsize *offset) { g_debug ("Got quit request from server"); g_signal_emit (G_OBJECT (greeter), signals[QUIT], 0); } static gboolean -read_packet (LdmGreeter *greeter, gboolean block) +read_packet (LightDMGreeter *greeter, gboolean block) { - LdmGreeterPrivate *priv = GET_PRIVATE (greeter); + LightDMGreeterPrivate *priv = GET_PRIVATE (greeter); gsize n_to_read, n_read; GError *error = NULL; @@ -449,8 +449,8 @@ read_packet (LdmGreeter *greeter, gboolean block) static gboolean from_server_cb (GIOChannel *source, GIOCondition condition, gpointer data) { - LdmGreeter *greeter = data; - LdmGreeterPrivate *priv = GET_PRIVATE (greeter); + LightDMGreeter *greeter = data; + LightDMGreeterPrivate *priv = GET_PRIVATE (greeter); gsize offset; guint32 id, length; @@ -488,7 +488,7 @@ from_server_cb (GIOChannel *source, GIOCondition condition, gpointer data) } /** - * ldm_greeter_connect_to_server: + * lightdm_greeter_connect_to_server: * @greeter: The greeter to connect * * Connects the greeter to the display manager. @@ -496,16 +496,16 @@ from_server_cb (GIOChannel *source, GIOCondition condition, gpointer data) * Return value: #TRUE if successfully connected **/ gboolean -ldm_greeter_connect_to_server (LdmGreeter *greeter) +lightdm_greeter_connect_to_server (LightDMGreeter *greeter) { - LdmGreeterPrivate *priv; + LightDMGreeterPrivate *priv; GError *error = NULL; const gchar *bus_address, *fd; guint8 message[MAX_MESSAGE_LENGTH]; gsize offset = 0; GBusType bus_type = G_BUS_TYPE_SYSTEM; - g_return_val_if_fail (LDM_IS_GREETER (greeter), FALSE); + g_return_val_if_fail (LIGHTDM_IS_GREETER (greeter), FALSE); priv = GET_PRIVATE (greeter); @@ -514,7 +514,7 @@ ldm_greeter_connect_to_server (LdmGreeter *greeter) g_warning ("Failed to connect to system bus: %s", error->message); g_clear_error (&error); - bus_address = getenv ("LDM_BUS"); + bus_address = getenv ("LIGHTDM_BUS"); if (bus_address && strcmp (bus_address, "SESSION") == 0) bus_type = G_BUS_TYPE_SESSION; @@ -553,17 +553,17 @@ ldm_greeter_connect_to_server (LdmGreeter *greeter) } /** - * ldm_greeter_get_hostname: - * @greeter: a #LdmGreeter + * lightdm_greeter_get_hostname: + * @greeter: a #LightDMGreeter * * Return value: The host this greeter is displaying **/ const gchar * -ldm_greeter_get_hostname (LdmGreeter *greeter) +lightdm_greeter_get_hostname (LightDMGreeter *greeter) { - LdmGreeterPrivate *priv; + LightDMGreeterPrivate *priv; - g_return_val_if_fail (LDM_IS_GREETER (greeter), NULL); + g_return_val_if_fail (LIGHTDM_IS_GREETER (greeter), NULL); priv = GET_PRIVATE (greeter); @@ -577,16 +577,16 @@ ldm_greeter_get_hostname (LdmGreeter *greeter) return priv->hostname; } -static LdmUser * -get_user_by_name (LdmGreeter *greeter, const gchar *username) +static LightDMUser * +get_user_by_name (LightDMGreeter *greeter, const gchar *username) { - LdmGreeterPrivate *priv = GET_PRIVATE (greeter); + LightDMGreeterPrivate *priv = GET_PRIVATE (greeter); GList *link; for (link = priv->users; link; link = link->next) { - LdmUser *user = link->data; - if (strcmp (ldm_user_get_name (user), username) == 0) + LightDMUser *user = link->data; + if (strcmp (lightdm_user_get_name (user), username) == 0) return user; } @@ -596,14 +596,14 @@ get_user_by_name (LdmGreeter *greeter, const gchar *username) static gint compare_user (gconstpointer a, gconstpointer b) { - LdmUser *user_a = (LdmUser *) a, *user_b = (LdmUser *) b; - return strcmp (ldm_user_get_display_name (user_a), ldm_user_get_display_name (user_b)); + LightDMUser *user_a = (LightDMUser *) a, *user_b = (LightDMUser *) b; + return strcmp (lightdm_user_get_display_name (user_a), lightdm_user_get_display_name (user_b)); } static void -load_users (LdmGreeter *greeter) +load_users (LightDMGreeter *greeter) { - LdmGreeterPrivate *priv = GET_PRIVATE (greeter); + LightDMGreeterPrivate *priv = GET_PRIVATE (greeter); GKeyFile *config; gchar *value; gint minimum_uid; @@ -643,7 +643,7 @@ load_users (LdmGreeter *greeter) while (TRUE) { struct passwd *entry; - LdmUser *user; + LightDMUser *user; char **tokens; gchar *real_name, *image_path, *image; int i; @@ -694,17 +694,17 @@ load_users (LdmGreeter *greeter) image = NULL; g_free (image_path); - user = ldm_user_new (greeter, entry->pw_name, real_name, entry->pw_dir, image, FALSE); + user = lightdm_user_new (greeter, entry->pw_name, real_name, entry->pw_dir, image, FALSE); g_free (real_name); g_free (image); /* Update existing users if have them */ for (link = priv->users; link; link = link->next) { - LdmUser *info = link->data; - if (strcmp (ldm_user_get_name (info), ldm_user_get_name (user)) == 0) + LightDMUser *info = link->data; + if (strcmp (lightdm_user_get_name (info), lightdm_user_get_name (user)) == 0) { - if (ldm_user_update (info, ldm_user_get_real_name (user), ldm_user_get_home_directory (user), ldm_user_get_image (user), ldm_user_get_logged_in (user))) + if (lightdm_user_update (info, lightdm_user_get_real_name (user), lightdm_user_get_home_directory (user), lightdm_user_get_image (user), lightdm_user_get_logged_in (user))) changed_users = g_list_insert_sorted (changed_users, info, compare_user); g_object_unref (user); user = info; @@ -734,15 +734,15 @@ load_users (LdmGreeter *greeter) /* Notify of changes */ for (link = new_users; link; link = link->next) { - LdmUser *info = link->data; - g_debug ("User %s added", ldm_user_get_name (info)); + LightDMUser *info = link->data; + g_debug ("User %s added", lightdm_user_get_name (info)); g_signal_emit (greeter, signals[USER_ADDED], 0, info); } g_list_free (new_users); for (link = changed_users; link; link = link->next) { - LdmUser *info = link->data; - g_debug ("User %s changed", ldm_user_get_name (info)); + LightDMUser *info = link->data; + g_debug ("User %s changed", lightdm_user_get_name (info)); g_signal_emit (greeter, signals[USER_CHANGED], 0, info); } g_list_free (changed_users); @@ -759,8 +759,8 @@ load_users (LdmGreeter *greeter) if (!new_link) { - LdmUser *info = link->data; - g_debug ("User %s removed", ldm_user_get_name (info)); + LightDMUser *info = link->data; + g_debug ("User %s removed", lightdm_user_get_name (info)); g_signal_emit (greeter, signals[USER_REMOVED], 0, info); g_object_unref (info); } @@ -769,7 +769,7 @@ load_users (LdmGreeter *greeter) } static void -passwd_changed_cb (GFileMonitor *monitor, GFile *file, GFile *other_file, GFileMonitorEvent event_type, LdmGreeter *greeter) +passwd_changed_cb (GFileMonitor *monitor, GFile *file, GFile *other_file, GFileMonitorEvent event_type, LightDMGreeter *greeter) { if (event_type == G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT) { @@ -779,9 +779,9 @@ passwd_changed_cb (GFileMonitor *monitor, GFile *file, GFile *other_file, GFileM } static void -update_users (LdmGreeter *greeter) +update_users (LightDMGreeter *greeter) { - LdmGreeterPrivate *priv = GET_PRIVATE (greeter); + LightDMGreeterPrivate *priv = GET_PRIVATE (greeter); GFile *passwd_file; GError *error = NULL; @@ -804,49 +804,49 @@ update_users (LdmGreeter *greeter) } /** - * ldm_greeter_get_num_users: - * @greeter: a #LdmGreeter + * lightdm_greeter_get_num_users: + * @greeter: a #LightDMGreeter * * Return value: The number of users able to log in **/ gint -ldm_greeter_get_num_users (LdmGreeter *greeter) +lightdm_greeter_get_num_users (LightDMGreeter *greeter) { - g_return_val_if_fail (LDM_IS_GREETER (greeter), 0); + g_return_val_if_fail (LIGHTDM_IS_GREETER (greeter), 0); update_users (greeter); return g_list_length (GET_PRIVATE (greeter)->users); } /** - * ldm_greeter_get_users: - * @greeter: A #LdmGreeter + * lightdm_greeter_get_users: + * @greeter: A #LightDMGreeter * * Get a list of users to present to the user. This list may be a subset of the * available users and may be empty depending on the server configuration. * - * Return value: (element-type LdmUser) (transfer none): A list of #LdmUser that should be presented to the user. + * Return value: (element-type LightDMUser) (transfer none): A list of #LightDMUser that should be presented to the user. **/ GList * -ldm_greeter_get_users (LdmGreeter *greeter) +lightdm_greeter_get_users (LightDMGreeter *greeter) { - g_return_val_if_fail (LDM_IS_GREETER (greeter), NULL); + g_return_val_if_fail (LIGHTDM_IS_GREETER (greeter), NULL); update_users (greeter); return GET_PRIVATE (greeter)->users; } /** - * ldm_greeter_get_user_by_name: - * @greeter: A #LdmGreeter + * lightdm_greeter_get_user_by_name: + * @greeter: A #LightDMGreeter * @username: Name of user to get. * * Get infomation about a given user or #NULL if this user doesn't exist. * - * Return value: (transfer none): A #LdmUser entry for the given user. + * Return value: (transfer none): A #LightDMUser entry for the given user. **/ -LdmUser * -ldm_greeter_get_user_by_name (LdmGreeter *greeter, const gchar *username) +LightDMUser * +lightdm_greeter_get_user_by_name (LightDMGreeter *greeter, const gchar *username) { - g_return_val_if_fail (LDM_IS_GREETER (greeter), NULL); + g_return_val_if_fail (LIGHTDM_IS_GREETER (greeter), NULL); g_return_val_if_fail (username != NULL, NULL); update_users (greeter); @@ -855,9 +855,9 @@ ldm_greeter_get_user_by_name (LdmGreeter *greeter, const gchar *username) } static void -update_languages (LdmGreeter *greeter) +update_languages (LightDMGreeter *greeter) { - LdmGreeterPrivate *priv = GET_PRIVATE (greeter); + LightDMGreeterPrivate *priv = GET_PRIVATE (greeter); gchar *stdout_text = NULL, *stderr_text = NULL; gint exit_status; gboolean result; @@ -877,7 +877,7 @@ update_languages (LdmGreeter *greeter) tokens = g_strsplit_set (stdout_text, "\n\r", -1); for (i = 0; tokens[i]; i++) { - LdmLanguage *language; + LightDMLanguage *language; gchar *code; code = g_strchug (tokens[i]); @@ -888,7 +888,7 @@ update_languages (LdmGreeter *greeter) if (strcmp (code, "C") == 0 || strcmp (code, "POSIX") == 0) continue; - language = ldm_language_new (code); + language = lightdm_language_new (code); priv->languages = g_list_append (priv->languages, language); } @@ -903,18 +903,18 @@ update_languages (LdmGreeter *greeter) } /** - * ldm_greeter_get_default_language: - * @greeter: A #LdmGreeter + * lightdm_greeter_get_default_language: + * @greeter: A #LightDMGreeter * * Get the default language. * * Return value: The default language. **/ const gchar * -ldm_greeter_get_default_language (LdmGreeter *greeter) +lightdm_greeter_get_default_language (LightDMGreeter *greeter) { gchar *lang; - g_return_val_if_fail (LDM_IS_GREETER (greeter), NULL); + g_return_val_if_fail (LIGHTDM_IS_GREETER (greeter), NULL); lang = getenv ("LANG"); if (lang) return lang; @@ -923,17 +923,17 @@ ldm_greeter_get_default_language (LdmGreeter *greeter) } /** - * ldm_greeter_get_languages: - * @greeter: A #LdmGreeter + * lightdm_greeter_get_languages: + * @greeter: A #LightDMGreeter * * Get a list of languages to present to the user. * - * Return value: (element-type LdmLanguage) (transfer none): A list of #LdmLanguage that should be presented to the user. + * Return value: (element-type LightDMLanguage) (transfer none): A list of #LightDMLanguage that should be presented to the user. **/ GList * -ldm_greeter_get_languages (LdmGreeter *greeter) +lightdm_greeter_get_languages (LightDMGreeter *greeter) { - g_return_val_if_fail (LDM_IS_GREETER (greeter), NULL); + g_return_val_if_fail (LIGHTDM_IS_GREETER (greeter), NULL); update_languages (greeter); return GET_PRIVATE (greeter)->languages; } @@ -943,26 +943,26 @@ layout_cb (XklConfigRegistry *config, const XklConfigItem *item, gpointer data) { - LdmGreeter *greeter = data; - LdmGreeterPrivate *priv = GET_PRIVATE (greeter); - LdmLayout *layout; + LightDMGreeter *greeter = data; + LightDMGreeterPrivate *priv = GET_PRIVATE (greeter); + LightDMLayout *layout; - layout = ldm_layout_new (item->name, item->short_description, item->description); + layout = lightdm_layout_new (item->name, item->short_description, item->description); priv->layouts = g_list_append (priv->layouts, layout); } static void -setup_display (LdmGreeter *greeter) +setup_display (LightDMGreeter *greeter) { - LdmGreeterPrivate *priv = GET_PRIVATE (greeter); + LightDMGreeterPrivate *priv = GET_PRIVATE (greeter); if (!priv->display) priv->display = XOpenDisplay (NULL); } static void -setup_xkl (LdmGreeter *greeter) +setup_xkl (LightDMGreeter *greeter) { - LdmGreeterPrivate *priv = GET_PRIVATE (greeter); + LightDMGreeterPrivate *priv = GET_PRIVATE (greeter); setup_display (greeter); @@ -974,20 +974,20 @@ setup_xkl (LdmGreeter *greeter) } /** - * ldm_greeter_get_layouts: - * @greeter: A #LdmGreeter + * lightdm_greeter_get_layouts: + * @greeter: A #LightDMGreeter * * Get a list of keyboard layouts to present to the user. * - * Return value: (element-type LdmLayout) (transfer none): A list of #LdmLayout that should be presented to the user. + * Return value: (element-type LightDMLayout) (transfer none): A list of #LightDMLayout that should be presented to the user. **/ GList * -ldm_greeter_get_layouts (LdmGreeter *greeter) +lightdm_greeter_get_layouts (LightDMGreeter *greeter) { - LdmGreeterPrivate *priv; + LightDMGreeterPrivate *priv; XklConfigRegistry *registry; - g_return_val_if_fail (LDM_IS_GREETER (greeter), NULL); + g_return_val_if_fail (LIGHTDM_IS_GREETER (greeter), NULL); priv = GET_PRIVATE (greeter); @@ -1006,19 +1006,19 @@ ldm_greeter_get_layouts (LdmGreeter *greeter) } /** - * ldm_greeter_set_layout: - * @greeter: A #LdmGreeter + * lightdm_greeter_set_layout: + * @greeter: A #LightDMGreeter * @layout: The layout to use * * Set the layout for this session. **/ void -ldm_greeter_set_layout (LdmGreeter *greeter, const gchar *layout) +lightdm_greeter_set_layout (LightDMGreeter *greeter, const gchar *layout) { - LdmGreeterPrivate *priv; + LightDMGreeterPrivate *priv; XklConfigRec *config; - g_return_if_fail (LDM_IS_GREETER (greeter)); + g_return_if_fail (LIGHTDM_IS_GREETER (greeter)); g_return_if_fail (layout != NULL); priv = GET_PRIVATE (greeter); @@ -1040,25 +1040,25 @@ ldm_greeter_set_layout (LdmGreeter *greeter, const gchar *layout) } /** - * ldm_greeter_get_layout: - * @greeter: A #LdmGreeter + * lightdm_greeter_get_layout: + * @greeter: A #LightDMGreeter * * Get the current keyboard layout. * * Return value: The currently active layout for this user. **/ const gchar * -ldm_greeter_get_layout (LdmGreeter *greeter) +lightdm_greeter_get_layout (LightDMGreeter *greeter) { - g_return_val_if_fail (LDM_IS_GREETER (greeter), NULL); + g_return_val_if_fail (LIGHTDM_IS_GREETER (greeter), NULL); setup_xkl (greeter); return GET_PRIVATE (greeter)->layout; } static void -update_sessions (LdmGreeter *greeter) +update_sessions (LightDMGreeter *greeter) { - LdmGreeterPrivate *priv = GET_PRIVATE (greeter); + LightDMGreeterPrivate *priv = GET_PRIVATE (greeter); GDir *directory; GError *error = NULL; @@ -1112,7 +1112,7 @@ update_sessions (LdmGreeter *greeter) if (name) { g_debug ("Loaded session %s (%s, %s)", key, name, comment); - priv->sessions = g_list_append (priv->sessions, ldm_session_new (key, name, comment)); + priv->sessions = g_list_append (priv->sessions, lightdm_session_new (key, name, comment)); } else g_warning ("Invalid session %s: %s", path, error->message); @@ -1132,24 +1132,24 @@ update_sessions (LdmGreeter *greeter) } /** - * ldm_greeter_get_sessions: - * @greeter: A #LdmGreeter + * lightdm_greeter_get_sessions: + * @greeter: A #LightDMGreeter * * Get the available sessions. * - * Return value: (element-type LdmSession) (transfer none): A list of #LdmSession + * Return value: (element-type LightDMSession) (transfer none): A list of #LightDMSession **/ GList * -ldm_greeter_get_sessions (LdmGreeter *greeter) +lightdm_greeter_get_sessions (LightDMGreeter *greeter) { - g_return_val_if_fail (LDM_IS_GREETER (greeter), NULL); + g_return_val_if_fail (LIGHTDM_IS_GREETER (greeter), NULL); update_sessions (greeter); return GET_PRIVATE (greeter)->sessions; } /** - * ldm_greeter_get_hint: - * @greeter: A #LdmGreeter + * lightdm_greeter_get_hint: + * @greeter: A #LightDMGreeter * @name: The hint name to query. * * Get a hint. @@ -1157,149 +1157,149 @@ ldm_greeter_get_sessions (LdmGreeter *greeter) * Return value: The value for this hint or #NULL if not set. **/ const gchar * -ldm_greeter_get_hint (LdmGreeter *greeter, const gchar *name) +lightdm_greeter_get_hint (LightDMGreeter *greeter, const gchar *name) { - g_return_val_if_fail (LDM_IS_GREETER (greeter), NULL); + g_return_val_if_fail (LIGHTDM_IS_GREETER (greeter), NULL); return g_hash_table_lookup (GET_PRIVATE (greeter)->hints, name); } /** - * ldm_greeter_get_default_session_hint: - * @greeter: A #LdmGreeter + * lightdm_greeter_get_default_session_hint: + * @greeter: A #LightDMGreeter * * Get the default session to use. * * Return value: The session name **/ const gchar * -ldm_greeter_get_default_session_hint (LdmGreeter *greeter) +lightdm_greeter_get_default_session_hint (LightDMGreeter *greeter) { - g_return_val_if_fail (LDM_IS_GREETER (greeter), NULL); - return ldm_greeter_get_hint (greeter, "default-session"); + g_return_val_if_fail (LIGHTDM_IS_GREETER (greeter), NULL); + return lightdm_greeter_get_hint (greeter, "default-session"); } /** - * ldm_greeter_get_hide_users_hint: - * @greeter: A #LdmGreeter + * lightdm_greeter_get_hide_users_hint: + * @greeter: A #LightDMGreeter * * Check if user accounts should be shown. * * Return value: #TRUE if the available users should not be shown. */ gboolean -ldm_greeter_get_hide_users_hint (LdmGreeter *greeter) +lightdm_greeter_get_hide_users_hint (LightDMGreeter *greeter) { const gchar *value; - g_return_val_if_fail (LDM_IS_GREETER (greeter), FALSE); - value = ldm_greeter_get_hint (greeter, "hide-users"); + g_return_val_if_fail (LIGHTDM_IS_GREETER (greeter), FALSE); + value = lightdm_greeter_get_hint (greeter, "hide-users"); return g_strcmp0 (value, "true") == 0; } /** - * ldm_greeter_get_has_guest_account_hint: - * @greeter: A #LdmGreeter + * lightdm_greeter_get_has_guest_account_hint: + * @greeter: A #LightDMGreeter * * Check if guest sessions are supported. * * Return value: #TRUE if guest sessions are supported. */ gboolean -ldm_greeter_get_has_guest_account_hint (LdmGreeter *greeter) +lightdm_greeter_get_has_guest_account_hint (LightDMGreeter *greeter) { const gchar *value; - g_return_val_if_fail (LDM_IS_GREETER (greeter), FALSE); - value = ldm_greeter_get_hint (greeter, "has-guest-account"); + g_return_val_if_fail (LIGHTDM_IS_GREETER (greeter), FALSE); + value = lightdm_greeter_get_hint (greeter, "has-guest-account"); return g_strcmp0 (value, "true") == 0; } /** - * ldm_greeter_get_select_user_hint: - * @greeter: A #LdmGreeter + * lightdm_greeter_get_select_user_hint: + * @greeter: A #LightDMGreeter * * Get the user to select by default. * * Return value: A username */ const gchar * -ldm_greeter_get_select_user_hint (LdmGreeter *greeter) +lightdm_greeter_get_select_user_hint (LightDMGreeter *greeter) { - g_return_val_if_fail (LDM_IS_GREETER (greeter), NULL); - return ldm_greeter_get_hint (greeter, "select-user"); + g_return_val_if_fail (LIGHTDM_IS_GREETER (greeter), NULL); + return lightdm_greeter_get_hint (greeter, "select-user"); } /** - * ldm_greeter_get_select_guest_hint: - * @greeter: A #LdmGreeter + * lightdm_greeter_get_select_guest_hint: + * @greeter: A #LightDMGreeter * * Check if the guest account should be selected by default. * * Return value: #TRUE if the guest account should be selected by default. */ gboolean -ldm_greeter_get_select_guest_hint (LdmGreeter *greeter) +lightdm_greeter_get_select_guest_hint (LightDMGreeter *greeter) { const gchar *value; - g_return_val_if_fail (LDM_IS_GREETER (greeter), FALSE); - value = ldm_greeter_get_hint (greeter, "select-guest"); + g_return_val_if_fail (LIGHTDM_IS_GREETER (greeter), FALSE); + value = lightdm_greeter_get_hint (greeter, "select-guest"); return g_strcmp0 (value, "true") == 0; } /** - * ldm_greeter_get_autologin_user_hint: - * @greeter: A #LdmGreeter + * lightdm_greeter_get_autologin_user_hint: + * @greeter: A #LightDMGreeter * * Get the user account to automatically logg into when the timer expires. * * Return value: The user account to automatically log into. */ const gchar * -ldm_greeter_get_autologin_user_hint (LdmGreeter *greeter) +lightdm_greeter_get_autologin_user_hint (LightDMGreeter *greeter) { - g_return_val_if_fail (LDM_IS_GREETER (greeter), NULL); - return ldm_greeter_get_hint (greeter, "autologin-user"); + g_return_val_if_fail (LIGHTDM_IS_GREETER (greeter), NULL); + return lightdm_greeter_get_hint (greeter, "autologin-user"); } /** - * ldm_greeter_get_autologin_guest_hint: - * @greeter: A #LdmGreeter + * lightdm_greeter_get_autologin_guest_hint: + * @greeter: A #LightDMGreeter * * Check if the guest account should be automatically logged into when the timer expires. * * Return value: #TRUE if the guest account should be automatically logged into. */ gboolean -ldm_greeter_get_autologin_guest_hint (LdmGreeter *greeter) +lightdm_greeter_get_autologin_guest_hint (LightDMGreeter *greeter) { const gchar *value; - g_return_val_if_fail (LDM_IS_GREETER (greeter), FALSE); - value = ldm_greeter_get_hint (greeter, "autologin-guest"); + g_return_val_if_fail (LIGHTDM_IS_GREETER (greeter), FALSE); + value = lightdm_greeter_get_hint (greeter, "autologin-guest"); return g_strcmp0 (value, "true") == 0; } /** - * ldm_greeter_get_autologin_timeout_hint: - * @greeter: A #LdmGreeter + * lightdm_greeter_get_autologin_timeout_hint: + * @greeter: A #LightDMGreeter * * Get the number of seconds to wait before automaitcally logging in. * * Return value: The number of seconds to wait before automatically logging in or 0 for no timeout. */ gint -ldm_greeter_get_autologin_timeout_hint (LdmGreeter *greeter) +lightdm_greeter_get_autologin_timeout_hint (LightDMGreeter *greeter) { const gchar *value; gint timeout = 0; - g_return_val_if_fail (LDM_IS_GREETER (greeter), FALSE); - value = ldm_greeter_get_hint (greeter, "autologin-timeout"); + g_return_val_if_fail (LIGHTDM_IS_GREETER (greeter), FALSE); + value = lightdm_greeter_get_hint (greeter, "autologin-timeout"); if (value) timeout = atoi (value); if (timeout < 0) @@ -1309,17 +1309,17 @@ ldm_greeter_get_autologin_timeout_hint (LdmGreeter *greeter) } /** - * ldm_greeter_cancel_timed_login: - * @greeter: A #LdmGreeter + * lightdm_greeter_cancel_timed_login: + * @greeter: A #LightDMGreeter * * Cancel the login as the default user. */ void -ldm_greeter_cancel_timed_login (LdmGreeter *greeter) +lightdm_greeter_cancel_timed_login (LightDMGreeter *greeter) { - LdmGreeterPrivate *priv; + LightDMGreeterPrivate *priv; - g_return_if_fail (LDM_IS_GREETER (greeter)); + g_return_if_fail (LIGHTDM_IS_GREETER (greeter)); priv = GET_PRIVATE (greeter); @@ -1329,20 +1329,20 @@ ldm_greeter_cancel_timed_login (LdmGreeter *greeter) } /** - * ldm_greeter_login: - * @greeter: A #LdmGreeter + * lightdm_greeter_login: + * @greeter: A #LightDMGreeter * @username: (allow-none): A username or #NULL to prompt for a username. * * Starts the authentication procedure for a user. **/ void -ldm_greeter_login (LdmGreeter *greeter, const char *username) +lightdm_greeter_login (LightDMGreeter *greeter, const char *username) { - LdmGreeterPrivate *priv = GET_PRIVATE (greeter); + LightDMGreeterPrivate *priv = GET_PRIVATE (greeter); guint8 message[MAX_MESSAGE_LENGTH]; gsize offset = 0; - g_return_if_fail (LDM_IS_GREETER (greeter)); + g_return_if_fail (LIGHTDM_IS_GREETER (greeter)); if (!username) username = ""; @@ -1362,31 +1362,31 @@ ldm_greeter_login (LdmGreeter *greeter, const char *username) } /** - * ldm_greeter_login_with_user_prompt: - * @greeter: A #LdmGreeter + * lightdm_greeter_login_with_user_prompt: + * @greeter: A #LightDMGreeter * * Starts the authentication procedure, prompting the greeter for a username. **/ void -ldm_greeter_login_with_user_prompt (LdmGreeter *greeter) +lightdm_greeter_login_with_user_prompt (LightDMGreeter *greeter) { - ldm_greeter_login (greeter, NULL); + lightdm_greeter_login (greeter, NULL); } /** - * ldm_greeter_login_as_guest: - * @greeter: A #LdmGreeter + * lightdm_greeter_login_as_guest: + * @greeter: A #LightDMGreeter * * Starts the authentication procedure for the guest user. **/ void -ldm_greeter_login_as_guest (LdmGreeter *greeter) +lightdm_greeter_login_as_guest (LightDMGreeter *greeter) { - LdmGreeterPrivate *priv; + LightDMGreeterPrivate *priv; guint8 message[MAX_MESSAGE_LENGTH]; gsize offset = 0; - g_return_if_fail (LDM_IS_GREETER (greeter)); + g_return_if_fail (LIGHTDM_IS_GREETER (greeter)); priv = GET_PRIVATE (greeter); @@ -1404,19 +1404,19 @@ ldm_greeter_login_as_guest (LdmGreeter *greeter) } /** - * ldm_greeter_respond: - * @greeter: A #LdmGreeter + * lightdm_greeter_respond: + * @greeter: A #LightDMGreeter * @response: Response to a prompt * * Provide response to a prompt. **/ void -ldm_greeter_respond (LdmGreeter *greeter, const gchar *response) +lightdm_greeter_respond (LightDMGreeter *greeter, const gchar *response) { guint8 message[MAX_MESSAGE_LENGTH]; gsize offset = 0; - g_return_if_fail (LDM_IS_GREETER (greeter)); + g_return_if_fail (LIGHTDM_IS_GREETER (greeter)); g_return_if_fail (response != NULL); g_debug ("Providing response to display manager"); @@ -1428,19 +1428,19 @@ ldm_greeter_respond (LdmGreeter *greeter, const gchar *response) } /** - * ldm_greeter_cancel_authentication: - * @greeter: A #LdmGreeter + * lightdm_greeter_cancel_authentication: + * @greeter: A #LightDMGreeter * * Cancel the current user authentication. **/ void -ldm_greeter_cancel_authentication (LdmGreeter *greeter) +lightdm_greeter_cancel_authentication (LightDMGreeter *greeter) { - LdmGreeterPrivate *priv; + LightDMGreeterPrivate *priv; guint8 message[MAX_MESSAGE_LENGTH]; gsize offset = 0; - g_return_if_fail (LDM_IS_GREETER (greeter)); + g_return_if_fail (LIGHTDM_IS_GREETER (greeter)); priv = GET_PRIVATE (greeter); @@ -1450,64 +1450,64 @@ ldm_greeter_cancel_authentication (LdmGreeter *greeter) } /** - * ldm_greeter_get_in_authentication: - * @greeter: A #LdmGreeter + * lightdm_greeter_get_in_authentication: + * @greeter: A #LightDMGreeter * * Checks if the greeter is in the process of authenticating. * * Return value: #TRUE if the greeter is authenticating a user. **/ gboolean -ldm_greeter_get_in_authentication (LdmGreeter *greeter) +lightdm_greeter_get_in_authentication (LightDMGreeter *greeter) { - g_return_val_if_fail (LDM_IS_GREETER (greeter), FALSE); + g_return_val_if_fail (LIGHTDM_IS_GREETER (greeter), FALSE); return GET_PRIVATE (greeter)->in_authentication; } /** - * ldm_greeter_get_is_authenticated: - * @greeter: A #LdmGreeter + * lightdm_greeter_get_is_authenticated: + * @greeter: A #LightDMGreeter * * Checks if the greeter has successfully authenticated. * * Return value: #TRUE if the greeter is authenticated for login. **/ gboolean -ldm_greeter_get_is_authenticated (LdmGreeter *greeter) +lightdm_greeter_get_is_authenticated (LightDMGreeter *greeter) { - g_return_val_if_fail (LDM_IS_GREETER (greeter), FALSE); + g_return_val_if_fail (LIGHTDM_IS_GREETER (greeter), FALSE); return GET_PRIVATE (greeter)->is_authenticated; } /** - * ldm_greeter_get_authentication_user: - * @greeter: A #LdmGreeter + * lightdm_greeter_get_authentication_user: + * @greeter: A #LightDMGreeter * * Get the user that is being authenticated. * * Return value: The username of the authentication user being authenticated or #NULL if no authentication in progress. */ const gchar * -ldm_greeter_get_authentication_user (LdmGreeter *greeter) +lightdm_greeter_get_authentication_user (LightDMGreeter *greeter) { - g_return_val_if_fail (LDM_IS_GREETER (greeter), NULL); + g_return_val_if_fail (LIGHTDM_IS_GREETER (greeter), NULL); return GET_PRIVATE (greeter)->authentication_user; } /** - * ldm_greeter_start_session: - * @greeter: A #LdmGreeter + * lightdm_greeter_start_session: + * @greeter: A #LightDMGreeter * @session: (allow-none): The session to log into or #NULL to use the default * * Start a session for the logged in user. **/ void -ldm_greeter_start_session (LdmGreeter *greeter, const gchar *session) +lightdm_greeter_start_session (LightDMGreeter *greeter, const gchar *session) { guint8 message[MAX_MESSAGE_LENGTH]; gsize offset = 0; - g_return_if_fail (LDM_IS_GREETER (greeter)); + g_return_if_fail (LIGHTDM_IS_GREETER (greeter)); if (!session) session = ""; @@ -1519,21 +1519,21 @@ ldm_greeter_start_session (LdmGreeter *greeter, const gchar *session) } /** - * ldm_greeter_start_session_with_defaults: - * @greeter: A #LdmGreeter + * lightdm_greeter_start_session_with_defaults: + * @greeter: A #LightDMGreeter * * Login a user to a session using default settings for that user. **/ void -ldm_greeter_start_default_session (LdmGreeter *greeter) +lightdm_greeter_start_default_session (LightDMGreeter *greeter) { - ldm_greeter_start_session (greeter, NULL); + lightdm_greeter_start_session (greeter, NULL); } static gboolean -upower_call_function (LdmGreeter *greeter, const gchar *function, gboolean has_result) +upower_call_function (LightDMGreeter *greeter, const gchar *function, gboolean has_result) { - LdmGreeterPrivate *priv = GET_PRIVATE (greeter); + LightDMGreeterPrivate *priv = GET_PRIVATE (greeter); GDBusProxy *proxy; GVariant *result; GError *error = NULL; @@ -1572,65 +1572,65 @@ upower_call_function (LdmGreeter *greeter, const gchar *function, gboolean has_r } /** - * ldm_greeter_get_can_suspend: - * @greeter: A #LdmGreeter + * lightdm_greeter_get_can_suspend: + * @greeter: A #LightDMGreeter * * Checks if the greeter is authorized to do a system suspend. * * Return value: #TRUE if the greeter can suspend the system **/ gboolean -ldm_greeter_get_can_suspend (LdmGreeter *greeter) +lightdm_greeter_get_can_suspend (LightDMGreeter *greeter) { - g_return_val_if_fail (LDM_IS_GREETER (greeter), FALSE); + g_return_val_if_fail (LIGHTDM_IS_GREETER (greeter), FALSE); return upower_call_function (greeter, "SuspendAllowed", TRUE); } /** - * ldm_greeter_suspend: - * @greeter: A #LdmGreeter + * lightdm_greeter_suspend: + * @greeter: A #LightDMGreeter * * Triggers a system suspend. **/ void -ldm_greeter_suspend (LdmGreeter *greeter) +lightdm_greeter_suspend (LightDMGreeter *greeter) { - g_return_if_fail (LDM_IS_GREETER (greeter)); + g_return_if_fail (LIGHTDM_IS_GREETER (greeter)); upower_call_function (greeter, "Suspend", FALSE); } /** - * ldm_greeter_get_can_hibernate: - * @greeter: A #LdmGreeter + * lightdm_greeter_get_can_hibernate: + * @greeter: A #LightDMGreeter * * Checks if the greeter is authorized to do a system hibernate. * * Return value: #TRUE if the greeter can hibernate the system **/ gboolean -ldm_greeter_get_can_hibernate (LdmGreeter *greeter) +lightdm_greeter_get_can_hibernate (LightDMGreeter *greeter) { - g_return_val_if_fail (LDM_IS_GREETER (greeter), FALSE); + g_return_val_if_fail (LIGHTDM_IS_GREETER (greeter), FALSE); return upower_call_function (greeter, "HibernateAllowed", TRUE); } /** - * ldm_greeter_hibernate: - * @greeter: A #LdmGreeter + * lightdm_greeter_hibernate: + * @greeter: A #LightDMGreeter * * Triggers a system hibernate. **/ void -ldm_greeter_hibernate (LdmGreeter *greeter) +lightdm_greeter_hibernate (LightDMGreeter *greeter) { - g_return_if_fail (LDM_IS_GREETER (greeter)); + g_return_if_fail (LIGHTDM_IS_GREETER (greeter)); upower_call_function (greeter, "Hibernate", FALSE); } static gboolean -ck_call_function (LdmGreeter *greeter, const gchar *function, gboolean has_result) +ck_call_function (LightDMGreeter *greeter, const gchar *function, gboolean has_result) { - LdmGreeterPrivate *priv = GET_PRIVATE (greeter); + LightDMGreeterPrivate *priv = GET_PRIVATE (greeter); GDBusProxy *proxy; GVariant *result; GError *error = NULL; @@ -1669,85 +1669,85 @@ ck_call_function (LdmGreeter *greeter, const gchar *function, gboolean has_resul } /** - * ldm_greeter_get_can_restart: - * @greeter: A #LdmGreeter + * lightdm_greeter_get_can_restart: + * @greeter: A #LightDMGreeter * * Checks if the greeter is authorized to do a system restart. * * Return value: #TRUE if the greeter can restart the system **/ gboolean -ldm_greeter_get_can_restart (LdmGreeter *greeter) +lightdm_greeter_get_can_restart (LightDMGreeter *greeter) { - g_return_val_if_fail (LDM_IS_GREETER (greeter), FALSE); + g_return_val_if_fail (LIGHTDM_IS_GREETER (greeter), FALSE); return ck_call_function (greeter, "CanRestart", TRUE); } /** - * ldm_greeter_restart: - * @greeter: A #LdmGreeter + * lightdm_greeter_restart: + * @greeter: A #LightDMGreeter * * Triggers a system restart. **/ void -ldm_greeter_restart (LdmGreeter *greeter) +lightdm_greeter_restart (LightDMGreeter *greeter) { - g_return_if_fail (LDM_IS_GREETER (greeter)); + g_return_if_fail (LIGHTDM_IS_GREETER (greeter)); ck_call_function (greeter, "Restart", FALSE); } /** - * ldm_greeter_get_can_shutdown: - * @greeter: A #LdmGreeter + * lightdm_greeter_get_can_shutdown: + * @greeter: A #LightDMGreeter * * Checks if the greeter is authorized to do a system shutdown. * * Return value: #TRUE if the greeter can shutdown the system **/ gboolean -ldm_greeter_get_can_shutdown (LdmGreeter *greeter) +lightdm_greeter_get_can_shutdown (LightDMGreeter *greeter) { - g_return_val_if_fail (LDM_IS_GREETER (greeter), FALSE); + g_return_val_if_fail (LIGHTDM_IS_GREETER (greeter), FALSE); return ck_call_function (greeter, "CanStop", TRUE); } /** - * ldm_greeter_shutdown: - * @greeter: A #LdmGreeter + * lightdm_greeter_shutdown: + * @greeter: A #LightDMGreeter * * Triggers a system shutdown. **/ void -ldm_greeter_shutdown (LdmGreeter *greeter) +lightdm_greeter_shutdown (LightDMGreeter *greeter) { - g_return_if_fail (LDM_IS_GREETER (greeter)); + g_return_if_fail (LIGHTDM_IS_GREETER (greeter)); ck_call_function (greeter, "Stop", FALSE); } static void -ldm_greeter_init (LdmGreeter *greeter) +lightdm_greeter_init (LightDMGreeter *greeter) { - LdmGreeterPrivate *priv = GET_PRIVATE (greeter); + LightDMGreeterPrivate *priv = GET_PRIVATE (greeter); priv->read_buffer = g_malloc (HEADER_SIZE); priv->hints = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free); - g_debug ("default-language=%s", ldm_greeter_get_default_language (greeter)); + g_debug ("default-language=%s", lightdm_greeter_get_default_language (greeter)); } static void -ldm_greeter_set_property (GObject *object, +lightdm_greeter_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec) { - LdmGreeter *self; + LightDMGreeter *self; - self = LDM_GREETER (object); + self = LIGHTDM_GREETER (object); switch (prop_id) { case PROP_LAYOUT: - ldm_greeter_set_layout(self, g_value_get_string (value)); + lightdm_greeter_set_layout(self, g_value_get_string (value)); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -1756,78 +1756,78 @@ ldm_greeter_set_property (GObject *object, } static void -ldm_greeter_get_property (GObject *object, +lightdm_greeter_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec) { - LdmGreeter *self; + LightDMGreeter *self; - self = LDM_GREETER (object); + self = LIGHTDM_GREETER (object); switch (prop_id) { case PROP_HOSTNAME: - g_value_set_string (value, ldm_greeter_get_hostname (self)); + g_value_set_string (value, lightdm_greeter_get_hostname (self)); break; case PROP_NUM_USERS: - g_value_set_int (value, ldm_greeter_get_num_users (self)); + g_value_set_int (value, lightdm_greeter_get_num_users (self)); break; case PROP_USERS: break; case PROP_DEFAULT_LANGUAGE: - g_value_set_string (value, ldm_greeter_get_default_language (self)); + g_value_set_string (value, lightdm_greeter_get_default_language (self)); break; case PROP_LAYOUTS: break; case PROP_LAYOUT: - g_value_set_string (value, ldm_greeter_get_layout (self)); + g_value_set_string (value, lightdm_greeter_get_layout (self)); break; case PROP_SESSIONS: break; case PROP_DEFAULT_SESSION_HINT: - g_value_set_string (value, ldm_greeter_get_default_session_hint (self)); + g_value_set_string (value, lightdm_greeter_get_default_session_hint (self)); break; case PROP_HIDE_USERS_HINT: - g_value_set_boolean (value, ldm_greeter_get_hide_users_hint (self)); + g_value_set_boolean (value, lightdm_greeter_get_hide_users_hint (self)); break; case PROP_HAS_GUEST_ACCOUNT_HINT: - g_value_set_boolean (value, ldm_greeter_get_has_guest_account_hint (self)); + g_value_set_boolean (value, lightdm_greeter_get_has_guest_account_hint (self)); break; case PROP_SELECT_USER_HINT: - g_value_set_string (value, ldm_greeter_get_select_user_hint (self)); + g_value_set_string (value, lightdm_greeter_get_select_user_hint (self)); break; case PROP_SELECT_GUEST_HINT: - g_value_set_boolean (value, ldm_greeter_get_select_guest_hint (self)); + g_value_set_boolean (value, lightdm_greeter_get_select_guest_hint (self)); break; case PROP_AUTOLOGIN_USER_HINT: - g_value_set_string (value, ldm_greeter_get_autologin_user_hint (self)); + g_value_set_string (value, lightdm_greeter_get_autologin_user_hint (self)); break; case PROP_AUTOLOGIN_GUEST_HINT: - g_value_set_boolean (value, ldm_greeter_get_autologin_guest_hint (self)); + g_value_set_boolean (value, lightdm_greeter_get_autologin_guest_hint (self)); break; case PROP_AUTOLOGIN_TIMEOUT_HINT: - g_value_set_int (value, ldm_greeter_get_autologin_timeout_hint (self)); + g_value_set_int (value, lightdm_greeter_get_autologin_timeout_hint (self)); break; case PROP_AUTHENTICATION_USER: - g_value_set_string (value, ldm_greeter_get_authentication_user (self)); + g_value_set_string (value, lightdm_greeter_get_authentication_user (self)); break; case PROP_IN_AUTHENTICATION: - g_value_set_boolean (value, ldm_greeter_get_in_authentication (self)); + g_value_set_boolean (value, lightdm_greeter_get_in_authentication (self)); break; case PROP_IS_AUTHENTICATED: - g_value_set_boolean (value, ldm_greeter_get_is_authenticated (self)); + g_value_set_boolean (value, lightdm_greeter_get_is_authenticated (self)); break; case PROP_CAN_SUSPEND: - g_value_set_boolean (value, ldm_greeter_get_can_suspend (self)); + g_value_set_boolean (value, lightdm_greeter_get_can_suspend (self)); break; case PROP_CAN_HIBERNATE: - g_value_set_boolean (value, ldm_greeter_get_can_hibernate (self)); + g_value_set_boolean (value, lightdm_greeter_get_can_hibernate (self)); break; case PROP_CAN_RESTART: - g_value_set_boolean (value, ldm_greeter_get_can_restart (self)); + g_value_set_boolean (value, lightdm_greeter_get_can_restart (self)); break; case PROP_CAN_SHUTDOWN: - g_value_set_boolean (value, ldm_greeter_get_can_shutdown (self)); + g_value_set_boolean (value, lightdm_greeter_get_can_shutdown (self)); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -1872,26 +1872,26 @@ marshal_VOID__STRING_INT (GClosure *closure, } static void -ldm_greeter_finalize (GObject *object) +lightdm_greeter_finalize (GObject *object) { - LdmGreeter *self = LDM_GREETER (object); - LdmGreeterPrivate *priv = GET_PRIVATE (self); + LightDMGreeter *self = LIGHTDM_GREETER (object); + LightDMGreeterPrivate *priv = GET_PRIVATE (self); g_hash_table_unref (priv->hints); - G_OBJECT_CLASS (ldm_greeter_parent_class)->finalize (object); + G_OBJECT_CLASS (lightdm_greeter_parent_class)->finalize (object); } static void -ldm_greeter_class_init (LdmGreeterClass *klass) +lightdm_greeter_class_init (LightDMGreeterClass *klass) { GObjectClass *object_class = G_OBJECT_CLASS (klass); - g_type_class_add_private (klass, sizeof (LdmGreeterPrivate)); + g_type_class_add_private (klass, sizeof (LightDMGreeterPrivate)); - object_class->set_property = ldm_greeter_set_property; - object_class->get_property = ldm_greeter_get_property; - object_class->finalize = ldm_greeter_finalize; + object_class->set_property = lightdm_greeter_set_property; + object_class->get_property = lightdm_greeter_get_property; + object_class->finalize = lightdm_greeter_finalize; g_object_class_install_property (object_class, PROP_NUM_USERS, @@ -2051,8 +2051,8 @@ ldm_greeter_class_init (LdmGreeterClass *klass) G_PARAM_READABLE)); /** - * LdmGreeter::connected: - * @greeter: A #LdmGreeter + * LightDMGreeter::connected: + * @greeter: A #LightDMGreeter * * The ::connected signal gets emitted when the greeter connects to the * LightDM server. @@ -2061,14 +2061,14 @@ ldm_greeter_class_init (LdmGreeterClass *klass) g_signal_new ("connected", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (LdmGreeterClass, connected), + G_STRUCT_OFFSET (LightDMGreeterClass, connected), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); /** - * LdmGreeter::show-prompt: - * @greeter: A #LdmGreeter + * LightDMGreeter::show-prompt: + * @greeter: A #LightDMGreeter * @text: Prompt text * @type: Prompt type * @@ -2076,21 +2076,21 @@ ldm_greeter_class_init (LdmGreeterClass *klass) * prompt to the user. The given text should be displayed and an input * field for the user to provide a response. * - * Call ldm_greeter_respond() with the resultant input or - * ldm_greeter_cancel_authentication() to abort the authentication. + * Call lightdm_greeter_respond() with the resultant input or + * lightdm_greeter_cancel_authentication() to abort the authentication. **/ signals[SHOW_PROMPT] = g_signal_new ("show-prompt", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (LdmGreeterClass, show_prompt), + G_STRUCT_OFFSET (LightDMGreeterClass, show_prompt), NULL, NULL, marshal_VOID__STRING_INT, G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_INT); /** - * LdmGreeter::show-message: - * @greeter: A #LdmGreeter + * LightDMGreeter::show-message: + * @greeter: A #LightDMGreeter * @text: Message text * @type: Message type * @@ -2101,33 +2101,33 @@ ldm_greeter_class_init (LdmGreeterClass *klass) g_signal_new ("show-message", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (LdmGreeterClass, show_message), + G_STRUCT_OFFSET (LightDMGreeterClass, show_message), NULL, NULL, marshal_VOID__STRING_INT, G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_INT); /** - * LdmGreeter::authentication-complete: - * @greeter: A #LdmGreeter + * LightDMGreeter::authentication-complete: + * @greeter: A #LightDMGreeter * * The ::authentication-complete signal gets emitted when the greeter * has completed authentication. * - * Call ldm_greeter_get_is_authenticated() to check if the authentication + * Call lightdm_greeter_get_is_authenticated() to check if the authentication * was successful. **/ signals[AUTHENTICATION_COMPLETE] = g_signal_new ("authentication-complete", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (LdmGreeterClass, authentication_complete), + G_STRUCT_OFFSET (LightDMGreeterClass, authentication_complete), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); /** - * LdmGreeter::session-failed: - * @greeter: A #LdmGreeter + * LightDMGreeter::session-failed: + * @greeter: A #LightDMGreeter * * The ::session-failed signal gets emitted when the deamon has failed * to start the requested session. @@ -2136,31 +2136,31 @@ ldm_greeter_class_init (LdmGreeterClass *klass) g_signal_new ("session-failed", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (LdmGreeterClass, session_failed), + G_STRUCT_OFFSET (LightDMGreeterClass, session_failed), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); /** - * LdmGreeter::autologin-timer-expired: - * @greeter: A #LdmGreeter + * LightDMGreeter::autologin-timer-expired: + * @greeter: A #LightDMGreeter * @username: A username * * The ::timed-login signal gets emitted when the automatic login timer has expired. - * The application should then call ldm_greeter_login(). + * The application should then call lightdm_greeter_login(). **/ signals[AUTOLOGIN_TIMER_EXPIRED] = g_signal_new ("autologin-timer-expired", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (LdmGreeterClass, autologin_timer_expired), + G_STRUCT_OFFSET (LightDMGreeterClass, autologin_timer_expired), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); /** - * LdmGreeter::user-added: - * @greeter: A #LdmGreeter + * LightDMGreeter::user-added: + * @greeter: A #LightDMGreeter * * The ::user-added signal gets emitted when a user account is created. **/ @@ -2168,14 +2168,14 @@ ldm_greeter_class_init (LdmGreeterClass *klass) g_signal_new ("user-added", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (LdmGreeterClass, user_added), + G_STRUCT_OFFSET (LightDMGreeterClass, user_added), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, - G_TYPE_NONE, 1, LDM_TYPE_USER); + G_TYPE_NONE, 1, LIGHTDM_TYPE_USER); /** - * LdmGreeter::user-changed: - * @greeter: A #LdmGreeter + * LightDMGreeter::user-changed: + * @greeter: A #LightDMGreeter * * The ::user-changed signal gets emitted when a user account is modified. **/ @@ -2183,14 +2183,14 @@ ldm_greeter_class_init (LdmGreeterClass *klass) g_signal_new ("user-changed", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (LdmGreeterClass, user_changed), + G_STRUCT_OFFSET (LightDMGreeterClass, user_changed), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, - G_TYPE_NONE, 1, LDM_TYPE_USER); + G_TYPE_NONE, 1, LIGHTDM_TYPE_USER); /** - * LdmGreeter::user-removed: - * @greeter: A #LdmGreeter + * LightDMGreeter::user-removed: + * @greeter: A #LightDMGreeter * * The ::user-removed signal gets emitted when a user account is removed. **/ @@ -2198,14 +2198,14 @@ ldm_greeter_class_init (LdmGreeterClass *klass) g_signal_new ("user-removed", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (LdmGreeterClass, user_removed), + G_STRUCT_OFFSET (LightDMGreeterClass, user_removed), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, - G_TYPE_NONE, 1, LDM_TYPE_USER); + G_TYPE_NONE, 1, LIGHTDM_TYPE_USER); /** - * LdmGreeter::quit: - * @greeter: A #LdmGreeter + * LightDMGreeter::quit: + * @greeter: A #LightDMGreeter * * The ::quit signal gets emitted when the greeter should exit. **/ @@ -2213,7 +2213,7 @@ ldm_greeter_class_init (LdmGreeterClass *klass) g_signal_new ("quit", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (LdmGreeterClass, quit), + G_STRUCT_OFFSET (LightDMGreeterClass, quit), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); diff --git a/liblightdm-gobject/language.c b/liblightdm-gobject/language.c index a7598580..4819bbf6 100644 --- a/liblightdm-gobject/language.c +++ b/liblightdm-gobject/language.c @@ -26,55 +26,55 @@ typedef struct gchar *code; gchar *name; gchar *territory; -} LdmLanguagePrivate; +} LightDMLanguagePrivate; -G_DEFINE_TYPE (LdmLanguage, ldm_language, G_TYPE_OBJECT); +G_DEFINE_TYPE (LightDMLanguage, lightdm_language, G_TYPE_OBJECT); -#define GET_PRIVATE(obj) G_TYPE_INSTANCE_GET_PRIVATE ((obj), LDM_TYPE_LANGUAGE, LdmLanguagePrivate) +#define GET_PRIVATE(obj) G_TYPE_INSTANCE_GET_PRIVATE ((obj), LIGHTDM_TYPE_LANGUAGE, LightDMLanguagePrivate) /** - * ldm_language_new: + * lightdm_language_new: * * Create a new language. * @code: The language code * - * Return value: the new #LdmLanguage + * Return value: the new #LightDMLanguage **/ -LdmLanguage * -ldm_language_new (const gchar *code) +LightDMLanguage * +lightdm_language_new (const gchar *code) { - return g_object_new (LDM_TYPE_LANGUAGE, "code", code, NULL); + return g_object_new (LIGHTDM_TYPE_LANGUAGE, "code", code, NULL); } /** - * ldm_language_get_code: - * @language: A #LdmLanguage + * lightdm_language_get_code: + * @language: A #LightDMLanguage * * Get the code of a language. * * Return value: The code of the language **/ const gchar * -ldm_language_get_code (LdmLanguage *language) +lightdm_language_get_code (LightDMLanguage *language) { - g_return_val_if_fail (LDM_IS_LANGUAGE (language), NULL); + g_return_val_if_fail (LIGHTDM_IS_LANGUAGE (language), NULL); return GET_PRIVATE (language)->code; } /** - * ldm_language_get_name: - * @language: A #LdmLanguage + * lightdm_language_get_name: + * @language: A #LightDMLanguage * * Get the name of a language. * * Return value: The name of the language **/ const gchar * -ldm_language_get_name (LdmLanguage *language) +lightdm_language_get_name (LightDMLanguage *language) { - LdmLanguagePrivate *priv; + LightDMLanguagePrivate *priv; - g_return_val_if_fail (LDM_IS_LANGUAGE (language), NULL); + g_return_val_if_fail (LIGHTDM_IS_LANGUAGE (language), NULL); priv = GET_PRIVATE (language); @@ -94,19 +94,19 @@ ldm_language_get_name (LdmLanguage *language) } /** - * ldm_language_get_territory: - * @language: A #LdmLanguage + * lightdm_language_get_territory: + * @language: A #LightDMLanguage * * Get the territory the language is used in. * * Return value: The territory the language is used in. **/ const gchar * -ldm_language_get_territory (LdmLanguage *language) +lightdm_language_get_territory (LightDMLanguage *language) { - LdmLanguagePrivate *priv; + LightDMLanguagePrivate *priv; - g_return_val_if_fail (LDM_IS_LANGUAGE (language), NULL); + g_return_val_if_fail (LIGHTDM_IS_LANGUAGE (language), NULL); priv = GET_PRIVATE (language); @@ -132,8 +132,8 @@ is_utf8 (const gchar *code) } /** - * ldm_language_matches: - * @language: A #LdmLanguage + * lightdm_language_matches: + * @language: A #LightDMLanguage * @code: A language code * * Check if a language code matches this language. @@ -141,11 +141,11 @@ is_utf8 (const gchar *code) * Return value: #TRUE if the code matches this language. **/ gboolean -ldm_language_matches (LdmLanguage *language, const gchar *code) +lightdm_language_matches (LightDMLanguage *language, const gchar *code) { - LdmLanguagePrivate *priv; + LightDMLanguagePrivate *priv; - g_return_val_if_fail (LDM_IS_LANGUAGE (language), FALSE); + g_return_val_if_fail (LIGHTDM_IS_LANGUAGE (language), FALSE); g_return_val_if_fail (code != NULL, FALSE); priv = GET_PRIVATE (language); @@ -163,18 +163,18 @@ ldm_language_matches (LdmLanguage *language, const gchar *code) } static void -ldm_language_init (LdmLanguage *language) +lightdm_language_init (LightDMLanguage *language) { } static void -ldm_language_set_property (GObject *object, +lightdm_language_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec) { - LdmLanguage *self = LDM_LANGUAGE (object); - LdmLanguagePrivate *priv = GET_PRIVATE (self); + LightDMLanguage *self = LIGHTDM_LANGUAGE (object); + LightDMLanguagePrivate *priv = GET_PRIVATE (self); switch (prop_id) { case PROP_CODE: @@ -188,24 +188,24 @@ ldm_language_set_property (GObject *object, } static void -ldm_language_get_property (GObject *object, +lightdm_language_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec) { - LdmLanguage *self; + LightDMLanguage *self; - self = LDM_LANGUAGE (object); + self = LIGHTDM_LANGUAGE (object); switch (prop_id) { case PROP_CODE: - g_value_set_string (value, ldm_language_get_code (self)); + g_value_set_string (value, lightdm_language_get_code (self)); break; case PROP_NAME: - g_value_set_string (value, ldm_language_get_name (self)); + g_value_set_string (value, lightdm_language_get_name (self)); break; case PROP_TERRITORY: - g_value_set_string (value, ldm_language_get_territory (self)); + g_value_set_string (value, lightdm_language_get_territory (self)); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -214,14 +214,14 @@ ldm_language_get_property (GObject *object, } static void -ldm_language_class_init (LdmLanguageClass *klass) +lightdm_language_class_init (LightDMLanguageClass *klass) { GObjectClass *object_class = G_OBJECT_CLASS (klass); - g_type_class_add_private (klass, sizeof (LdmLanguagePrivate)); + g_type_class_add_private (klass, sizeof (LightDMLanguagePrivate)); - object_class->set_property = ldm_language_set_property; - object_class->get_property = ldm_language_get_property; + object_class->set_property = lightdm_language_set_property; + object_class->get_property = lightdm_language_get_property; g_object_class_install_property(object_class, PROP_CODE, diff --git a/liblightdm-gobject/layout.c b/liblightdm-gobject/layout.c index 2623c845..5c72e162 100644 --- a/liblightdm-gobject/layout.c +++ b/liblightdm-gobject/layout.c @@ -23,86 +23,86 @@ typedef struct gchar *name; gchar *short_description; gchar *description; -} LdmLayoutPrivate; +} LightDMLayoutPrivate; -G_DEFINE_TYPE (LdmLayout, ldm_layout, G_TYPE_OBJECT); +G_DEFINE_TYPE (LightDMLayout, lightdm_layout, G_TYPE_OBJECT); -#define GET_PRIVATE(obj) G_TYPE_INSTANCE_GET_PRIVATE ((obj), LDM_TYPE_LAYOUT, LdmLayoutPrivate) +#define GET_PRIVATE(obj) G_TYPE_INSTANCE_GET_PRIVATE ((obj), LIGHTDM_TYPE_LAYOUT, LightDMLayoutPrivate) /** - * ldm_layout_new: + * lightdm_layout_new: * * Create a new layout. * @name: The layout name * @short_description: Short description for the layout * @description: Long description for the layout * - * Return value: the new #LdmLayout + * Return value: the new #LightDMLayout **/ -LdmLayout * -ldm_layout_new (const gchar *name, const gchar *short_description, const gchar *description) +LightDMLayout * +lightdm_layout_new (const gchar *name, const gchar *short_description, const gchar *description) { - return g_object_new (LDM_TYPE_LAYOUT, "name", name, "short-description", short_description, "description", description, NULL); + return g_object_new (LIGHTDM_TYPE_LAYOUT, "name", name, "short-description", short_description, "description", description, NULL); } /** - * ldm_layout_get_name: - * @layout: A #LdmLayout + * lightdm_layout_get_name: + * @layout: A #LightDMLayout * * Get the name of a layout. * * Return value: The name of the layout **/ const gchar * -ldm_layout_get_name (LdmLayout *layout) +lightdm_layout_get_name (LightDMLayout *layout) { - g_return_val_if_fail (LDM_IS_LAYOUT (layout), NULL); + g_return_val_if_fail (LIGHTDM_IS_LAYOUT (layout), NULL); return GET_PRIVATE (layout)->name; } /** - * ldm_layout_get_short_description: - * @layout: A #LdmLayout + * lightdm_layout_get_short_description: + * @layout: A #LightDMLayout * * Get the short description of a layout. * * Return value: A short description of the layout **/ const gchar * -ldm_layout_get_short_description (LdmLayout *layout) +lightdm_layout_get_short_description (LightDMLayout *layout) { - g_return_val_if_fail (LDM_IS_LAYOUT (layout), NULL); + g_return_val_if_fail (LIGHTDM_IS_LAYOUT (layout), NULL); return GET_PRIVATE (layout)->short_description; } /** - * ldm_layout_get_description: - * @layout: A #LdmLayout + * lightdm_layout_get_description: + * @layout: A #LightDMLayout * * Get the long description of a layout. * * Return value: A long description of the layout **/ const gchar * -ldm_layout_get_description (LdmLayout *layout) +lightdm_layout_get_description (LightDMLayout *layout) { - g_return_val_if_fail (LDM_IS_LAYOUT (layout), NULL); + g_return_val_if_fail (LIGHTDM_IS_LAYOUT (layout), NULL); return GET_PRIVATE (layout)->description; } static void -ldm_layout_init (LdmLayout *layout) +lightdm_layout_init (LightDMLayout *layout) { } static void -ldm_layout_set_property (GObject *object, +lightdm_layout_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec) { - LdmLayout *self = LDM_LAYOUT (object); - LdmLayoutPrivate *priv = GET_PRIVATE (self); + LightDMLayout *self = LIGHTDM_LAYOUT (object); + LightDMLayoutPrivate *priv = GET_PRIVATE (self); switch (prop_id) { case PROP_NAME: @@ -124,24 +124,24 @@ ldm_layout_set_property (GObject *object, } static void -ldm_layout_get_property (GObject *object, +lightdm_layout_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec) { - LdmLayout *self; + LightDMLayout *self; - self = LDM_LAYOUT (object); + self = LIGHTDM_LAYOUT (object); switch (prop_id) { case PROP_NAME: - g_value_set_string (value, ldm_layout_get_name (self)); + g_value_set_string (value, lightdm_layout_get_name (self)); break; case PROP_SHORT_DESCRIPTION: - g_value_set_string (value, ldm_layout_get_short_description (self)); + g_value_set_string (value, lightdm_layout_get_short_description (self)); break; case PROP_DESCRIPTION: - g_value_set_string (value, ldm_layout_get_description (self)); + g_value_set_string (value, lightdm_layout_get_description (self)); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -150,14 +150,14 @@ ldm_layout_get_property (GObject *object, } static void -ldm_layout_class_init (LdmLayoutClass *klass) +lightdm_layout_class_init (LightDMLayoutClass *klass) { GObjectClass *object_class = G_OBJECT_CLASS (klass); - g_type_class_add_private (klass, sizeof (LdmLayoutPrivate)); + g_type_class_add_private (klass, sizeof (LightDMLayoutPrivate)); - object_class->set_property = ldm_layout_set_property; - object_class->get_property = ldm_layout_get_property; + object_class->set_property = lightdm_layout_set_property; + object_class->get_property = lightdm_layout_get_property; g_object_class_install_property(object_class, PROP_NAME, diff --git a/liblightdm-gobject/liblightdm-gobject-0.vapi b/liblightdm-gobject/liblightdm-gobject-0.vapi index 6f8463f4..3c6c34e4 100644 --- a/liblightdm-gobject/liblightdm-gobject-0.vapi +++ b/liblightdm-gobject/liblightdm-gobject-0.vapi @@ -1,4 +1,4 @@ -[CCode (cprefix = "Ldm", lower_case_cprefix = "ldm_", cheader_filename = "lightdm/greeter.h")] +[CCode (cprefix = "LightDM", lower_case_cprefix = "lightdm_", cheader_filename = "lightdm/greeter.h")] namespace LightDM { public class Greeter : GLib.Object { public Greeter (); diff --git a/liblightdm-gobject/lightdm/greeter.h b/liblightdm-gobject/lightdm/greeter.h index 673ff461..659f8a98 100644 --- a/liblightdm-gobject/lightdm/greeter.h +++ b/liblightdm-gobject/lightdm/greeter.h @@ -9,22 +9,22 @@ * license. */ -#ifndef _LDM_GREETER_H_ -#define _LDM_GREETER_H_ +#ifndef _LIGHTDM_GREETER_H_ +#define _LIGHTDM_GREETER_H_ #include <glib-object.h> G_BEGIN_DECLS -#define LDM_TYPE_GREETER (ldm_greeter_get_type()) -#define LDM_GREETER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), LDM_TYPE_GREETER, LdmGreeter)); -#define LDM_GREETER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), LDM_TYPE_GREETER, LdmGreeterClass)) -#define LDM_IS_GREETER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), LDM_TYPE_GREETER)) -#define LDM_IS_GREETER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LDM_TYPE_GREETER)) -#define LDM_GREETER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), LDM_TYPE_GREETER, LdmGreeterClass)) +#define LIGHTDM_TYPE_GREETER (lightdm_greeter_get_type()) +#define LIGHTDM_GREETER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), LIGHTDM_TYPE_GREETER, LightDMGreeter)); +#define LIGHTDM_GREETER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), LIGHTDM_TYPE_GREETER, LightDMGreeterClass)) +#define LIGHTDM_IS_GREETER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), LIGHTDM_TYPE_GREETER)) +#define LIGHTDM_IS_GREETER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LIGHTDM_TYPE_GREETER)) +#define LIGHTDM_GREETER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), LIGHTDM_TYPE_GREETER, LightDMGreeterClass)) -typedef struct _LdmGreeter LdmGreeter; -typedef struct _LdmGreeterClass LdmGreeterClass; +typedef struct _LightDMGreeter LightDMGreeter; +typedef struct _LightDMGreeterClass LightDMGreeterClass; #include "user.h" #include "language.h" @@ -32,130 +32,130 @@ typedef struct _LdmGreeterClass LdmGreeterClass; #include "session.h" /** - * LdmPromptType: - * @LDM_PROMPT_TYPE_QUESTION: Prompt is a question. The information can be shown as it is entered. - * @LDM_PROMPT_TYPE_SECRET: Prompt is for secret information. The entered information should be obscured so it can't be publically visible. + * LightDMPromptType: + * @LIGHTDM_PROMPT_TYPE_QUESTION: Prompt is a question. The information can be shown as it is entered. + * @LIGHTDM_PROMPT_TYPE_SECRET: Prompt is for secret information. The entered information should be obscured so it can't be publically visible. */ typedef enum { - LDM_PROMPT_TYPE_QUESTION, - LDM_PROMPT_TYPE_SECRET -} LdmPromptType; + LIGHTDM_PROMPT_TYPE_QUESTION, + LIGHTDM_PROMPT_TYPE_SECRET +} LightDMPromptType; /** - * LdmMessageType: - * @LDM_MESSAGE_TYPE_INFO: Informational message. - * @LDM_MESSAGE_TYPE_ERROR: Error message. + * LightDMMessageType: + * @LIGHTDM_MESSAGE_TYPE_INFO: Informational message. + * @LIGHTDM_MESSAGE_TYPE_ERROR: Error message. */ typedef enum { - LDM_MESSAGE_TYPE_INFO, - LDM_MESSAGE_TYPE_ERROR -} LdmMessageType; + LIGHTDM_MESSAGE_TYPE_INFO, + LIGHTDM_MESSAGE_TYPE_ERROR +} LightDMMessageType; -struct _LdmGreeter +struct _LightDMGreeter { GObject parent_instance; }; -struct _LdmGreeterClass +struct _LightDMGreeterClass { GObjectClass parent_class; - void (*connected)(LdmGreeter *greeter); - void (*show_prompt)(LdmGreeter *greeter, const gchar *text, LdmPromptType type); - void (*show_message)(LdmGreeter *greeter, const gchar *text, LdmMessageType type); - void (*authentication_complete)(LdmGreeter *greeter); - void (*session_failed)(LdmGreeter *greeter); - void (*autologin_timer_expired)(LdmGreeter *greeter); - void (*user_added)(LdmGreeter *greeter, LdmUser *user); - void (*user_changed)(LdmGreeter *greeter, LdmUser *user); - void (*user_removed)(LdmGreeter *greeter, LdmUser *user); - void (*quit)(LdmGreeter *greeter); + void (*connected)(LightDMGreeter *greeter); + void (*show_prompt)(LightDMGreeter *greeter, const gchar *text, LightDMPromptType type); + void (*show_message)(LightDMGreeter *greeter, const gchar *text, LightDMMessageType type); + void (*authentication_complete)(LightDMGreeter *greeter); + void (*session_failed)(LightDMGreeter *greeter); + void (*autologin_timer_expired)(LightDMGreeter *greeter); + void (*user_added)(LightDMGreeter *greeter, LightDMUser *user); + void (*user_changed)(LightDMGreeter *greeter, LightDMUser *user); + void (*user_removed)(LightDMGreeter *greeter, LightDMUser *user); + void (*quit)(LightDMGreeter *greeter); }; -GType ldm_greeter_get_type (void); +GType lightdm_greeter_get_type (void); -LdmGreeter *ldm_greeter_new (void); +LightDMGreeter *lightdm_greeter_new (void); -gboolean ldm_greeter_connect_to_server (LdmGreeter *greeter); +gboolean lightdm_greeter_connect_to_server (LightDMGreeter *greeter); -const gchar *ldm_greeter_get_hostname (LdmGreeter *greeter); +const gchar *lightdm_greeter_get_hostname (LightDMGreeter *greeter); -gint ldm_greeter_get_num_users (LdmGreeter *greeter); +gint lightdm_greeter_get_num_users (LightDMGreeter *greeter); -GList *ldm_greeter_get_users (LdmGreeter *greeter); +GList *lightdm_greeter_get_users (LightDMGreeter *greeter); -LdmUser *ldm_greeter_get_user_by_name (LdmGreeter *greeter, const gchar *username); +LightDMUser *lightdm_greeter_get_user_by_name (LightDMGreeter *greeter, const gchar *username); -const gchar *ldm_greeter_get_default_language (LdmGreeter *greeter); +const gchar *lightdm_greeter_get_default_language (LightDMGreeter *greeter); -GList *ldm_greeter_get_languages (LdmGreeter *greeter); +GList *lightdm_greeter_get_languages (LightDMGreeter *greeter); -GList *ldm_greeter_get_layouts (LdmGreeter *greeter); +GList *lightdm_greeter_get_layouts (LightDMGreeter *greeter); -void ldm_greeter_set_layout (LdmGreeter *greeter, const gchar *layout); +void lightdm_greeter_set_layout (LightDMGreeter *greeter, const gchar *layout); -const gchar *ldm_greeter_get_layout (LdmGreeter *greeter); +const gchar *lightdm_greeter_get_layout (LightDMGreeter *greeter); -GList *ldm_greeter_get_sessions (LdmGreeter *greeter); +GList *lightdm_greeter_get_sessions (LightDMGreeter *greeter); -const gchar *ldm_greeter_get_hint (LdmGreeter *greeter, const gchar *name); +const gchar *lightdm_greeter_get_hint (LightDMGreeter *greeter, const gchar *name); -const gchar *ldm_greeter_get_default_session_hint (LdmGreeter *greeter); +const gchar *lightdm_greeter_get_default_session_hint (LightDMGreeter *greeter); -gboolean ldm_greeter_get_hide_users_hint (LdmGreeter *greeter); +gboolean lightdm_greeter_get_hide_users_hint (LightDMGreeter *greeter); -gboolean ldm_greeter_get_has_guest_account_hint (LdmGreeter *greeter); +gboolean lightdm_greeter_get_has_guest_account_hint (LightDMGreeter *greeter); -const gchar *ldm_greeter_get_select_user_hint (LdmGreeter *greeter); +const gchar *lightdm_greeter_get_select_user_hint (LightDMGreeter *greeter); -gboolean ldm_greeter_get_select_guest_hint (LdmGreeter *greeter); +gboolean lightdm_greeter_get_select_guest_hint (LightDMGreeter *greeter); -const gchar *ldm_greeter_get_autologin_user_hint (LdmGreeter *greeter); +const gchar *lightdm_greeter_get_autologin_user_hint (LightDMGreeter *greeter); -gboolean ldm_greeter_get_autologin_guest_hint (LdmGreeter *greeter); +gboolean lightdm_greeter_get_autologin_guest_hint (LightDMGreeter *greeter); -gint ldm_greeter_get_autologin_timeout_hint (LdmGreeter *greeter); +gint lightdm_greeter_get_autologin_timeout_hint (LightDMGreeter *greeter); -void ldm_greeter_cancel_timed_login (LdmGreeter *greeter); +void lightdm_greeter_cancel_timed_login (LightDMGreeter *greeter); -void ldm_greeter_login (LdmGreeter *greeter, const char *username); +void lightdm_greeter_login (LightDMGreeter *greeter, const char *username); -void ldm_greeter_login_with_user_prompt (LdmGreeter *greeter); +void lightdm_greeter_login_with_user_prompt (LightDMGreeter *greeter); -void ldm_greeter_login_as_guest (LdmGreeter *greeter); +void lightdm_greeter_login_as_guest (LightDMGreeter *greeter); -void ldm_greeter_respond (LdmGreeter *greeter, const gchar *response); +void lightdm_greeter_respond (LightDMGreeter *greeter, const gchar *response); -void ldm_greeter_cancel_authentication (LdmGreeter *greeter); +void lightdm_greeter_cancel_authentication (LightDMGreeter *greeter); -gboolean ldm_greeter_get_in_authentication (LdmGreeter *greeter); +gboolean lightdm_greeter_get_in_authentication (LightDMGreeter *greeter); -gboolean ldm_greeter_get_is_authenticated (LdmGreeter *greeter); +gboolean lightdm_greeter_get_is_authenticated (LightDMGreeter *greeter); -const gchar *ldm_greeter_get_authentication_user (LdmGreeter *greeter); +const gchar *lightdm_greeter_get_authentication_user (LightDMGreeter *greeter); -void ldm_greeter_start_session (LdmGreeter *greeter, const gchar *session); +void lightdm_greeter_start_session (LightDMGreeter *greeter, const gchar *session); -void ldm_greeter_start_default_session (LdmGreeter *greeter); +void lightdm_greeter_start_default_session (LightDMGreeter *greeter); -gboolean ldm_greeter_get_can_suspend (LdmGreeter *greeter); +gboolean lightdm_greeter_get_can_suspend (LightDMGreeter *greeter); -void ldm_greeter_suspend (LdmGreeter *greeter); +void lightdm_greeter_suspend (LightDMGreeter *greeter); -gboolean ldm_greeter_get_can_hibernate (LdmGreeter *greeter); +gboolean lightdm_greeter_get_can_hibernate (LightDMGreeter *greeter); -void ldm_greeter_hibernate (LdmGreeter *greeter); +void lightdm_greeter_hibernate (LightDMGreeter *greeter); -gboolean ldm_greeter_get_can_restart (LdmGreeter *greeter); +gboolean lightdm_greeter_get_can_restart (LightDMGreeter *greeter); -void ldm_greeter_restart (LdmGreeter *greeter); +void lightdm_greeter_restart (LightDMGreeter *greeter); -gboolean ldm_greeter_get_can_shutdown (LdmGreeter *greeter); +gboolean lightdm_greeter_get_can_shutdown (LightDMGreeter *greeter); -void ldm_greeter_shutdown (LdmGreeter *greeter); +void lightdm_greeter_shutdown (LightDMGreeter *greeter); G_END_DECLS -#endif /* _LDM_GREETER_H_ */ +#endif /* _LIGHTDM_GREETER_H_ */ diff --git a/liblightdm-gobject/lightdm/language.h b/liblightdm-gobject/lightdm/language.h index 0d563b47..f6813bfb 100644 --- a/liblightdm-gobject/lightdm/language.h +++ b/liblightdm-gobject/lightdm/language.h @@ -9,42 +9,42 @@ * license. */ -#ifndef _LDM_LANGUAGE_H_ -#define _LDM_LANGUAGE_H_ +#ifndef _LIGHTDM_LANGUAGE_H_ +#define _LIGHTDM_LANGUAGE_H_ #include <glib-object.h> G_BEGIN_DECLS -#define LDM_TYPE_LANGUAGE (ldm_language_get_type()) -#define LDM_LANGUAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), LDM_TYPE_LANGUAGE, LdmLanguage)); -#define LDM_LANGUAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), LDM_TYPE_LANGUAGE, LdmLanguageClass)) -#define LDM_IS_LANGUAGE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), LDM_TYPE_LANGUAGE)) -#define LDM_IS_LANGUAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LDM_TYPE_LANGUAGE)) -#define LDM_LANGUAGE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), LDM_TYPE_LANGUAGE, LdmLanguageClass)) +#define LIGHTDM_TYPE_LANGUAGE (lightdm_language_get_type()) +#define LIGHTDM_LANGUAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), LIGHTDM_TYPE_LANGUAGE, LightDMLanguage)); +#define LIGHTDM_LANGUAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), LIGHTDM_TYPE_LANGUAGE, LightDMLanguageClass)) +#define LIGHTDM_IS_LANGUAGE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), LIGHTDM_TYPE_LANGUAGE)) +#define LIGHTDM_IS_LANGUAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LIGHTDM_TYPE_LANGUAGE)) +#define LIGHTDM_LANGUAGE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), LIGHTDM_TYPE_LANGUAGE, LightDMLanguageClass)) typedef struct { GObject parent_instance; -} LdmLanguage; +} LightDMLanguage; typedef struct { GObjectClass parent_class; -} LdmLanguageClass; +} LightDMLanguageClass; -GType ldm_language_get_type (void); +GType lightdm_language_get_type (void); -LdmLanguage *ldm_language_new (const gchar *code); +LightDMLanguage *lightdm_language_new (const gchar *code); -const gchar *ldm_language_get_code (LdmLanguage *language); +const gchar *lightdm_language_get_code (LightDMLanguage *language); -const gchar *ldm_language_get_name (LdmLanguage *language); +const gchar *lightdm_language_get_name (LightDMLanguage *language); -const gchar *ldm_language_get_territory (LdmLanguage *language); +const gchar *lightdm_language_get_territory (LightDMLanguage *language); -gboolean ldm_language_matches (LdmLanguage *language, const gchar *code); +gboolean lightdm_language_matches (LightDMLanguage *language, const gchar *code); G_END_DECLS -#endif /* _LDM_LANGUAGE_H_ */ +#endif /* _LIGHTDM_LANGUAGE_H_ */ diff --git a/liblightdm-gobject/lightdm/layout.h b/liblightdm-gobject/lightdm/layout.h index d7c5ee5c..0bc57578 100644 --- a/liblightdm-gobject/lightdm/layout.h +++ b/liblightdm-gobject/lightdm/layout.h @@ -9,40 +9,40 @@ * license. */ -#ifndef _LDM_LAYOUT_H_ -#define _LDM_LAYOUT_H_ +#ifndef _LIGHTDM_LAYOUT_H_ +#define _LIGHTDM_LAYOUT_H_ #include <glib-object.h> G_BEGIN_DECLS -#define LDM_TYPE_LAYOUT (ldm_layout_get_type()) -#define LDM_LAYOUT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), LDM_TYPE_LAYOUT, LdmLayout)); -#define LDM_LAYOUT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), LDM_TYPE_LAYOUT, LdmLayoutClass)) -#define LDM_IS_LAYOUT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), LDM_TYPE_LAYOUT)) -#define LDM_IS_LAYOUT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LDM_TYPE_LAYOUT)) -#define LDM_LAYOUT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), LDM_TYPE_LAYOUT, LdmLayoutClass)) +#define LIGHTDM_TYPE_LAYOUT (lightdm_layout_get_type()) +#define LIGHTDM_LAYOUT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), LIGHTDM_TYPE_LAYOUT, LightDMLayout)); +#define LIGHTDM_LAYOUT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), LIGHTDM_TYPE_LAYOUT, LightDMLayoutClass)) +#define LIGHTDM_IS_LAYOUT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), LIGHTDM_TYPE_LAYOUT)) +#define LIGHTDM_IS_LAYOUT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LIGHTDM_TYPE_LAYOUT)) +#define LIGHTDM_LAYOUT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), LIGHTDM_TYPE_LAYOUT, LightDMLayoutClass)) typedef struct { GObject parent_instance; -} LdmLayout; +} LightDMLayout; typedef struct { GObjectClass parent_class; -} LdmLayoutClass; +} LightDMLayoutClass; -GType ldm_layout_get_type (void); +GType lightdm_layout_get_type (void); -LdmLayout *ldm_layout_new (const gchar *name, const gchar *short_description, const gchar *description); +LightDMLayout *lightdm_layout_new (const gchar *name, const gchar *short_description, const gchar *description); -const gchar *ldm_layout_get_name (LdmLayout *layout); +const gchar *lightdm_layout_get_name (LightDMLayout *layout); -const gchar *ldm_layout_get_short_description (LdmLayout *layout); +const gchar *lightdm_layout_get_short_description (LightDMLayout *layout); -const gchar *ldm_layout_get_description (LdmLayout *layout); +const gchar *lightdm_layout_get_description (LightDMLayout *layout); G_END_DECLS -#endif /* _LDM_LAYOUT_H_ */ +#endif /* _LIGHTDM_LAYOUT_H_ */ diff --git a/liblightdm-gobject/lightdm/session.h b/liblightdm-gobject/lightdm/session.h index 72456748..c0bede7e 100644 --- a/liblightdm-gobject/lightdm/session.h +++ b/liblightdm-gobject/lightdm/session.h @@ -9,40 +9,40 @@ * license. */ -#ifndef _LDM_SESSION_H_ -#define _LDM_SESSION_H_ +#ifndef _LIGHTDM_SESSION_H_ +#define _LIGHTDM_SESSION_H_ #include <glib-object.h> G_BEGIN_DECLS -#define LDM_TYPE_SESSION (ldm_session_get_type()) -#define LDM_SESSION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), LDM_TYPE_SESSION, LdmSession)); -#define LDM_SESSION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), LDM_TYPE_SESSION, LdmSessionClass)) -#define LDM_IS_SESSION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), LDM_TYPE_SESSION)) -#define LDM_IS_SESSION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LDM_TYPE_SESSION)) -#define LDM_SESSION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), LDM_TYPE_SESSION, LdmSessionClass)) +#define LIGHTDM_TYPE_SESSION (lightdm_session_get_type()) +#define LIGHTDM_SESSION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), LIGHTDM_TYPE_SESSION, LightDMSession)); +#define LIGHTDM_SESSION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), LIGHTDM_TYPE_SESSION, LightDMSessionClass)) +#define LIGHTDM_IS_SESSION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), LIGHTDM_TYPE_SESSION)) +#define LIGHTDM_IS_SESSION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LIGHTDM_TYPE_SESSION)) +#define LIGHTDM_SESSION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), LIGHTDM_TYPE_SESSION, LightDMSessionClass)) typedef struct { GObject parent_instance; -} LdmSession; +} LightDMSession; typedef struct { GObjectClass parent_class; -} LdmSessionClass; +} LightDMSessionClass; -GType ldm_session_get_type (void); +GType lightdm_session_get_type (void); -LdmSession *ldm_session_new (const gchar *key, const gchar *name, const gchar *comment); +LightDMSession *lightdm_session_new (const gchar *key, const gchar *name, const gchar *comment); -const gchar *ldm_session_get_key (LdmSession *session); +const gchar *lightdm_session_get_key (LightDMSession *session); -const gchar *ldm_session_get_name (LdmSession *session); +const gchar *lightdm_session_get_name (LightDMSession *session); -const gchar *ldm_session_get_comment (LdmSession *session); +const gchar *lightdm_session_get_comment (LightDMSession *session); G_END_DECLS -#endif /* _LDM_SESSION_H_ */ +#endif /* _LIGHTDM_SESSION_H_ */ diff --git a/liblightdm-gobject/lightdm/user.h b/liblightdm-gobject/lightdm/user.h index 0f8f31b1..1cbd371e 100644 --- a/liblightdm-gobject/lightdm/user.h +++ b/liblightdm-gobject/lightdm/user.h @@ -9,50 +9,50 @@ * license. */ -#ifndef _LDM_USER_H_ -#define _LDM_USER_H_ +#ifndef _LIGHTDM_USER_H_ +#define _LIGHTDM_USER_H_ #include <glib-object.h> G_BEGIN_DECLS -#define LDM_TYPE_USER (ldm_user_get_type()) -#define LDM_USER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), LDM_TYPE_USER, LdmUser)); -#define LDM_USER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), LDM_TYPE_USER, LdmUserClass)) -#define LDM_IS_USER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), LDM_TYPE_USER)) -#define LDM_IS_USER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LDM_TYPE_USER)) -#define LDM_USER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), LDM_TYPE_USER, LdmUserClass)) +#define LIGHTDM_TYPE_USER (lightdm_user_get_type()) +#define LIGHTDM_USER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), LIGHTDM_TYPE_USER, LightDMUser)); +#define LIGHTDM_USER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), LIGHTDM_TYPE_USER, LightDMUserClass)) +#define LIGHTDM_IS_USER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), LIGHTDM_TYPE_USER)) +#define LIGHTDM_IS_USER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LIGHTDM_TYPE_USER)) +#define LIGHTDM_USER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), LIGHTDM_TYPE_USER, LightDMUserClass)) typedef struct { GObject parent_instance; -} LdmUser; +} LightDMUser; typedef struct { GObjectClass parent_class; -} LdmUserClass; +} LightDMUserClass; -GType ldm_user_get_type (void); +GType lightdm_user_get_type (void); -const gchar *ldm_user_get_name (LdmUser *user); +const gchar *lightdm_user_get_name (LightDMUser *user); -const gchar *ldm_user_get_real_name (LdmUser *user); +const gchar *lightdm_user_get_real_name (LightDMUser *user); -const gchar *ldm_user_get_display_name (LdmUser *user); +const gchar *lightdm_user_get_display_name (LightDMUser *user); -const gchar *ldm_user_get_home_directory (LdmUser *user); +const gchar *lightdm_user_get_home_directory (LightDMUser *user); -const gchar *ldm_user_get_image (LdmUser *user); +const gchar *lightdm_user_get_image (LightDMUser *user); -const gchar *ldm_user_get_language (LdmUser *user); +const gchar *lightdm_user_get_language (LightDMUser *user); -const gchar *ldm_user_get_layout (LdmUser *user); +const gchar *lightdm_user_get_layout (LightDMUser *user); -const gchar *ldm_user_get_session (LdmUser *user); +const gchar *lightdm_user_get_session (LightDMUser *user); -gboolean ldm_user_get_logged_in (LdmUser *user); +gboolean lightdm_user_get_logged_in (LightDMUser *user); G_END_DECLS -#endif /* _LDM_USER_H_ */ +#endif /* _LIGHTDM_USER_H_ */ diff --git a/liblightdm-gobject/session.c b/liblightdm-gobject/session.c index 20f2d7a4..cbeeeea0 100644 --- a/liblightdm-gobject/session.c +++ b/liblightdm-gobject/session.c @@ -23,86 +23,86 @@ typedef struct gchar *key; gchar *name; gchar *comment; -} LdmSessionPrivate; +} LightDMSessionPrivate; -G_DEFINE_TYPE (LdmSession, ldm_session, G_TYPE_OBJECT); +G_DEFINE_TYPE (LightDMSession, lightdm_session, G_TYPE_OBJECT); -#define GET_PRIVATE(obj) G_TYPE_INSTANCE_GET_PRIVATE ((obj), LDM_TYPE_SESSION, LdmSessionPrivate) +#define GET_PRIVATE(obj) G_TYPE_INSTANCE_GET_PRIVATE ((obj), LIGHTDM_TYPE_SESSION, LightDMSessionPrivate) /** - * ldm_session_new: + * lightdm_session_new: * * Create a new session. * @key: The unique key for this session * @name: The name of this session * @comment: The comment for this session * - * Return value: the new #LdmSession + * Return value: the new #LightDMSession **/ -LdmSession * -ldm_session_new (const gchar *key, const gchar *name, const gchar *comment) +LightDMSession * +lightdm_session_new (const gchar *key, const gchar *name, const gchar *comment) { - return g_object_new (LDM_TYPE_SESSION, "key", key, "name", name, "comment", comment, NULL); + return g_object_new (LIGHTDM_TYPE_SESSION, "key", key, "name", name, "comment", comment, NULL); } /** - * ldm_session_get_key - * @session: A #LdmSession + * lightdm_session_get_key + * @session: A #LightDMSession * * Get the key for a session * * Return value: The session key **/ const gchar * -ldm_session_get_key (LdmSession *session) +lightdm_session_get_key (LightDMSession *session) { - g_return_val_if_fail (LDM_IS_SESSION (session), NULL); + g_return_val_if_fail (LIGHTDM_IS_SESSION (session), NULL); return GET_PRIVATE (session)->key; } /** - * ldm_session_get_name - * @session: A #LdmSession + * lightdm_session_get_name + * @session: A #LightDMSession * * Get the name for a session * * Return value: The session name **/ const gchar * -ldm_session_get_name (LdmSession *session) +lightdm_session_get_name (LightDMSession *session) { - g_return_val_if_fail (LDM_IS_SESSION (session), NULL); + g_return_val_if_fail (LIGHTDM_IS_SESSION (session), NULL); return GET_PRIVATE (session)->name; } /** - * ldm_session_get_comment - * @session: A #LdmSession + * lightdm_session_get_comment + * @session: A #LightDMSession * * Get the comment for a session * * Return value: The session comment **/ const gchar * -ldm_session_get_comment (LdmSession *session) +lightdm_session_get_comment (LightDMSession *session) { - g_return_val_if_fail (LDM_IS_SESSION (session), NULL); + g_return_val_if_fail (LIGHTDM_IS_SESSION (session), NULL); return GET_PRIVATE (session)->comment; } static void -ldm_session_init (LdmSession *session) +lightdm_session_init (LightDMSession *session) { } static void -ldm_session_set_property (GObject *object, +lightdm_session_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec) { - LdmSession *self = LDM_SESSION (object); - LdmSessionPrivate *priv = GET_PRIVATE (self); + LightDMSession *self = LIGHTDM_SESSION (object); + LightDMSessionPrivate *priv = GET_PRIVATE (self); switch (prop_id) { case PROP_KEY: @@ -124,24 +124,24 @@ ldm_session_set_property (GObject *object, } static void -ldm_session_get_property (GObject *object, +lightdm_session_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec) { - LdmSession *self; + LightDMSession *self; - self = LDM_SESSION (object); + self = LIGHTDM_SESSION (object); switch (prop_id) { case PROP_KEY: - g_value_set_string (value, ldm_session_get_key (self)); + g_value_set_string (value, lightdm_session_get_key (self)); break; case PROP_NAME: - g_value_set_string (value, ldm_session_get_name (self)); + g_value_set_string (value, lightdm_session_get_name (self)); break; case PROP_COMMENT: - g_value_set_string (value, ldm_session_get_comment (self)); + g_value_set_string (value, lightdm_session_get_comment (self)); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -150,14 +150,14 @@ ldm_session_get_property (GObject *object, } static void -ldm_session_class_init (LdmSessionClass *klass) +lightdm_session_class_init (LightDMSessionClass *klass) { GObjectClass *object_class = G_OBJECT_CLASS (klass); - g_type_class_add_private (klass, sizeof (LdmSessionPrivate)); + g_type_class_add_private (klass, sizeof (LightDMSessionPrivate)); - object_class->set_property = ldm_session_set_property; - object_class->get_property = ldm_session_get_property; + object_class->set_property = lightdm_session_set_property; + object_class->get_property = lightdm_session_get_property; g_object_class_install_property(object_class, PROP_KEY, diff --git a/liblightdm-gobject/user-private.h b/liblightdm-gobject/user-private.h index 0a9fbe18..4dd88afe 100644 --- a/liblightdm-gobject/user-private.h +++ b/liblightdm-gobject/user-private.h @@ -4,18 +4,18 @@ #include "lightdm/greeter.h" #include "lightdm/user.h" -LdmUser *ldm_user_new (LdmGreeter *greeter, const gchar *name, const gchar *real_name, const gchar *home_directory, const gchar *image, gboolean logged_in); +LightDMUser *lightdm_user_new (LightDMGreeter *greeter, const gchar *name, const gchar *real_name, const gchar *home_directory, const gchar *image, gboolean logged_in); -gboolean ldm_user_update (LdmUser *user, const gchar *real_name, const gchar *home_directory, const gchar *image, gboolean logged_in); +gboolean lightdm_user_update (LightDMUser *user, const gchar *real_name, const gchar *home_directory, const gchar *image, gboolean logged_in); -void ldm_user_set_name (LdmUser *user, const gchar *name); +void lightdm_user_set_name (LightDMUser *user, const gchar *name); -void ldm_user_set_real_name (LdmUser *user, const gchar *real_name); +void lightdm_user_set_real_name (LightDMUser *user, const gchar *real_name); -void ldm_user_set_home_directory (LdmUser *user, const gchar *home_directory); +void lightdm_user_set_home_directory (LightDMUser *user, const gchar *home_directory); -void ldm_user_set_image (LdmUser *user, const gchar *image); +void lightdm_user_set_image (LightDMUser *user, const gchar *image); -void ldm_user_set_logged_in (LdmUser *user, gboolean logged_in); +void lightdm_user_set_logged_in (LightDMUser *user, gboolean logged_in); #endif /* _LDM_USER_PRIVATE_H_ */ diff --git a/liblightdm-gobject/user.c b/liblightdm-gobject/user.c index 7da0547d..7c81c1f4 100644 --- a/liblightdm-gobject/user.c +++ b/liblightdm-gobject/user.c @@ -27,7 +27,7 @@ enum { typedef struct { - LdmGreeter *greeter; + LightDMGreeter *greeter; gchar *name; gchar *real_name; @@ -39,14 +39,14 @@ typedef struct gchar *language; gchar *layout; gchar *session; -} LdmUserPrivate; +} LightDMUserPrivate; -G_DEFINE_TYPE (LdmUser, ldm_user, G_TYPE_OBJECT); +G_DEFINE_TYPE (LightDMUser, lightdm_user, G_TYPE_OBJECT); -#define GET_PRIVATE(obj) G_TYPE_INSTANCE_GET_PRIVATE ((obj), LDM_TYPE_USER, LdmUserPrivate) +#define GET_PRIVATE(obj) G_TYPE_INSTANCE_GET_PRIVATE ((obj), LIGHTDM_TYPE_USER, LightDMUserPrivate) /** - * ldm_user_new: + * lightdm_user_new: * * Create a new user. * @greeter: The greeter the user is connected to @@ -56,18 +56,18 @@ G_DEFINE_TYPE (LdmUser, ldm_user, G_TYPE_OBJECT); * @image: The image URI * @logged_in: #TRUE if this user is currently logged in * - * Return value: the new #LdmUser + * Return value: the new #LightDMUser **/ -LdmUser * -ldm_user_new (LdmGreeter *greeter, const gchar *name, const gchar *real_name, const gchar *home_directory, const gchar *image, gboolean logged_in) +LightDMUser * +lightdm_user_new (LightDMGreeter *greeter, const gchar *name, const gchar *real_name, const gchar *home_directory, const gchar *image, gboolean logged_in) { - return g_object_new (LDM_TYPE_USER, "greeter", greeter, "name", name, "real-name", real_name, "home-directory", home_directory, "image", image, "logged-in", logged_in, NULL); + return g_object_new (LIGHTDM_TYPE_USER, "greeter", greeter, "name", name, "real-name", real_name, "home-directory", home_directory, "image", image, "logged-in", logged_in, NULL); } gboolean -ldm_user_update (LdmUser *user, const gchar *real_name, const gchar *home_directory, const gchar *image, gboolean logged_in) +lightdm_user_update (LightDMUser *user, const gchar *real_name, const gchar *home_directory, const gchar *image, gboolean logged_in) { - LdmUserPrivate *priv = GET_PRIVATE (user); + LightDMUserPrivate *priv = GET_PRIVATE (user); if (g_strcmp0 (priv->real_name, real_name) == 0 && g_strcmp0 (priv->home_directory, home_directory) == 0 && @@ -87,26 +87,26 @@ ldm_user_update (LdmUser *user, const gchar *real_name, const gchar *home_direct } /** - * ldm_user_get_name: - * @user: A #LdmUser + * lightdm_user_get_name: + * @user: A #LightDMUser * * Get the name of a user. * * Return value: The name of the given user **/ const gchar * -ldm_user_get_name (LdmUser *user) +lightdm_user_get_name (LightDMUser *user) { - g_return_val_if_fail (LDM_IS_USER (user), NULL); + g_return_val_if_fail (LIGHTDM_IS_USER (user), NULL); return GET_PRIVATE (user)->name; } void -ldm_user_set_name (LdmUser *user, const gchar *name) +lightdm_user_set_name (LightDMUser *user, const gchar *name) { - LdmUserPrivate *priv; + LightDMUserPrivate *priv; - g_return_if_fail (LDM_IS_USER (user)); + g_return_if_fail (LIGHTDM_IS_USER (user)); priv = GET_PRIVATE (user); g_free (priv->name); @@ -114,26 +114,26 @@ ldm_user_set_name (LdmUser *user, const gchar *name) } /** - * ldm_user_get_real_name: - * @user: A #LdmUser + * lightdm_user_get_real_name: + * @user: A #LightDMUser * * Get the real name of a user. * * Return value: The real name of the given user (may be blank) **/ const gchar * -ldm_user_get_real_name (LdmUser *user) +lightdm_user_get_real_name (LightDMUser *user) { - g_return_val_if_fail (LDM_IS_USER (user), NULL); + g_return_val_if_fail (LIGHTDM_IS_USER (user), NULL); return GET_PRIVATE (user)->real_name; } void -ldm_user_set_real_name (LdmUser *user, const gchar *real_name) +lightdm_user_set_real_name (LightDMUser *user, const gchar *real_name) { - LdmUserPrivate *priv; + LightDMUserPrivate *priv; - g_return_if_fail (LDM_IS_USER (user)); + g_return_if_fail (LIGHTDM_IS_USER (user)); priv = GET_PRIVATE (user); g_free (priv->real_name); @@ -141,19 +141,19 @@ ldm_user_set_real_name (LdmUser *user, const gchar *real_name) } /** - * ldm_user_get_display_name: - * @user: A #LdmUser + * lightdm_user_get_display_name: + * @user: A #LightDMUser * * Get the display name of a user. * * Return value: The display name of the given user **/ const gchar * -ldm_user_get_display_name (LdmUser *user) +lightdm_user_get_display_name (LightDMUser *user) { - LdmUserPrivate *priv; + LightDMUserPrivate *priv; - g_return_val_if_fail (LDM_IS_USER (user), NULL); + g_return_val_if_fail (LIGHTDM_IS_USER (user), NULL); priv = GET_PRIVATE (user); if (priv->real_name) @@ -163,26 +163,26 @@ ldm_user_get_display_name (LdmUser *user) } /** - * ldm_user_get_home_directory: - * @user: A #LdmUser + * lightdm_user_get_home_directory: + * @user: A #LightDMUser * * Get the home directory for a user. * * Return value: The users home directory */ const gchar * -ldm_user_get_home_directory (LdmUser *user) +lightdm_user_get_home_directory (LightDMUser *user) { - g_return_val_if_fail (LDM_IS_USER (user), NULL); + g_return_val_if_fail (LIGHTDM_IS_USER (user), NULL); return GET_PRIVATE (user)->home_directory; } void -ldm_user_set_home_directory (LdmUser *user, const gchar *home_directory) +lightdm_user_set_home_directory (LightDMUser *user, const gchar *home_directory) { - LdmUserPrivate *priv; + LightDMUserPrivate *priv; - g_return_if_fail (LDM_IS_USER (user)); + g_return_if_fail (LIGHTDM_IS_USER (user)); priv = GET_PRIVATE (user); g_free (priv->home_directory); @@ -190,26 +190,26 @@ ldm_user_set_home_directory (LdmUser *user, const gchar *home_directory) } /** - * ldm_user_get_image: - * @user: A #LdmUser + * lightdm_user_get_image: + * @user: A #LightDMUser * * Get the image URI for a user. * * Return value: The image URI for the given user or #NULL if no URI **/ const gchar * -ldm_user_get_image (LdmUser *user) +lightdm_user_get_image (LightDMUser *user) { - g_return_val_if_fail (LDM_IS_USER (user), NULL); + g_return_val_if_fail (LIGHTDM_IS_USER (user), NULL); return GET_PRIVATE (user)->image; } void -ldm_user_set_image (LdmUser *user, const gchar *image) +lightdm_user_set_image (LightDMUser *user, const gchar *image) { - LdmUserPrivate *priv; + LightDMUserPrivate *priv; - g_return_if_fail (LDM_IS_USER (user)); + g_return_if_fail (LIGHTDM_IS_USER (user)); priv = GET_PRIVATE (user); g_free (priv->image); @@ -217,9 +217,9 @@ ldm_user_set_image (LdmUser *user, const gchar *image) } static void -load_dmrc (LdmUser *user) +load_dmrc (LightDMUser *user) { - LdmUserPrivate *priv = GET_PRIVATE (user); + LightDMUserPrivate *priv = GET_PRIVATE (user); gchar *path; gboolean have_dmrc; @@ -241,107 +241,107 @@ load_dmrc (LdmUser *user) } /** - * ldm_user_get_language - * @user: A #LdmUser + * lightdm_user_get_language + * @user: A #LightDMUser * * Get the language for a user. * * Return value: The language for the given user or #NULL if using system defaults. **/ const gchar * -ldm_user_get_language (LdmUser *user) +lightdm_user_get_language (LightDMUser *user) { - g_return_val_if_fail (LDM_IS_USER (user), NULL); + g_return_val_if_fail (LIGHTDM_IS_USER (user), NULL); load_dmrc (user); return GET_PRIVATE (user)->language; } /** - * ldm_user_get_layout - * @user: A #LdmUser + * lightdm_user_get_layout + * @user: A #LightDMUser * * Get the keyboard layout for a user. * * Return value: The keyboard layoyt for the given user or #NULL if using system defaults. **/ const gchar * -ldm_user_get_layout (LdmUser *user) +lightdm_user_get_layout (LightDMUser *user) { - g_return_val_if_fail (LDM_IS_USER (user), NULL); + g_return_val_if_fail (LIGHTDM_IS_USER (user), NULL); load_dmrc (user); return GET_PRIVATE (user)->layout; } /** - * ldm_user_get_session - * @user: A #LdmUser + * lightdm_user_get_session + * @user: A #LightDMUser * * Get the session for a user. * * Return value: The session for the given user or #NULL if using system defaults. **/ const gchar * -ldm_user_get_session (LdmUser *user) +lightdm_user_get_session (LightDMUser *user) { - g_return_val_if_fail (LDM_IS_USER (user), NULL); + g_return_val_if_fail (LIGHTDM_IS_USER (user), NULL); load_dmrc (user); return GET_PRIVATE (user)->session; } /** - * ldm_user_get_logged_in: - * @user: A #LdmUser + * lightdm_user_get_logged_in: + * @user: A #LightDMUser * * Check if a user is logged in. * * Return value: #TRUE if the user is currently logged in. **/ gboolean -ldm_user_get_logged_in (LdmUser *user) +lightdm_user_get_logged_in (LightDMUser *user) { - g_return_val_if_fail (LDM_IS_USER (user), FALSE); + g_return_val_if_fail (LIGHTDM_IS_USER (user), FALSE); return GET_PRIVATE (user)->logged_in; } void -ldm_user_set_logged_in (LdmUser *user, gboolean logged_in) +lightdm_user_set_logged_in (LightDMUser *user, gboolean logged_in) { - g_return_if_fail (LDM_IS_USER (user)); + g_return_if_fail (LIGHTDM_IS_USER (user)); GET_PRIVATE (user)->logged_in = logged_in; } static void -ldm_user_init (LdmUser *user) +lightdm_user_init (LightDMUser *user) { } static void -ldm_user_set_property (GObject *object, +lightdm_user_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec) { - LdmUser *self = LDM_USER (object); - LdmUserPrivate *priv = GET_PRIVATE (self); + LightDMUser *self = LIGHTDM_USER (object); + LightDMUserPrivate *priv = GET_PRIVATE (self); switch (prop_id) { case PROP_GREETER: priv->greeter = g_object_ref (g_value_get_object (value)); break; case PROP_NAME: - ldm_user_set_name (self, g_value_get_string (value)); + lightdm_user_set_name (self, g_value_get_string (value)); break; case PROP_REAL_NAME: - ldm_user_set_real_name (self, g_value_get_string (value)); + lightdm_user_set_real_name (self, g_value_get_string (value)); break; case PROP_HOME_DIRECTORY: - ldm_user_set_home_directory (self, g_value_get_string (value)); + lightdm_user_set_home_directory (self, g_value_get_string (value)); break; case PROP_IMAGE: - ldm_user_set_image (self, g_value_get_string (value)); + lightdm_user_set_image (self, g_value_get_string (value)); break; case PROP_LOGGED_IN: - ldm_user_set_logged_in (self, g_value_get_boolean (value)); + lightdm_user_set_logged_in (self, g_value_get_boolean (value)); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -350,42 +350,42 @@ ldm_user_set_property (GObject *object, } static void -ldm_user_get_property (GObject *object, +lightdm_user_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec) { - LdmUser *self; + LightDMUser *self; - self = LDM_USER (object); + self = LIGHTDM_USER (object); switch (prop_id) { case PROP_NAME: - g_value_set_string (value, ldm_user_get_name (self)); + g_value_set_string (value, lightdm_user_get_name (self)); break; case PROP_REAL_NAME: - g_value_set_string (value, ldm_user_get_real_name (self)); + g_value_set_string (value, lightdm_user_get_real_name (self)); break; case PROP_DISPLAY_NAME: - g_value_set_string (value, ldm_user_get_display_name (self)); + g_value_set_string (value, lightdm_user_get_display_name (self)); break; case PROP_HOME_DIRECTORY: - g_value_set_string (value, ldm_user_get_home_directory (self)); + g_value_set_string (value, lightdm_user_get_home_directory (self)); break; case PROP_IMAGE: - g_value_set_string (value, ldm_user_get_image (self)); + g_value_set_string (value, lightdm_user_get_image (self)); break; case PROP_LANGUAGE: - g_value_set_string (value, ldm_user_get_language (self)); + g_value_set_string (value, lightdm_user_get_language (self)); break; case PROP_LAYOUT: - g_value_set_string (value, ldm_user_get_layout (self)); + g_value_set_string (value, lightdm_user_get_layout (self)); break; case PROP_SESSION: - g_value_set_string (value, ldm_user_get_session (self)); + g_value_set_string (value, lightdm_user_get_session (self)); break; case PROP_LOGGED_IN: - g_value_set_boolean (value, ldm_user_get_logged_in (self)); + g_value_set_boolean (value, lightdm_user_get_logged_in (self)); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -394,10 +394,10 @@ ldm_user_get_property (GObject *object, } static void -ldm_user_finalize (GObject *object) +lightdm_user_finalize (GObject *object) { - LdmUser *self = LDM_USER (object); - LdmUserPrivate *priv = GET_PRIVATE (self); + LightDMUser *self = LIGHTDM_USER (object); + LightDMUserPrivate *priv = GET_PRIVATE (self); g_free (priv->name); g_free (priv->real_name); @@ -408,22 +408,22 @@ ldm_user_finalize (GObject *object) } static void -ldm_user_class_init (LdmUserClass *klass) +lightdm_user_class_init (LightDMUserClass *klass) { GObjectClass *object_class = G_OBJECT_CLASS (klass); - g_type_class_add_private (klass, sizeof (LdmUserPrivate)); + g_type_class_add_private (klass, sizeof (LightDMUserPrivate)); - object_class->set_property = ldm_user_set_property; - object_class->get_property = ldm_user_get_property; - object_class->finalize = ldm_user_finalize; + object_class->set_property = lightdm_user_set_property; + object_class->get_property = lightdm_user_get_property; + object_class->finalize = lightdm_user_finalize; g_object_class_install_property(object_class, PROP_GREETER, g_param_spec_object("greeter", "greeter", "Greeter", - LDM_TYPE_GREETER, + LIGHTDM_TYPE_GREETER, G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); g_object_class_install_property(object_class, PROP_NAME, diff --git a/tests/src/test-gobject-greeter.c b/tests/src/test-gobject-greeter.c index 73124e51..7274e688 100644 --- a/tests/src/test-gobject-greeter.c +++ b/tests/src/test-gobject-greeter.c @@ -10,7 +10,7 @@ static xcb_connection_t *connection = NULL; static GKeyFile *config; static void -connected_cb (LdmGreeter *greeter) +connected_cb (LightDMGreeter *greeter) { gchar *login_lock; FILE *f; @@ -26,10 +26,10 @@ connected_cb (LdmGreeter *greeter) } /* Automatically log in as requested user */ - if (ldm_greeter_get_select_user_hint (greeter)) + if (lightdm_greeter_get_select_user_hint (greeter)) { - notify_status ("GREETER LOGIN-SELECTED USERNAME=%s", ldm_greeter_get_select_user_hint (greeter)); - ldm_greeter_login (greeter, ldm_greeter_get_select_user_hint (greeter)); + notify_status ("GREETER LOGIN-SELECTED USERNAME=%s", lightdm_greeter_get_select_user_hint (greeter)); + lightdm_greeter_login (greeter, lightdm_greeter_get_select_user_hint (greeter)); return; } @@ -40,12 +40,12 @@ connected_cb (LdmGreeter *greeter) if (g_key_file_get_boolean (config, "test-greeter-config", "login-guest", NULL)) { notify_status ("GREETER LOGIN-GUEST"); - ldm_greeter_login_as_guest (greeter); + lightdm_greeter_login_as_guest (greeter); } else if (g_key_file_get_boolean (config, "test-greeter-config", "prompt-username", NULL)) { notify_status ("GREETER LOGIN"); - ldm_greeter_login (greeter, NULL); + lightdm_greeter_login (greeter, NULL); } else { @@ -56,7 +56,7 @@ connected_cb (LdmGreeter *greeter) return; notify_status ("GREETER LOGIN USERNAME=%s", username); - ldm_greeter_login (greeter, username); + lightdm_greeter_login (greeter, username); g_free (username); } @@ -72,13 +72,13 @@ connected_cb (LdmGreeter *greeter) } static void -show_message_cb (LdmGreeter *greeter, const gchar *text, LdmMessageType type) +show_message_cb (LightDMGreeter *greeter, const gchar *text, LightDMMessageType type) { notify_status ("GREETER SHOW-MESSAGE TEXT=\"%s\"", text); } static void -show_prompt_cb (LdmGreeter *greeter, const gchar *text, LdmPromptType type) +show_prompt_cb (LightDMGreeter *greeter, const gchar *text, LightDMPromptType type) { gchar *username, *password, *response = NULL; @@ -98,7 +98,7 @@ show_prompt_cb (LdmGreeter *greeter, const gchar *text, LdmPromptType type) if (response) { notify_status ("GREETER RESPOND TEXT=\"%s\"", response); - ldm_greeter_respond (greeter, response); + lightdm_greeter_respond (greeter, response); } g_free (username); @@ -106,21 +106,21 @@ show_prompt_cb (LdmGreeter *greeter, const gchar *text, LdmPromptType type) } static void -authentication_complete_cb (LdmGreeter *greeter) +authentication_complete_cb (LightDMGreeter *greeter) { - notify_status ("GREETER AUTHENTICATION-COMPLETE AUTHENTICATED=%s", ldm_greeter_get_is_authenticated (greeter) ? "TRUE" : "FALSE"); - if (ldm_greeter_get_is_authenticated (greeter)) - ldm_greeter_start_default_session (greeter); + notify_status ("GREETER AUTHENTICATION-COMPLETE AUTHENTICATED=%s", lightdm_greeter_get_is_authenticated (greeter) ? "TRUE" : "FALSE"); + if (lightdm_greeter_get_is_authenticated (greeter)) + lightdm_greeter_start_default_session (greeter); } static void -session_failed_cb (LdmGreeter *greeter) +session_failed_cb (LightDMGreeter *greeter) { notify_status ("GREETER SESSION-FAILED"); } static void -quit_cb (LdmGreeter *greeter) +quit_cb (LightDMGreeter *greeter) { notify_status ("GREETER QUIT"); exit (EXIT_SUCCESS); @@ -136,7 +136,7 @@ signal_cb (int signum) int main (int argc, char **argv) { - LdmGreeter *greeter; + LightDMGreeter *greeter; signal (SIGINT, signal_cb); signal (SIGTERM, signal_cb); @@ -159,7 +159,7 @@ main (int argc, char **argv) notify_status ("GREETER CONNECT-XSERVER %s", getenv ("DISPLAY")); - greeter = ldm_greeter_new (); + greeter = lightdm_greeter_new (); g_signal_connect (greeter, "connected", G_CALLBACK (connected_cb), NULL); g_signal_connect (greeter, "show-message", G_CALLBACK (show_message_cb), NULL); g_signal_connect (greeter, "show-prompt", G_CALLBACK (show_prompt_cb), NULL); @@ -168,7 +168,7 @@ main (int argc, char **argv) g_signal_connect (greeter, "quit", G_CALLBACK (quit_cb), NULL); notify_status ("GREETER CONNECT-TO-DAEMON"); - ldm_greeter_connect_to_server (greeter); + lightdm_greeter_connect_to_server (greeter); g_main_loop_run (g_main_loop_new (NULL, FALSE)); |