cookiez/pam-fprint-grosshack
1
0
Fork 0
mirror of https://gitlab.com/mishakmak/pam-fprint-grosshack.git synced 2026-04-09 12:23:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

manager: Replace deprecated g_type_class_add_private()

Browse Source
This commit is contained in:
Bastien Nocera
2020-01-14 14:00:39 +01:00
parent b690daa95f
commit f2d6921b74
1 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/manager.c
View File

@ -35,9 +35,6 @@ static gboolean fprint_manager_get_default_device(FprintManager *manager,
const char **device, GError **error); const char **device, GError **error);
#include "manager-dbus-glue.h" #include "manager-dbus-glue.h"
static GObjectClass *parent_class = NULL;
G_DEFINE_TYPE(FprintManager, fprint_manager, G_TYPE_OBJECT);
typedef struct typedef struct
{ {
@ -47,12 +44,13 @@ typedef struct
guint timeout_id; guint timeout_id;
} FprintManagerPrivate; } FprintManagerPrivate;
#define FPRINT_MANAGER_GET_PRIVATE(o) \ static GObjectClass *parent_class = NULL;
(G_TYPE_INSTANCE_GET_PRIVATE ((o), FPRINT_TYPE_MANAGER, FprintManagerPrivate))
G_DEFINE_TYPE_WITH_CODE(FprintManager, fprint_manager, G_TYPE_OBJECT, G_ADD_PRIVATE (FprintManager))
static void fprint_manager_finalize(GObject *object) static void fprint_manager_finalize(GObject *object)
{ {
FprintManagerPrivate *priv = FPRINT_MANAGER_GET_PRIVATE (object); FprintManagerPrivate *priv = fprint_manager_get_instance_private (FPRINT_MANAGER (object));
g_clear_object (&priv->context); g_clear_object (&priv->context);
g_slist_free(priv->dev_registry); g_slist_free(priv->dev_registry);
@ -66,8 +64,6 @@ static void fprint_manager_class_init(FprintManagerClass *klass)
&dbus_glib_fprint_manager_object_info); &dbus_glib_fprint_manager_object_info);
dbus_g_error_domain_register (FPRINT_ERROR, FPRINT_ERROR_DBUS_INTERFACE, FPRINT_TYPE_ERROR); dbus_g_error_domain_register (FPRINT_ERROR, FPRINT_ERROR_DBUS_INTERFACE, FPRINT_TYPE_ERROR);
g_type_class_add_private ((GObjectClass *) klass, sizeof (FprintManagerPrivate));
G_OBJECT_CLASS(klass)->finalize = fprint_manager_finalize; G_OBJECT_CLASS(klass)->finalize = fprint_manager_finalize;
parent_class = g_type_class_peek_parent(klass); parent_class = g_type_class_peek_parent(klass);
} }
@ -89,7 +85,7 @@ fprint_manager_timeout_cb (FprintManager *manager)
static void static void
fprint_manager_in_use_notified (FprintDevice *rdev, GParamSpec *spec, FprintManager *manager) fprint_manager_in_use_notified (FprintDevice *rdev, GParamSpec *spec, FprintManager *manager)
{ {
FprintManagerPrivate *priv = FPRINT_MANAGER_GET_PRIVATE (manager); FprintManagerPrivate *priv = fprint_manager_get_instance_private (manager);
guint num_devices_used = 0; guint num_devices_used = 0;
GSList *l; GSList *l;
gboolean in_use; gboolean in_use;
@ -116,7 +112,7 @@ fprint_manager_in_use_notified (FprintDevice *rdev, GParamSpec *spec, FprintMana
static void static void
device_added_cb (FprintManager *manager, FpDevice *device, FpContext *context) device_added_cb (FprintManager *manager, FpDevice *device, FpContext *context)
{ {
FprintManagerPrivate *priv = FPRINT_MANAGER_GET_PRIVATE (manager); FprintManagerPrivate *priv = fprint_manager_get_instance_private (manager);
FprintDevice *rdev = fprint_device_new(device); FprintDevice *rdev = fprint_device_new(device);
g_autofree gchar *path = NULL; g_autofree gchar *path = NULL;
@ -132,7 +128,7 @@ device_added_cb (FprintManager *manager, FpDevice *device, FpContext *context)
static void static void
device_removed_cb (FprintManager *manager, FpDevice *device, FpContext *context) device_removed_cb (FprintManager *manager, FpDevice *device, FpContext *context)
{ {
FprintManagerPrivate *priv = FPRINT_MANAGER_GET_PRIVATE (manager); FprintManagerPrivate *priv = fprint_manager_get_instance_private (manager);
GSList *item; GSList *item;
g_autofree gchar *path = NULL; g_autofree gchar *path = NULL;
@ -165,7 +161,7 @@ device_removed_cb (FprintManager *manager, FpDevice *device, FpContext *context)
static void static void
fprint_manager_init (FprintManager *manager) fprint_manager_init (FprintManager *manager)
{ {
FprintManagerPrivate *priv = FPRINT_MANAGER_GET_PRIVATE (manager); FprintManagerPrivate *priv = fprint_manager_get_instance_private (manager);
priv->context = fp_context_new (); priv->context = fp_context_new ();
@ -195,7 +191,7 @@ FprintManager *fprint_manager_new(gboolean no_timeout)
GObject *object; GObject *object;
object = g_object_new(FPRINT_TYPE_MANAGER, NULL); object = g_object_new(FPRINT_TYPE_MANAGER, NULL);
priv = FPRINT_MANAGER_GET_PRIVATE (object); priv = fprint_manager_get_instance_private (FPRINT_MANAGER (object));
priv->no_timeout = no_timeout; priv->no_timeout = no_timeout;
if (!priv->no_timeout) if (!priv->no_timeout)
@ -207,7 +203,7 @@ FprintManager *fprint_manager_new(gboolean no_timeout)
static gboolean fprint_manager_get_devices(FprintManager *manager, static gboolean fprint_manager_get_devices(FprintManager *manager,
GPtrArray **devices, GError **error) GPtrArray **devices, GError **error)
{ {
FprintManagerPrivate *priv = FPRINT_MANAGER_GET_PRIVATE (manager); FprintManagerPrivate *priv = fprint_manager_get_instance_private (manager);
GSList *elem; GSList *elem;
GSList *l; GSList *l;
int num_open; int num_open;
@ -233,7 +229,7 @@ static gboolean fprint_manager_get_devices(FprintManager *manager,
static gboolean fprint_manager_get_default_device(FprintManager *manager, static gboolean fprint_manager_get_default_device(FprintManager *manager,
const char **device, GError **error) const char **device, GError **error)
{ {
FprintManagerPrivate *priv = FPRINT_MANAGER_GET_PRIVATE (manager); FprintManagerPrivate *priv = fprint_manager_get_instance_private (manager);
GSList *elem;; GSList *elem;;
int num_open; int num_open;