[gdm/wip/slave-connection: 32/32] libgdmgreeter: rename to libgdm
- From: Ray Strode <halfline src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gdm/wip/slave-connection: 32/32] libgdmgreeter: rename to libgdm
- Date: Tue, 10 Jul 2012 06:25:44 +0000 (UTC)
commit ea2bb258b43405ee2287ea80357d2b428b00e184
Author: Ray Strode <rstrode redhat com>
Date: Sun May 20 01:13:00 2012 +0200
libgdmgreeter: rename to libgdm
libgdmgreeter is useful for clients that aren't greeters.
This will be even more true in the future as it gets updated
to be useful for screensavers.
Given it offers APIs that apply to non-greeter applications,
it's silly to have greeter in the library name.
This commit renames libgdmgreeter to libgdm.
https://bugzilla.gnome.org/show_bug.cgi?id=676381
.gitignore | 8 +-
configure.ac | 10 +-
gui/Makefile.am | 4 +-
gui/{libgdmgreeter => libgdm}/Makefile.am | 44 ++++----
.../gdm-greeter-client.c => libgdm/gdm-client.c} | 102 ++++++++++----------
.../gdm-greeter-client.h => libgdm/gdm-client.h} | 0
.../gdm-sessions.c} | 12 +-
.../gdm-sessions.h} | 6 +-
.../gdmgreeter.pc.in => libgdm/gdm.pc.in} | 0
9 files changed, 93 insertions(+), 93 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 653e30e..afdba19 100644
--- a/.gitignore
+++ b/.gitignore
@@ -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 d1f9e08..1d8a10d 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
@@ -1486,8 +1486,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 ff8a039..ce90055 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
similarity index 67%
rename from gui/libgdmgreeter/Makefile.am
rename to gui/libgdm/Makefile.am
index e53bf44..259b22e 100644
--- a/gui/libgdmgreeter/Makefile.am
+++ b/gui/libgdm/Makefile.am
@@ -39,35 +39,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 \
@@ -88,7 +88,7 @@ INTROSPECTION_GIRS = $(gir_DATA)
GdmGreeter-1.0.gir: \
$(INTROSPECTION_SCANNER) \
- libgdmgreeter.la \
+ libgdm.la \
Makefile \
$(END_OF_LIST)
@@ -97,14 +97,14 @@ GdmGreeter_1_0_gir_SCANNERFLAGS = \
--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
similarity index 72%
rename from gui/libgdmgreeter/gdm-greeter-client.c
rename to gui/libgdm/gdm-client.c
index b9f630e..a015081 100644
--- a/gui/libgdmgreeter/gdm-greeter-client.c
+++ b/gui/libgdm/gdm-client.c
@@ -30,11 +30,11 @@
#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 MANAGER_DBUS_PATH "/org/gnome/DisplayManager/Manager"
#define MANAGER_DBUS_INTERFACE "org.gnome.DisplayManager.Manager"
@@ -45,7 +45,7 @@
#define GDM_DBUS_USER_VERIFIER_INTERFACE "org.gnome.DisplayManager.UserVerifier"
#define GDM_DBUS_GREETER_SESSION_INTERFACE "org.gnome.DisplayManager.GreeterSession"
-struct GdmGreeterClientPrivate
+struct GdmClientPrivate
{
GdmManager *manager;
GdmUserVerifier *user_verifier;
@@ -55,16 +55,16 @@ struct GdmGreeterClientPrivate
char *address;
};
-static void gdm_greeter_client_class_init (GdmGreeterClientClass *klass);
-static void gdm_greeter_client_init (GdmGreeterClient *greeter_client);
-static void gdm_greeter_client_finalize (GObject *object);
+static void gdm_client_class_init (GdmClientClass *klass);
+static void gdm_client_init (GdmClient *greeter_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;
@@ -75,8 +75,8 @@ gdm_greeter_client_error_quark (void)
}
/**
- * gdm_greeter_client_open_connection_sync:
- * @client: a #GdmGreeterClient
+ * gdm_client_open_connection_sync:
+ * @client: a #GdmClient
* @cancellable: a #GCancellable
* @error: a #GError
*
@@ -87,13 +87,13 @@ gdm_greeter_client_error_quark (void)
* Returns: %TRUE if connected, or %FALSE if unavailable
*/
gboolean
-gdm_greeter_client_open_connection_sync (GdmGreeterClient *client,
- GCancellable *cancellable,
- GError **error)
+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);
client->priv->manager = gdm_manager_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM,
G_DBUS_PROXY_FLAGS_NONE,
@@ -116,10 +116,10 @@ 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_GREETER_CLIENT,
+ G_DBUS_CONNECTION_FLAGS_AUTHENTICATION_CLIENT,
NULL,
cancellable,
error);
@@ -134,8 +134,8 @@ gdm_greeter_client_open_connection_sync (GdmGreeterClient *client,
return client->priv->connection != NULL;
}
/**
- * gdm_greeter_client_close_connection_sync:
- * @client: a #GdmGreeterClient
+ * gdm_client_close_connection_sync:
+ * @client: a #GdmClient
* @cancellable: a #GCancellable
* @error: a #GError
*
@@ -144,11 +144,11 @@ gdm_greeter_client_open_connection_sync (GdmGreeterClient *client,
* Returns: %TRUE if disconnected, or %FALSE if failed
*/
gboolean
-gdm_greeter_client_close_connection_sync (GdmGreeterClient *client,
- GCancellable *cancellable,
- GError **error)
+gdm_client_close_connection_sync (GdmClient *client,
+ GCancellable *cancellable,
+ GError **error)
{
- g_return_val_if_fail (GDM_IS_GREETER_CLIENT (client), FALSE);
+ g_return_val_if_fail (GDM_IS_CLIENT (client), FALSE);
g_clear_object (&client->priv->user_verifier);
g_clear_object (&client->priv->greeter_session);
@@ -160,8 +160,8 @@ gdm_greeter_client_close_connection_sync (GdmGreeterClient *client,
}
/**
- * 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
*
@@ -171,9 +171,9 @@ gdm_greeter_client_close_connection_sync (GdmGreeterClient *client,
* Returns: (transfer full): #GdmUserVerifier or %NULL if not connected
*/
GdmUserVerifier *
-gdm_greeter_client_get_user_verifier_sync (GdmGreeterClient *client,
- GCancellable *cancellable,
- GError **error)
+gdm_client_get_user_verifier_sync (GdmClient *client,
+ GCancellable *cancellable,
+ GError **error)
{
if (client->priv->user_verifier != NULL) {
return g_object_ref (client->priv->user_verifier);
@@ -190,8 +190,8 @@ gdm_greeter_client_get_user_verifier_sync (GdmGreeterClient *client,
}
/**
- * gdm_greeter_client_get_greeter_session_sync:
- * @client: a #GdmGreeterClient
+ * gdm_client_get_greeter_session_sync:
+ * @client: a #GdmClient
* @cancellable: a #GCancellable
* @error: a #GError
*
@@ -203,9 +203,9 @@ gdm_greeter_client_get_user_verifier_sync (GdmGreeterClient *client,
* Returns: (transfer full): #GdmGreeterSession or %NULL if caller is not a greeter
*/
GdmGreeterSession *
-gdm_greeter_client_get_greeter_session_sync (GdmGreeterClient *client,
- GCancellable *cancellable,
- GError **error)
+gdm_client_get_greeter_session_sync (GdmClient *client,
+ GCancellable *cancellable,
+ GError **error)
{
if (client->priv->greeter_session != NULL) {
return g_object_ref (client->priv->greeter_session);
@@ -222,8 +222,8 @@ gdm_greeter_client_get_greeter_session_sync (GdmGreeterClient *client,
}
/**
- * gdm_greeter_client_get_chooser_session_sync:
- * @client: a #GdmGreeterClient
+ * gdm_client_get_chooser_session_sync:
+ * @client: a #GdmClient
* @cancellable: a #GCancellable
* @error: a #GError
*
@@ -234,9 +234,9 @@ gdm_greeter_client_get_greeter_session_sync (GdmGreeterClient *client,
* Returns: (transfer full): #GdmChooserSession or %NULL if caller is not a chooser
*/
GdmChooserSession *
-gdm_greeter_client_get_chooser_session_sync (GdmGreeterClient *client,
- GCancellable *cancellable,
- GError **error)
+gdm_client_get_chooser_session_sync (GdmClient *client,
+ GCancellable *cancellable,
+ GError **error)
{
if (client->priv->chooser_session != NULL) {
@@ -254,51 +254,51 @@ gdm_greeter_client_get_chooser_session_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);
gdm_greeter_client_close_connection_sync (client, NULL, NULL);
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/libgdmgreeter/gdm-greeter-client.h b/gui/libgdm/gdm-client.h
similarity index 100%
rename from gui/libgdmgreeter/gdm-greeter-client.h
rename to gui/libgdm/gdm-client.h
diff --git a/gui/libgdmgreeter/gdm-greeter-sessions.c b/gui/libgdm/gdm-sessions.c
similarity index 96%
rename from gui/libgdmgreeter/gdm-greeter-sessions.c
rename to gui/libgdm/gdm-sessions.c
index 46d991f..945453e 100644
--- a/gui/libgdmgreeter/gdm-greeter-sessions.c
+++ b/gui/libgdm/gdm-sessions.c
@@ -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
similarity index 81%
rename from gui/libgdmgreeter/gdm-greeter-sessions.h
rename to gui/libgdm/gdm-sessions.h
index ab78a98..c456974 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
similarity index 100%
rename from gui/libgdmgreeter/gdmgreeter.pc.in
rename to gui/libgdm/gdm.pc.in
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
