Skip to content

liblightdm-gobject: define common-user GIR type #464

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ousamabenyounes wants to merge 1 commit into
base: main
Choose a base branch
from
+20 −2
Open

liblightdm-gobject: define common-user GIR type #464

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@ jobs:
if: matrix.image.name == 'ubuntu'
run: |
apt-get update
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends dbus gtk-doc-tools intltool libaudit-dev libgcrypt20-dev libgirepository1.0-dev libglib2.0-dev libpam0g-dev libtool libxcb1-dev libxdmcp-dev libxklavier-dev python3 python3-gi python-is-python3 qtbase5-dev qt6-base-dev valac yelp-tools
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends dbus gtk-doc-tools intltool libaudit-dev libgcrypt20-dev libgirepository1.0-dev libglib2.0-dev libpam0g-dev libtool libxcb1-dev libxdmcp-dev libxklavier-dev libxml2-utils python3 python3-gi python-is-python3 qtbase5-dev qt6-base-dev valac yelp-tools

- name: Install dependencies (Fedora)
if: matrix.image.name == 'fedora'
run: |
dnf install -y audit-libs-devel dbus-daemon gcc gcc-c++ gobject-introspection-devel glib2-devel gtk-doc intltool libgcrypt-devel libtool libxcb-devel libxklavier-devel libXdmcp-devel make pam-devel python3-gobject qt5-qtbase-devel qt6-qtbase-devel redhat-rpm-config vala yelp-tools
dnf install -y audit-libs-devel dbus-daemon gcc gcc-c++ gobject-introspection-devel glib2-devel gtk-doc intltool libgcrypt-devel libtool libxcb-devel libxklavier-devel libXdmcp-devel libxml2 make pam-devel python3-gobject qt5-qtbase-devel qt6-qtbase-devel redhat-rpm-config vala yelp-tools

- name: Build and test
run: |
Expand Down
3 changes: 3 additions & 0 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ AC_SUBST(WARN_CFLAGS)
AC_SUBST(WARN_CXXFLAGS)

GOBJECT_INTROSPECTION_CHECK(0.9.5)
AC_PATH_PROG([XMLLINT], [xmllint])
AM_CONDITIONAL([HAVE_XMLLINT], [test -n "$XMLLINT"])

VAPIGEN_CHECK([0.16])

Expand Down Expand Up @@ -265,6 +267,7 @@ echo "
Greeter user: $GREETER_USER
User session: $DEFAULT_USER_SESSION
GObject introspection: $found_introspection
GIR unnamed-type check: $XMLLINT
Vala bindings: $enable_vala
liblightdm-qt5: $compile_liblightdm_qt5
liblightdm-qt6: $compile_liblightdm_qt6
Expand Down
10 changes: 10 additions & 0 deletions liblightdm-gobject/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,16 @@ LightDM_1_gir_SCANNERFLAGS = --symbol-prefix=lightdm --c-include "lightdm.h"
LightDM_1_gir_LIBS = liblightdm-gobject-1.la
LightDM_1_gir_FILES = $(liblightdm_gobject_1_la_SOURCES)

GIR_UNNAMED_TYPE_XPATH = count(//*[local-name()='type' and not(@name)])

if HAVE_XMLLINT
check-local: LightDM-1.gir
@unnamed_type_count="`$(XMLLINT) --xpath \"$(GIR_UNNAMED_TYPE_XPATH)\" LightDM-1.gir`" || \
{ echo "Unable to inspect LightDM-1.gir" >&2; exit 1; }; \
test "$$unnamed_type_count" = "0" || \
{ echo "LightDM-1.gir contains an unnamed type" >&2; exit 1; }
endif

girdir = $(datadir)/gir-1.0
gir_DATA = LightDM-1.gir

Expand Down
5 changes: 5 additions & 0 deletions liblightdm-gobject/user.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -741,6 +741,11 @@ lightdm_user_class_init (LightDMUserClass *klass)
object_class->get_property = lightdm_user_get_property;
object_class->finalize = lightdm_user_finalize;

/**
* LightDMUser:common-user: (skip) (type GObject.Object)
*
* Internal user object.
*/
g_object_class_install_property (object_class,
USER_PROP_COMMON_USER,
g_param_spec_object ("common-user",
Expand Down