Commit c11bbed7 authored by Ray Strode's avatar Ray Strode

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
parent 6ce1c7da
......@@ -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
......
......@@ -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
......
NULL =
SUBDIRS = \
libgdmgreeter \
libgdm \
simple-greeter \
$(NULL)
......@@ -10,7 +10,7 @@ SUBDIRS += simple-chooser
endif
DIST_SUBDIRS = \
libgdmgreeter \
libgdm \
simple-chooser \
simple-greeter \
$(NULL)
......@@ -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)
......
/* -*- 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 */
......@@ -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;
......
......@@ -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
......
/* -*- 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 */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment