diff options
| -rw-r--r-- | .gitignore | 8 | ||||
| -rw-r--r-- | configure.ac | 10 | ||||
| -rw-r--r-- | gui/Makefile.am | 4 | ||||
| -rw-r--r-- | gui/libgdm/Makefile.am (renamed from gui/libgdmgreeter/Makefile.am) | 54 | ||||
| -rw-r--r-- | gui/libgdm/gdm-client.c (renamed from gui/libgdmgreeter/gdm-greeter-client.c) | 286 | ||||
| -rw-r--r-- | gui/libgdm/gdm-client.h | 123 | ||||
| -rw-r--r-- | gui/libgdm/gdm-sessions.c (renamed from gui/libgdmgreeter/gdm-greeter-sessions.c) | 14 | ||||
| -rw-r--r-- | gui/libgdm/gdm-sessions.h (renamed from gui/libgdmgreeter/gdm-greeter-sessions.h) | 6 | ||||
| -rw-r--r-- | gui/libgdm/gdm.pc.in (renamed from gui/libgdmgreeter/gdmgreeter.pc.in) | 0 | ||||
| -rw-r--r-- | gui/libgdmgreeter/gdm-greeter-client.h | 124 |
10 files changed, 314 insertions, 315 deletions
@@ -126,10 +126,10 @@ docs/gdm-oc.omf docs/gdm-ru.omf docs/gdm-sv.omf docs/gdm-uk.omf -gui/libgdmgreeter/gdm-client-glue.h -gui/libgdmgreeter/gdm-client-glue.c -gui/libgdmgreeter/gdm-manager-glue.h -gui/libgdmgreeter/gdm-manager-glue.c +gui/libgdm/gdm-client-glue.h +gui/libgdm/gdm-client-glue.c +gui/libgdm/gdm-manager-glue.h +gui/libgdm/gdm-manager-glue.c gui/simple-chooser/gdm-host-chooser gui/simple-chooser/gdm-simple-chooser gui/simple-greeter/gdm-simple-greeter diff --git a/configure.ac b/configure.ac index e53f684d..df47e46e 100644 --- a/configure.ac +++ b/configure.ac @@ -182,10 +182,10 @@ PKG_CHECK_MODULES(CHECK, have_check=no) AM_CONDITIONAL([HAVE_CHECK],[test "x$CHECK_CFLAGS" != "x"]) -PKG_CHECK_MODULES(LIBGDMGREETER, glib-2.0 gio-2.0 gio-unix-2.0); +PKG_CHECK_MODULES(LIBGDM, glib-2.0 gio-2.0 gio-unix-2.0); GOBJECT_INTROSPECTION_CHECK([0.9.12]) -LIBGDMGREETER_GIR_INCLUDES="GLib-2.0 GObject-2.0 Gio-2.0" -AC_SUBST(LIBGDMGREETER_GIR_INCLUDES) +LIBGDM_GIR_INCLUDES="GLib-2.0 GObject-2.0 Gio-2.0" +AC_SUBST(LIBGDM_GIR_INCLUDES) dnl --------------------------------------------------------------------------- dnl - Configuration file stuff @@ -1507,8 +1507,8 @@ Makefile daemon/Makefile docs/Makefile gui/Makefile -gui/libgdmgreeter/Makefile -gui/libgdmgreeter/gdmgreeter.pc +gui/libgdm/Makefile +gui/libgdm/gdm.pc gui/simple-greeter/Makefile gui/simple-greeter/libgdmsimplegreeter/Makefile gui/simple-greeter/libgdmsimplegreeter/gdmsimplegreeter.pc diff --git a/gui/Makefile.am b/gui/Makefile.am index ff8a039d..ce900551 100644 --- a/gui/Makefile.am +++ b/gui/Makefile.am @@ -1,7 +1,7 @@ NULL = SUBDIRS = \ - libgdmgreeter \ + libgdm \ simple-greeter \ $(NULL) @@ -10,7 +10,7 @@ SUBDIRS += simple-chooser endif DIST_SUBDIRS = \ - libgdmgreeter \ + libgdm \ simple-chooser \ simple-greeter \ $(NULL) diff --git a/gui/libgdmgreeter/Makefile.am b/gui/libgdm/Makefile.am index 13cc9e36..24901ddc 100644 --- a/gui/libgdmgreeter/Makefile.am +++ b/gui/libgdm/Makefile.am @@ -41,35 +41,35 @@ AM_CPPFLAGS = \ $(END_OF_LIST) lib_LTLIBRARIES = \ - libgdmgreeter.la \ + libgdm.la \ $(END_OF_LIST) -libgdmgreeterdir = $(includedir)/gdm -libgdmgreeter_HEADERS = \ - gdm-greeter-client.h \ - gdm-greeter-sessions.h \ +libgdmdir = $(includedir)/gdm +libgdm_HEADERS = \ + gdm-client.h \ + gdm-sessions.h \ $(END_OF_LIST) -libgdmgreeter_la_CFLAGS = \ - $(LIBGDMGREETER_CFLAGS) \ +libgdm_la_CFLAGS = \ + $(LIBGDM_CFLAGS) \ $(END_OF_LIST) -libgdmgreeter_la_LDFLAGS = \ +libgdm_la_LDFLAGS = \ -export-symbols-regex '^[^_].*' \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ -no-undefined \ $(END_OF_LIST) -libgdmgreeter_la_LIBADD = \ - $(LIBGDMGREETER_LIBS) \ +libgdm_la_LIBADD = \ + $(LIBGDM_LIBS) \ $(END_OF_LIST) -libgdmgreeter_la_SOURCES = \ - $(libgdmgreeter_HEADERS) \ - gdm-greeter-client.c \ - gdm-greeter-sessions.c \ +libgdm_la_SOURCES = \ + $(libgdm_HEADERS) \ + gdm-client.c \ + gdm-sessions.c \ $(END_OF_LIST) -nodist_libgdmgreeter_la_SOURCES = \ +nodist_libgdm_la_SOURCES = \ gdm-client-glue.c \ gdm-client-glue.h \ gdm-manager-glue.c \ @@ -77,36 +77,36 @@ nodist_libgdmgreeter_la_SOURCES = \ $(END_OF_LIST) pkgconfigdir = $(libdir)/pkgconfig -dist_pkgconfig_DATA = gdmgreeter.pc +dist_pkgconfig_DATA = gdm.pc -include $(INTROSPECTION_MAKEFILE) if HAVE_INTROSPECTION girdir = $(datadir)/gir-1.0 -gir_DATA = GdmGreeter-1.0.gir +gir_DATA = Gdm-1.0.gir typelibsdir = $(libdir)/girepository-1.0 typelibs_DATA = $(gir_DATA:.gir=.typelib) INTROSPECTION_GIRS = $(gir_DATA) -GdmGreeter-1.0.gir: \ +Gdm-1.0.gir: \ $(INTROSPECTION_SCANNER) \ - libgdmgreeter.la \ + libgdm.la \ Makefile \ $(END_OF_LIST) -GdmGreeter_1_0_gir_SCANNERFLAGS = \ +Gdm_1_0_gir_SCANNERFLAGS = \ --warn-all \ - --namespace=GdmGreeter \ + --namespace=Gdm \ --identifier-prefix Gdm \ $(AM_CPPFLAGS) \ - $(libgdmgreeter_la_CFLAGS) \ + $(libgdm_la_CFLAGS) \ $(END_OF_LIST) -GdmGreeter_1_0_gir_INCLUDES = $(LIBGDMGREETER_GIR_INCLUDES) -GdmGreeter_1_0_gir_LIBS = libgdmgreeter.la -GdmGreeter_1_0_gir_FILES = \ - $(filter-out %-private.h, $(libgdmgreeter_la_SOURCES)) \ - $(filter-out %-private.h, $(nodist_libgdmgreeter_la_SOURCES)) \ +Gdm_1_0_gir_INCLUDES = $(LIBGDM_GIR_INCLUDES) +Gdm_1_0_gir_LIBS = libgdm.la +Gdm_1_0_gir_FILES = \ + $(filter-out %-private.h, $(libgdm_la_SOURCES)) \ + $(filter-out %-private.h, $(nodist_libgdm_la_SOURCES)) \ $(END_OF_LIST) CLEANFILES += $(gir_DATA) $(typelibs_DATA) diff --git a/gui/libgdmgreeter/gdm-greeter-client.c b/gui/libgdm/gdm-client.c index effb5d08..c1757c2c 100644 --- a/gui/libgdmgreeter/gdm-greeter-client.c +++ b/gui/libgdm/gdm-client.c @@ -30,15 +30,15 @@ #include <glib/gi18n.h> #include <glib-object.h> -#include "gdm-greeter-client.h" +#include "gdm-client.h" #include "gdm-client-glue.h" #include "gdm-manager-glue.h" -#define GDM_GREETER_CLIENT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GDM_TYPE_GREETER_CLIENT, GdmGreeterClientPrivate)) +#define GDM_CLIENT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GDM_TYPE_CLIENT, GdmClientPrivate)) #define SESSION_DBUS_PATH "/org/gnome/DisplayManager/Session" -struct GdmGreeterClientPrivate +struct GdmClientPrivate { GdmManager *manager; GdmUserVerifier *user_verifier; @@ -51,21 +51,21 @@ struct GdmGreeterClientPrivate GList *pending_opens; }; -static void gdm_greeter_client_class_init (GdmGreeterClientClass *klass); -static void gdm_greeter_client_init (GdmGreeterClient *client); -static void gdm_greeter_client_finalize (GObject *object); +static void gdm_client_class_init (GdmClientClass *klass); +static void gdm_client_init (GdmClient *client); +static void gdm_client_finalize (GObject *object); -G_DEFINE_TYPE (GdmGreeterClient, gdm_greeter_client, G_TYPE_OBJECT); +G_DEFINE_TYPE (GdmClient, gdm_client, G_TYPE_OBJECT); static gpointer client_object = NULL; GQuark -gdm_greeter_client_error_quark (void) +gdm_client_error_quark (void) { static GQuark error_quark = 0; if (error_quark == 0) - error_quark = g_quark_from_static_string ("gdm-greeter-client"); + error_quark = g_quark_from_static_string ("gdm-client"); return error_quark; } @@ -75,11 +75,11 @@ on_got_manager (GdmManager *manager, GAsyncResult *result, GSimpleAsyncResult *operation_result) { - GdmGreeterClient *client; + GdmClient *client; GdmManager *new_manager; GError *error; - client = GDM_GREETER_CLIENT (g_async_result_get_source_object (G_ASYNC_RESULT (operation_result))); + client = GDM_CLIENT (g_async_result_get_source_object (G_ASYNC_RESULT (operation_result))); error = NULL; new_manager = gdm_manager_proxy_new_finish (result, &error); @@ -107,7 +107,7 @@ on_got_manager (GdmManager *manager, } static void -get_manager (GdmGreeterClient *client, +get_manager (GdmClient *client, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data) @@ -218,7 +218,7 @@ on_reauthentication_channel_opened (GdmManager *manager, } static void -on_got_manager_for_reauthentication (GdmGreeterClient *client, +on_got_manager_for_reauthentication (GdmClient *client, GAsyncResult *result, GSimpleAsyncResult *operation_result) { @@ -246,13 +246,13 @@ on_got_manager_for_reauthentication (GdmGreeterClient *client, } static gboolean -gdm_greeter_client_open_connection_sync (GdmGreeterClient *client, +gdm_client_open_connection_sync (GdmClient *client, GCancellable *cancellable, GError **error) { gboolean ret; - g_return_val_if_fail (GDM_IS_GREETER_CLIENT (client), FALSE); + g_return_val_if_fail (GDM_IS_CLIENT (client), FALSE); if (client->priv->manager == NULL) { client->priv->manager = gdm_manager_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM, @@ -280,7 +280,7 @@ gdm_greeter_client_open_connection_sync (GdmGreeterClient *client, goto out; } - g_debug ("GdmGreeterClient: connecting to address: %s", client->priv->address); + g_debug ("GdmClient: connecting to address: %s", client->priv->address); client->priv->connection = g_dbus_connection_new_for_address_sync (client->priv->address, G_DBUS_CONNECTION_FLAGS_AUTHENTICATION_CLIENT, @@ -328,11 +328,11 @@ on_session_opened (GdmManager *manager, GAsyncResult *result, GSimpleAsyncResult *operation_result) { - GdmGreeterClient *client; + GdmClient *client; GCancellable *cancellable; GError *error; - client = GDM_GREETER_CLIENT (g_async_result_get_source_object (G_ASYNC_RESULT (operation_result))); + client = GDM_CLIENT (g_async_result_get_source_object (G_ASYNC_RESULT (operation_result))); error = NULL; if (!gdm_manager_call_open_session_finish (manager, @@ -355,7 +355,7 @@ on_session_opened (GdmManager *manager, } static void -on_got_manager_for_opening_connection (GdmGreeterClient *client, +on_got_manager_for_opening_connection (GdmClient *client, GAsyncResult *result, GSimpleAsyncResult *operation_result) { @@ -379,7 +379,7 @@ on_got_manager_for_opening_connection (GdmGreeterClient *client, } static void -finish_pending_opens (GdmGreeterClient *client, +finish_pending_opens (GdmClient *client, GError *error) { GList *node; @@ -399,11 +399,11 @@ finish_pending_opens (GdmGreeterClient *client, } static gboolean -gdm_greeter_client_open_connection_finish (GdmGreeterClient *client, +gdm_client_open_connection_finish (GdmClient *client, GAsyncResult *result, GError **error) { - g_return_val_if_fail (GDM_IS_GREETER_CLIENT (client), FALSE); + g_return_val_if_fail (GDM_IS_CLIENT (client), FALSE); if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (result), error)) { @@ -420,19 +420,19 @@ gdm_greeter_client_open_connection_finish (GdmGreeterClient *client, } static void -gdm_greeter_client_open_connection (GdmGreeterClient *client, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data) +gdm_client_open_connection (GdmClient *client, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) { GSimpleAsyncResult *operation_result; - g_return_if_fail (GDM_IS_GREETER_CLIENT (client)); + g_return_if_fail (GDM_IS_CLIENT (client)); operation_result = g_simple_async_result_new (G_OBJECT (client), callback, user_data, - gdm_greeter_client_open_connection); + gdm_client_open_connection); g_simple_async_result_set_check_cancellable (operation_result, cancellable); g_object_set_data (G_OBJECT (operation_result), @@ -462,8 +462,8 @@ gdm_greeter_client_open_connection (GdmGreeterClient *client, } /** - * gdm_greeter_client_open_reauthentication_channel_sync: - * @client: a #GdmGreeterClient + * gdm_client_open_reauthentication_channel_sync: + * @client: a #GdmClient * @username: user to reauthenticate * @cancellable: a #GCancellable * @error: a #GError @@ -476,7 +476,7 @@ gdm_greeter_client_open_connection (GdmGreeterClient *client, * already logged in. */ GdmUserVerifier * -gdm_greeter_client_open_reauthentication_channel_sync (GdmGreeterClient *client, +gdm_client_open_reauthentication_channel_sync (GdmClient *client, const char *username, GCancellable *cancellable, GError **error) @@ -486,7 +486,7 @@ gdm_greeter_client_open_reauthentication_channel_sync (GdmGreeterClient *cli gboolean ret; char *address; - g_return_val_if_fail (GDM_IS_GREETER_CLIENT (client), FALSE); + g_return_val_if_fail (GDM_IS_CLIENT (client), FALSE); if (client->priv->manager == NULL) { client->priv->manager = gdm_manager_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM, @@ -513,7 +513,7 @@ gdm_greeter_client_open_reauthentication_channel_sync (GdmGreeterClient *cli goto out; } - g_debug ("GdmGreeterClient: connecting to address: %s", client->priv->address); + g_debug ("GdmClient: connecting to address: %s", client->priv->address); connection = g_dbus_connection_new_for_address_sync (address, G_DBUS_CONNECTION_FLAGS_AUTHENTICATION_CLIENT, @@ -551,8 +551,8 @@ gdm_greeter_client_open_reauthentication_channel_sync (GdmGreeterClient *cli } /** - * gdm_greeter_client_open_reauthentication_channel: - * @client: a #GdmGreeterClient + * gdm_client_open_reauthentication_channel: + * @client: a #GdmClient * @username: user to reauthenticate * @callback: a #GAsyncReadyCallback to call when the request is satisfied * @user_data: The data to pass to @callback @@ -562,20 +562,20 @@ gdm_greeter_client_open_reauthentication_channel_sync (GdmGreeterClient *cli * reauthenticate an already logged in user. */ void -gdm_greeter_client_open_reauthentication_channel (GdmGreeterClient *client, - const char *username, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data) +gdm_client_open_reauthentication_channel (GdmClient *client, + const char *username, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) { GSimpleAsyncResult *operation_result; - g_return_if_fail (GDM_IS_GREETER_CLIENT (client)); + g_return_if_fail (GDM_IS_CLIENT (client)); operation_result = g_simple_async_result_new (G_OBJECT (client), callback, user_data, - gdm_greeter_client_open_reauthentication_channel); + gdm_client_open_reauthentication_channel); g_simple_async_result_set_check_cancellable (operation_result, cancellable); g_object_set_data (G_OBJECT (operation_result), "cancellable", @@ -595,24 +595,24 @@ gdm_greeter_client_open_reauthentication_channel (GdmGreeterClient *client, } /** - * gdm_greeter_client_open_reauthentication_channel_finish: - * @client: a #GdmGreeterClient + * gdm_client_open_reauthentication_channel_finish: + * @client: a #GdmClient * @result: The #GAsyncResult from the callback * @error: a #GError * * Finishes an operation started with - * gdm_greeter_client_open_reauthentication_channel(). + * gdm_client_open_reauthentication_channel(). * * Returns: (transfer full): a #GdmUserVerifier */ GdmUserVerifier * -gdm_greeter_client_open_reauthentication_channel_finish (GdmGreeterClient *client, +gdm_client_open_reauthentication_channel_finish (GdmClient *client, GAsyncResult *result, GError **error) { GdmUserVerifier *user_verifier; - g_return_val_if_fail (GDM_IS_GREETER_CLIENT (client), FALSE); + g_return_val_if_fail (GDM_IS_CLIENT (client), FALSE); if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (result), error)) { @@ -625,8 +625,8 @@ gdm_greeter_client_open_reauthentication_channel_finish (GdmGreeterClient *clie } /** - * gdm_greeter_client_get_user_verifier_sync: - * @client: a #GdmGreeterClient + * gdm_client_get_user_verifier_sync: + * @client: a #GdmClient * @cancellable: a #GCancellable * @error: a #GError * @@ -636,7 +636,7 @@ gdm_greeter_client_open_reauthentication_channel_finish (GdmGreeterClient *clie * Returns: (transfer full): #GdmUserVerifier or %NULL if not connected */ GdmUserVerifier * -gdm_greeter_client_get_user_verifier_sync (GdmGreeterClient *client, +gdm_client_get_user_verifier_sync (GdmClient *client, GCancellable *cancellable, GError **error) { @@ -644,7 +644,7 @@ gdm_greeter_client_get_user_verifier_sync (GdmGreeterClient *client, return g_object_ref (client->priv->user_verifier); } - if (!gdm_greeter_client_open_connection_sync (client, cancellable, error)) { + if (!gdm_client_open_connection_sync (client, cancellable, error)) { return NULL; } @@ -673,7 +673,7 @@ gdm_greeter_client_get_user_verifier_sync (GdmGreeterClient *client, } static void -on_connection_opened_for_user_verifier (GdmGreeterClient *client, +on_connection_opened_for_user_verifier (GdmClient *client, GAsyncResult *result, GSimpleAsyncResult *operation_result) { @@ -681,7 +681,7 @@ on_connection_opened_for_user_verifier (GdmGreeterClient *client, GError *error; error = NULL; - if (!gdm_greeter_client_open_connection_finish (client, result, &error)) { + if (!gdm_client_open_connection_finish (client, result, &error)) { g_simple_async_result_take_error (operation_result, error); g_simple_async_result_complete_in_idle (operation_result); return; @@ -699,8 +699,8 @@ on_connection_opened_for_user_verifier (GdmGreeterClient *client, } /** - * gdm_greeter_client_get_user_verifier: - * @client: a #GdmGreeterClient + * gdm_client_get_user_verifier: + * @client: a #GdmClient * @callback: a #GAsyncReadyCallback to call when the request is satisfied * @user_data: The data to pass to @callback * @cancellable: a #GCancellable @@ -709,19 +709,19 @@ on_connection_opened_for_user_verifier (GdmGreeterClient *client, * verify a user's local account. */ void -gdm_greeter_client_get_user_verifier (GdmGreeterClient *client, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data) +gdm_client_get_user_verifier (GdmClient *client, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) { GSimpleAsyncResult *operation_result; - g_return_if_fail (GDM_IS_GREETER_CLIENT (client)); + g_return_if_fail (GDM_IS_CLIENT (client)); operation_result = g_simple_async_result_new (G_OBJECT (client), callback, user_data, - gdm_greeter_client_get_user_verifier); + gdm_client_get_user_verifier); g_simple_async_result_set_check_cancellable (operation_result, cancellable); g_object_set_data (G_OBJECT (operation_result), @@ -737,7 +737,7 @@ gdm_greeter_client_get_user_verifier (GdmGreeterClient *client, return; } - gdm_greeter_client_open_connection (client, + gdm_client_open_connection (client, cancellable, (GAsyncReadyCallback) on_connection_opened_for_user_verifier, @@ -745,24 +745,24 @@ gdm_greeter_client_get_user_verifier (GdmGreeterClient *client, } /** - * gdm_greeter_client_get_user_verifier_finish: - * @client: a #GdmGreeterClient + * gdm_client_get_user_verifier_finish: + * @client: a #GdmClient * @result: The #GAsyncResult from the callback * @error: a #GError * * Finishes an operation started with - * gdm_greeter_client_get_user_verifier(). + * gdm_client_get_user_verifier(). * * Returns: (transfer full): a #GdmUserVerifier */ GdmUserVerifier * -gdm_greeter_client_get_user_verifier_finish (GdmGreeterClient *client, +gdm_client_get_user_verifier_finish (GdmClient *client, GAsyncResult *result, GError **error) { GdmUserVerifier *user_verifier; - g_return_val_if_fail (GDM_IS_GREETER_CLIENT (client), FALSE); + g_return_val_if_fail (GDM_IS_CLIENT (client), FALSE); if (client->priv->user_verifier != NULL) { return g_object_ref (client->priv->user_verifier); @@ -814,7 +814,7 @@ on_greeter_proxy_created (GdmGreeter *greeter, } static void -on_connection_opened_for_greeter (GdmGreeterClient *client, +on_connection_opened_for_greeter (GdmClient *client, GAsyncResult *result, GSimpleAsyncResult *operation_result) { @@ -822,7 +822,7 @@ on_connection_opened_for_greeter (GdmGreeterClient *client, GError *error; error = NULL; - if (!gdm_greeter_client_open_connection_finish (client, result, &error)) { + if (!gdm_client_open_connection_finish (client, result, &error)) { g_simple_async_result_take_error (operation_result, error); g_simple_async_result_complete_in_idle (operation_result); return; @@ -840,8 +840,8 @@ on_connection_opened_for_greeter (GdmGreeterClient *client, } /** - * gdm_greeter_client_get_greeter: - * @client: a #GdmGreeterClient + * gdm_client_get_greeter: + * @client: a #GdmClient * @callback: a #GAsyncReadyCallback to call when the request is satisfied * @user_data: The data to pass to @callback * @cancellable: a #GCancellable @@ -850,19 +850,19 @@ on_connection_opened_for_greeter (GdmGreeterClient *client, * verify a user's local account. */ void -gdm_greeter_client_get_greeter (GdmGreeterClient *client, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data) +gdm_client_get_greeter (GdmClient *client, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) { GSimpleAsyncResult *operation_result; - g_return_if_fail (GDM_IS_GREETER_CLIENT (client)); + g_return_if_fail (GDM_IS_CLIENT (client)); operation_result = g_simple_async_result_new (G_OBJECT (client), callback, user_data, - gdm_greeter_client_get_greeter); + gdm_client_get_greeter); g_simple_async_result_set_check_cancellable (operation_result, cancellable); g_object_set_data (G_OBJECT (operation_result), @@ -878,7 +878,7 @@ gdm_greeter_client_get_greeter (GdmGreeterClient *client, return; } - gdm_greeter_client_open_connection (client, + gdm_client_open_connection (client, cancellable, (GAsyncReadyCallback) on_connection_opened_for_greeter, @@ -886,24 +886,24 @@ gdm_greeter_client_get_greeter (GdmGreeterClient *client, } /** - * gdm_greeter_client_get_greeter_finish: - * @client: a #GdmGreeterClient + * gdm_client_get_greeter_finish: + * @client: a #GdmClient * @result: The #GAsyncResult from the callback * @error: a #GError * * Finishes an operation started with - * gdm_greeter_client_get_greeter(). + * gdm_client_get_greeter(). * * Returns: (transfer full): a #GdmGreeter */ GdmGreeter * -gdm_greeter_client_get_greeter_finish (GdmGreeterClient *client, +gdm_client_get_greeter_finish (GdmClient *client, GAsyncResult *result, GError **error) { GdmGreeter *greeter; - g_return_val_if_fail (GDM_IS_GREETER_CLIENT (client), FALSE); + g_return_val_if_fail (GDM_IS_CLIENT (client), FALSE); if (client->priv->greeter != NULL) { return g_object_ref (client->priv->greeter); @@ -934,8 +934,8 @@ gdm_greeter_client_get_greeter_finish (GdmGreeterClient *client, } /** - * gdm_greeter_client_get_greeter_sync: - * @client: a #GdmGreeterClient + * gdm_client_get_greeter_sync: + * @client: a #GdmClient * @cancellable: a #GCancellable * @error: a #GError * @@ -947,7 +947,7 @@ gdm_greeter_client_get_greeter_finish (GdmGreeterClient *client, * Returns: (transfer full): #GdmGreeter or %NULL if caller is not a greeter */ GdmGreeter * -gdm_greeter_client_get_greeter_sync (GdmGreeterClient *client, +gdm_client_get_greeter_sync (GdmClient *client, GCancellable *cancellable, GError **error) { @@ -955,7 +955,7 @@ gdm_greeter_client_get_greeter_sync (GdmGreeterClient *client, return g_object_ref (client->priv->greeter); } - if (!gdm_greeter_client_open_connection_sync (client, cancellable, error)) { + if (!gdm_client_open_connection_sync (client, cancellable, error)) { return NULL; } @@ -1005,7 +1005,7 @@ on_remote_greeter_proxy_created (GdmRemoteGreeter *remote_greeter, } static void -on_connection_opened_for_remote_greeter (GdmGreeterClient *client, +on_connection_opened_for_remote_greeter (GdmClient *client, GAsyncResult *result, GSimpleAsyncResult *operation_result) { @@ -1013,7 +1013,7 @@ on_connection_opened_for_remote_greeter (GdmGreeterClient *client, GError *error; error = NULL; - if (!gdm_greeter_client_open_connection_finish (client, result, &error)) { + if (!gdm_client_open_connection_finish (client, result, &error)) { g_simple_async_result_take_error (operation_result, error); g_simple_async_result_complete_in_idle (operation_result); return; @@ -1031,8 +1031,8 @@ on_connection_opened_for_remote_greeter (GdmGreeterClient *client, } /** - * gdm_greeter_client_get_remote_greeter: - * @client: a #GdmGreeterClient + * gdm_client_get_remote_greeter: + * @client: a #GdmClient * @callback: a #GAsyncReadyCallback to call when the request is satisfied * @user_data: The data to pass to @callback * @cancellable: a #GCancellable @@ -1041,19 +1041,19 @@ on_connection_opened_for_remote_greeter (GdmGreeterClient *client, * verify a user's local account. */ void -gdm_greeter_client_get_remote_greeter (GdmGreeterClient *client, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data) +gdm_client_get_remote_greeter (GdmClient *client, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) { GSimpleAsyncResult *operation_result; - g_return_if_fail (GDM_IS_GREETER_CLIENT (client)); + g_return_if_fail (GDM_IS_CLIENT (client)); operation_result = g_simple_async_result_new (G_OBJECT (client), callback, user_data, - gdm_greeter_client_get_remote_greeter); + gdm_client_get_remote_greeter); g_simple_async_result_set_check_cancellable (operation_result, cancellable); g_object_set_data (G_OBJECT (operation_result), @@ -1069,7 +1069,7 @@ gdm_greeter_client_get_remote_greeter (GdmGreeterClient *client, return; } - gdm_greeter_client_open_connection (client, + gdm_client_open_connection (client, cancellable, (GAsyncReadyCallback) on_connection_opened_for_remote_greeter, @@ -1077,24 +1077,24 @@ gdm_greeter_client_get_remote_greeter (GdmGreeterClient *client, } /** - * gdm_greeter_client_get_remote_greeter_finish: - * @client: a #GdmGreeterClient + * gdm_client_get_remote_greeter_finish: + * @client: a #GdmClient * @result: The #GAsyncResult from the callback * @error: a #GError * * Finishes an operation started with - * gdm_greeter_client_get_remote_greeter(). + * gdm_client_get_remote_greeter(). * * Returns: (transfer full): a #GdmRemoteGreeter */ GdmRemoteGreeter * -gdm_greeter_client_get_remote_greeter_finish (GdmGreeterClient *client, +gdm_client_get_remote_greeter_finish (GdmClient *client, GAsyncResult *result, GError **error) { GdmRemoteGreeter *remote_greeter; - g_return_val_if_fail (GDM_IS_GREETER_CLIENT (client), FALSE); + g_return_val_if_fail (GDM_IS_CLIENT (client), FALSE); if (client->priv->remote_greeter != NULL) { return g_object_ref (client->priv->remote_greeter); @@ -1125,8 +1125,8 @@ gdm_greeter_client_get_remote_greeter_finish (GdmGreeterClient *client, } /** - * gdm_greeter_client_get_remote_greeter_sync: - * @client: a #GdmGreeterClient + * gdm_client_get_remote_greeter_sync: + * @client: a #GdmClient * @cancellable: a #GCancellable * @error: a #GError * @@ -1137,7 +1137,7 @@ gdm_greeter_client_get_remote_greeter_finish (GdmGreeterClient *client, * Returns: (transfer full): #GdmRemoteGreeter or %NULL if caller is not remote */ GdmRemoteGreeter * -gdm_greeter_client_get_remote_greeter_sync (GdmGreeterClient *client, +gdm_client_get_remote_greeter_sync (GdmClient *client, GCancellable *cancellable, GError **error) { @@ -1145,7 +1145,7 @@ gdm_greeter_client_get_remote_greeter_sync (GdmGreeterClient *client, return g_object_ref (client->priv->remote_greeter); } - if (!gdm_greeter_client_open_connection_sync (client, cancellable, error)) { + if (!gdm_client_open_connection_sync (client, cancellable, error)) { return NULL; } @@ -1195,7 +1195,7 @@ on_chooser_proxy_created (GdmChooser *chooser, } static void -on_connection_opened_for_chooser (GdmGreeterClient *client, +on_connection_opened_for_chooser (GdmClient *client, GAsyncResult *result, GSimpleAsyncResult *operation_result) { @@ -1203,7 +1203,7 @@ on_connection_opened_for_chooser (GdmGreeterClient *client, GError *error; error = NULL; - if (!gdm_greeter_client_open_connection_finish (client, result, &error)) { + if (!gdm_client_open_connection_finish (client, result, &error)) { g_simple_async_result_take_error (operation_result, error); g_simple_async_result_complete_in_idle (operation_result); return; @@ -1221,8 +1221,8 @@ on_connection_opened_for_chooser (GdmGreeterClient *client, } /** - * gdm_greeter_client_get_chooser: - * @client: a #GdmGreeterClient + * gdm_client_get_chooser: + * @client: a #GdmClient * @callback: a #GAsyncReadyCallback to call when the request is satisfied * @user_data: The data to pass to @callback * @cancellable: a #GCancellable @@ -1231,19 +1231,19 @@ on_connection_opened_for_chooser (GdmGreeterClient *client, * verify a user's local account. */ void -gdm_greeter_client_get_chooser (GdmGreeterClient *client, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data) +gdm_client_get_chooser (GdmClient *client, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) { GSimpleAsyncResult *operation_result; - g_return_if_fail (GDM_IS_GREETER_CLIENT (client)); + g_return_if_fail (GDM_IS_CLIENT (client)); operation_result = g_simple_async_result_new (G_OBJECT (client), callback, user_data, - gdm_greeter_client_get_chooser); + gdm_client_get_chooser); g_simple_async_result_set_check_cancellable (operation_result, cancellable); g_object_set_data (G_OBJECT (operation_result), @@ -1259,7 +1259,7 @@ gdm_greeter_client_get_chooser (GdmGreeterClient *client, return; } - gdm_greeter_client_open_connection (client, + gdm_client_open_connection (client, cancellable, (GAsyncReadyCallback) on_connection_opened_for_chooser, @@ -1267,24 +1267,24 @@ gdm_greeter_client_get_chooser (GdmGreeterClient *client, } /** - * gdm_greeter_client_get_chooser_finish: - * @client: a #GdmGreeterClient + * gdm_client_get_chooser_finish: + * @client: a #GdmClient * @result: The #GAsyncResult from the callback * @error: a #GError * * Finishes an operation started with - * gdm_greeter_client_get_chooser(). + * gdm_client_get_chooser(). * * Returns: (transfer full): a #GdmChooser */ GdmChooser * -gdm_greeter_client_get_chooser_finish (GdmGreeterClient *client, - GAsyncResult *result, - GError **error) +gdm_client_get_chooser_finish (GdmClient *client, + GAsyncResult *result, + GError **error) { GdmChooser *chooser; - g_return_val_if_fail (GDM_IS_GREETER_CLIENT (client), FALSE); + g_return_val_if_fail (GDM_IS_CLIENT (client), FALSE); if (client->priv->chooser != NULL) { return g_object_ref (client->priv->chooser); @@ -1315,8 +1315,8 @@ gdm_greeter_client_get_chooser_finish (GdmGreeterClient *client, } /** - * gdm_greeter_client_get_chooser_sync: - * @client: a #GdmGreeterClient + * gdm_client_get_chooser_sync: + * @client: a #GdmClient * @cancellable: a #GCancellable * @error: a #GError * @@ -1327,7 +1327,7 @@ gdm_greeter_client_get_chooser_finish (GdmGreeterClient *client, * Returns: (transfer full): #GdmChooser or %NULL if caller is not a chooser */ GdmChooser * -gdm_greeter_client_get_chooser_sync (GdmGreeterClient *client, +gdm_client_get_chooser_sync (GdmClient *client, GCancellable *cancellable, GError **error) { @@ -1336,7 +1336,7 @@ gdm_greeter_client_get_chooser_sync (GdmGreeterClient *client, return g_object_ref (client->priv->chooser); } - if (!gdm_greeter_client_open_connection_sync (client, cancellable, error)) { + if (!gdm_client_open_connection_sync (client, cancellable, error)) { return NULL; } @@ -1365,32 +1365,32 @@ gdm_greeter_client_get_chooser_sync (GdmGreeterClient *client, } static void -gdm_greeter_client_class_init (GdmGreeterClientClass *klass) +gdm_client_class_init (GdmClientClass *klass) { GObjectClass *object_class = G_OBJECT_CLASS (klass); - object_class->finalize = gdm_greeter_client_finalize; + object_class->finalize = gdm_client_finalize; - g_type_class_add_private (klass, sizeof (GdmGreeterClientPrivate)); + g_type_class_add_private (klass, sizeof (GdmClientPrivate)); } static void -gdm_greeter_client_init (GdmGreeterClient *client) +gdm_client_init (GdmClient *client) { - client->priv = GDM_GREETER_CLIENT_GET_PRIVATE (client); + client->priv = GDM_CLIENT_GET_PRIVATE (client); } static void -gdm_greeter_client_finalize (GObject *object) +gdm_client_finalize (GObject *object) { - GdmGreeterClient *client; + GdmClient *client; g_return_if_fail (object != NULL); - g_return_if_fail (GDM_IS_GREETER_CLIENT (object)); + g_return_if_fail (GDM_IS_CLIENT (object)); - client = GDM_GREETER_CLIENT (object); + client = GDM_CLIENT (object); g_return_if_fail (client->priv != NULL); @@ -1423,19 +1423,19 @@ gdm_greeter_client_finalize (GObject *object) g_free (client->priv->address); - G_OBJECT_CLASS (gdm_greeter_client_parent_class)->finalize (object); + G_OBJECT_CLASS (gdm_client_parent_class)->finalize (object); } -GdmGreeterClient * -gdm_greeter_client_new (void) +GdmClient * +gdm_client_new (void) { if (client_object != NULL) { g_object_ref (client_object); } else { - client_object = g_object_new (GDM_TYPE_GREETER_CLIENT, NULL); + client_object = g_object_new (GDM_TYPE_CLIENT, NULL); g_object_add_weak_pointer (client_object, (gpointer *) &client_object); } - return GDM_GREETER_CLIENT (client_object); + return GDM_CLIENT (client_object); } diff --git a/gui/libgdm/gdm-client.h b/gui/libgdm/gdm-client.h new file mode 100644 index 00000000..850cb8c1 --- /dev/null +++ b/gui/libgdm/gdm-client.h @@ -0,0 +1,123 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- + * + * Copyright (C) 2012 Red Hat, Inc. + * Copyright (C) 2012 Giovanni Campagna <scampa.giovanni@gmail.com> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + */ + +#ifndef __GDM_CLIENT_H +#define __GDM_CLIENT_H + +#include <glib-object.h> +#include "gdm-client-glue.h" + +G_BEGIN_DECLS + +#define GDM_TYPE_CLIENT (gdm_client_get_type ()) +#define GDM_CLIENT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GDM_TYPE_CLIENT, GdmClient)) +#define GDM_CLIENT_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), GDM_TYPE_CLIENT, GdmClientClass)) +#define GDM_IS_CLIENT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GDM_TYPE_CLIENT)) +#define GDM_IS_CLIENT_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GDM_TYPE_CLIENT)) +#define GDM_CLIENT_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GDM_TYPE_CLIENT, GdmClientClass)) + +typedef struct GdmClientPrivate GdmClientPrivate; + +typedef struct +{ + GObject parent; + GdmClientPrivate *priv; +} GdmClient; + +typedef struct +{ + GObjectClass parent_class; + +} GdmClientClass; + +#define GDM_CLIENT_ERROR (gdm_client_error_quark ()) + +typedef enum _GdmClientError { + GDM_CLIENT_ERROR_GENERIC = 0, +} GdmClientError; + +GType gdm_client_get_type (void); +GQuark gdm_client_error_quark (void); + +GdmClient *gdm_client_new (void); + +void gdm_client_open_reauthentication_channel (GdmClient *client, + const char *username, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); + +GdmUserVerifier *gdm_client_open_reauthentication_channel_finish (GdmClient *client, + GAsyncResult *result, + GError **error); + +GdmUserVerifier *gdm_client_open_reauthentication_channel_sync (GdmClient *client, + const char *username, + GCancellable *cancellable, + GError **error); + +void gdm_client_get_user_verifier (GdmClient *client, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); +GdmUserVerifier *gdm_client_get_user_verifier_finish (GdmClient *client, + GAsyncResult *result, + GError **error); +GdmUserVerifier *gdm_client_get_user_verifier_sync (GdmClient *client, + GCancellable *cancellable, + GError **error); + +void gdm_client_get_greeter (GdmClient *client, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); +GdmGreeter *gdm_client_get_greeter_finish (GdmClient *client, + GAsyncResult *result, + GError **error); +GdmGreeter *gdm_client_get_greeter_sync (GdmClient *client, + GCancellable *cancellable, + GError **error); + +void gdm_client_get_remote_greeter (GdmClient *client, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); +GdmRemoteGreeter *gdm_client_get_remote_greeter_finish (GdmClient *client, + GAsyncResult *result, + GError **error); +GdmRemoteGreeter *gdm_client_get_remote_greeter_sync (GdmClient *client, + GCancellable *cancellable, + GError **error); + +void gdm_client_get_chooser (GdmClient *client, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); +GdmChooser *gdm_client_get_chooser_finish (GdmClient *client, + GAsyncResult *result, + GError **error); +GdmChooser *gdm_client_get_chooser_sync (GdmClient *client, + GCancellable *cancellable, + GError **error); + +G_END_DECLS + +#endif /* __GDM_CLIENT_H */ diff --git a/gui/libgdmgreeter/gdm-greeter-sessions.c b/gui/libgdm/gdm-sessions.c index fe342930..945453ed 100644 --- a/gui/libgdmgreeter/gdm-greeter-sessions.c +++ b/gui/libgdm/gdm-sessions.c @@ -35,7 +35,7 @@ #include <glib/gi18n.h> #include <glib/gstdio.h> -#include "gdm-greeter-sessions.h" +#include "gdm-sessions.h" typedef struct _GdmSessionFile { char *id; @@ -207,7 +207,7 @@ collect_sessions (void) } /** - * gdm_greeter_get_session_ids: + * gdm_get_session_ids: * * Reads /usr/share/xsessions and other relevant places for possible sessions * to log into and returns the complete list. @@ -215,7 +215,7 @@ collect_sessions (void) * Returns: (transfer full): a %NULL terminated list of session ids */ char ** -gdm_greeter_get_session_ids (void) +gdm_get_session_ids (void) { GHashTableIter iter; gpointer key, value; @@ -242,8 +242,8 @@ gdm_greeter_get_session_ids (void) } /** - * gdm_greeter_get_session_name_and_description: - * @id: an id from gdm_greeter_get_session_ids() + * gdm_get_session_name_and_description: + * @id: an id from gdm_get_session_ids() * @description: (out): optional returned session description * * Takes an xsession id and returns the name and comment about it. @@ -251,8 +251,8 @@ gdm_greeter_get_session_ids (void) * Returns: The session name if found, or %NULL otherwise */ char * -gdm_greeter_get_session_name_and_description (const char *id, - char **description) +gdm_get_session_name_and_description (const char *id, + char **description) { GdmSessionFile *session; char *name; diff --git a/gui/libgdmgreeter/gdm-greeter-sessions.h b/gui/libgdm/gdm-sessions.h index ab78a985..c4569745 100644 --- a/gui/libgdmgreeter/gdm-greeter-sessions.h +++ b/gui/libgdm/gdm-sessions.h @@ -28,9 +28,9 @@ G_BEGIN_DECLS -char ** gdm_greeter_get_session_ids (void); -char * gdm_greeter_get_session_name_and_description (const char *id, - char **description); +char ** gdm_get_session_ids (void); +char * gdm_get_session_name_and_description (const char *id, + char **description); G_END_DECLS diff --git a/gui/libgdmgreeter/gdmgreeter.pc.in b/gui/libgdm/gdm.pc.in index 9570d8c5..9570d8c5 100644 --- a/gui/libgdmgreeter/gdmgreeter.pc.in +++ b/gui/libgdm/gdm.pc.in diff --git a/gui/libgdmgreeter/gdm-greeter-client.h b/gui/libgdmgreeter/gdm-greeter-client.h deleted file mode 100644 index dba9fba5..00000000 --- a/gui/libgdmgreeter/gdm-greeter-client.h +++ /dev/null @@ -1,124 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- - * - * Copyright (C) 2012 Red Hat, Inc. - * Copyright (C) 2012 Giovanni Campagna <scampa.giovanni@gmail.com> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - */ - -#ifndef __GDM_GREETER_CLIENT_H -#define __GDM_GREETER_CLIENT_H - -#include <glib-object.h> -#include "gdm-client-glue.h" - -G_BEGIN_DECLS - -#define GDM_TYPE_GREETER_CLIENT (gdm_greeter_client_get_type ()) -#define GDM_GREETER_CLIENT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GDM_TYPE_GREETER_CLIENT, GdmGreeterClient)) -#define GDM_GREETER_CLIENT_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), GDM_TYPE_GREETER_CLIENT, GdmGreeterClientClass)) -#define GDM_IS_GREETER_CLIENT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GDM_TYPE_GREETER_CLIENT)) -#define GDM_IS_GREETER_CLIENT_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GDM_TYPE_GREETER_CLIENT)) -#define GDM_GREETER_CLIENT_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GDM_TYPE_GREETER_CLIENT, GdmGreeterClientClass)) - -typedef struct GdmGreeterClientPrivate GdmGreeterClientPrivate; - -typedef struct -{ - GObject parent; - GdmGreeterClientPrivate *priv; -} GdmGreeterClient; - -typedef struct -{ - GObjectClass parent_class; - -} GdmGreeterClientClass; - -#define GDM_GREETER_CLIENT_ERROR (gdm_greeter_client_error_quark ()) - -typedef enum _GdmGreeterClientError { - GDM_GREETER_CLIENT_ERROR_GENERIC = 0, -} GdmGreeterClientError; - -GType gdm_greeter_client_get_type (void); -GQuark gdm_greeter_client_error_quark (void); - -GdmGreeterClient *gdm_greeter_client_new (void); - -void gdm_greeter_client_open_reauthentication_channel (GdmGreeterClient *client, - const char *username, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data); - -GdmUserVerifier *gdm_greeter_client_open_reauthentication_channel_finish (GdmGreeterClient *client, - GAsyncResult *result, - GError **error); - -GdmUserVerifier *gdm_greeter_client_open_reauthentication_channel_sync (GdmGreeterClient *client, - const char *username, - GCancellable *cancellable, - GError **error); - -void gdm_greeter_client_get_user_verifier (GdmGreeterClient *client, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data); -GdmUserVerifier *gdm_greeter_client_get_user_verifier_finish (GdmGreeterClient *client, - GAsyncResult *result, - GError **error); -GdmUserVerifier *gdm_greeter_client_get_user_verifier_sync (GdmGreeterClient *client, - GCancellable *cancellable, - GError **error); - -void gdm_greeter_client_get_greeter (GdmGreeterClient *client, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data); -GdmGreeter *gdm_greeter_client_get_greeter_finish (GdmGreeterClient *client, - GAsyncResult *result, - GError **error); -GdmGreeter *gdm_greeter_client_get_greeter_sync (GdmGreeterClient *client, - GCancellable *cancellable, - GError **error); - -void gdm_greeter_client_get_remote_greeter (GdmGreeterClient *client, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data); -GdmRemoteGreeter *gdm_greeter_client_get_remote_greeter_finish (GdmGreeterClient *client, - GAsyncResult *result, - GError **error); -GdmRemoteGreeter *gdm_greeter_client_get_remote_greeter_sync (GdmGreeterClient *client, - GCancellable *cancellable, - GError **error); - -void gdm_greeter_client_get_chooser (GdmGreeterClient *client, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data); -GdmChooser *gdm_greeter_client_get_chooser_finish (GdmGreeterClient *client, - GAsyncResult *result, - GError **error); -GdmChooser *gdm_greeter_client_get_chooser_sync (GdmGreeterClient *client, - GCancellable *cancellable, - GError **error); - - -G_END_DECLS - -#endif /* __GDM_GREETER_CLIENT_H */ |