mirror of
https://gitlab.com/mishakmak/pam-fprint-grosshack.git
synced 2026-04-09 04:13:33 +02:00
tests: call g_type_init only if using an old glib
Calling g_type_init() is not needed anymore and deprecated since glib version 2.36. https://bugs.freedesktop.org/show_bug.cgi?id=99812
This commit is contained in:
committed by
Bastien Nocera
parent
8fa3dcd5cd
commit
06ea385260
@ -114,7 +114,10 @@ static void process_devices(char **argv)
|
|||||||
|
|
||||||
int main(int argc, char **argv)
|
int main(int argc, char **argv)
|
||||||
{
|
{
|
||||||
|
#if !GLIB_CHECK_VERSION (2, 36, 0)
|
||||||
g_type_init();
|
g_type_init();
|
||||||
|
#endif
|
||||||
|
|
||||||
create_manager();
|
create_manager();
|
||||||
|
|
||||||
if (argc < 2) {
|
if (argc < 2) {
|
||||||
|
|||||||
@ -159,7 +159,9 @@ int main(int argc, char **argv)
|
|||||||
GError *err = NULL;
|
GError *err = NULL;
|
||||||
DBusGProxy *dev;
|
DBusGProxy *dev;
|
||||||
|
|
||||||
|
#if !GLIB_CHECK_VERSION (2, 36, 0)
|
||||||
g_type_init();
|
g_type_init();
|
||||||
|
#endif
|
||||||
|
|
||||||
dbus_g_object_register_marshaller (fprintd_marshal_VOID__STRING_BOOLEAN,
|
dbus_g_object_register_marshaller (fprintd_marshal_VOID__STRING_BOOLEAN,
|
||||||
G_TYPE_NONE, G_TYPE_STRING, G_TYPE_BOOLEAN, G_TYPE_INVALID);
|
G_TYPE_NONE, G_TYPE_STRING, G_TYPE_BOOLEAN, G_TYPE_INVALID);
|
||||||
|
|||||||
@ -130,7 +130,10 @@ static void process_devices(char **argv)
|
|||||||
|
|
||||||
int main(int argc, char **argv)
|
int main(int argc, char **argv)
|
||||||
{
|
{
|
||||||
|
#if !GLIB_CHECK_VERSION (2, 36, 0)
|
||||||
g_type_init();
|
g_type_init();
|
||||||
|
#endif
|
||||||
|
|
||||||
create_manager();
|
create_manager();
|
||||||
|
|
||||||
if (argc < 2) {
|
if (argc < 2) {
|
||||||
|
|||||||
@ -172,7 +172,9 @@ int main(int argc, char **argv)
|
|||||||
DBusGProxy *dev;
|
DBusGProxy *dev;
|
||||||
char *username;
|
char *username;
|
||||||
|
|
||||||
|
#if !GLIB_CHECK_VERSION (2, 36, 0)
|
||||||
g_type_init();
|
g_type_init();
|
||||||
|
#endif
|
||||||
|
|
||||||
dbus_g_object_register_marshaller (fprintd_marshal_VOID__STRING_BOOLEAN,
|
dbus_g_object_register_marshaller (fprintd_marshal_VOID__STRING_BOOLEAN,
|
||||||
G_TYPE_NONE, G_TYPE_STRING, G_TYPE_BOOLEAN, G_TYPE_INVALID);
|
G_TYPE_NONE, G_TYPE_STRING, G_TYPE_BOOLEAN, G_TYPE_INVALID);
|
||||||
|
|||||||
Reference in New Issue
Block a user