brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

backends/native: Remove instance private

Browse Source 
The object struct definition itself is private, so the object instance
private serves no purpose. Thus, move the fields into the object struct
and remove the instance private struct.

https://gitlab.gnome.org/GNOME/mutter/issues/548
https://gitlab.gnome.org/GNOME/mutter/merge_requests/525
This commit is contained in:
Jonas Ådahl 2018-09-06 14:14:59 +02:00 committed by Georges Basile Stavracas Neto
parent 2464f00902
commit fc87b6137c
No known key found for this signature in database
GPG Key ID: 886C17EE170D1385
1 changed files with 8 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/backends/native/meta-backend-native.c
View File

@ -62,14 +62,10 @@
struct _MetaBackendNative struct _MetaBackendNative
{ {
MetaBackend parent; MetaBackend parent;
};
struct _MetaBackendNativePrivate
{
MetaLauncher *launcher; MetaLauncher *launcher;
MetaBarrierManagerNative *barrier_manager; MetaBarrierManagerNative *barrier_manager;
}; };
typedef struct _MetaBackendNativePrivate MetaBackendNativePrivate;
static GInitableIface *initable_parent_iface; static GInitableIface *initable_parent_iface;
@ -77,7 +73,6 @@ static void
initable_iface_init (GInitableIface *initable_iface); initable_iface_init (GInitableIface *initable_iface);
G_DEFINE_TYPE_WITH_CODE (MetaBackendNative, meta_backend_native, META_TYPE_BACKEND, G_DEFINE_TYPE_WITH_CODE (MetaBackendNative, meta_backend_native, META_TYPE_BACKEND,
G_ADD_PRIVATE (MetaBackendNative)
G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE, G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE,
initable_iface_init)) initable_iface_init))
@ -85,9 +80,8 @@ static void
meta_backend_native_finalize (GObject *object) meta_backend_native_finalize (GObject *object)
{ {
MetaBackendNative *native = META_BACKEND_NATIVE (object); MetaBackendNative *native = META_BACKEND_NATIVE (object);
MetaBackendNativePrivate *priv = meta_backend_native_get_instance_private (native);
meta_launcher_free (priv->launcher); meta_launcher_free (native->launcher);
G_OBJECT_CLASS (meta_backend_native_parent_class)->finalize (object); G_OBJECT_CLASS (meta_backend_native_parent_class)->finalize (object);
} }
@ -99,10 +93,8 @@ constrain_to_barriers (ClutterInputDevice *device,
float *new_y) float *new_y)
{ {
MetaBackendNative *native = META_BACKEND_NATIVE (meta_get_backend ()); MetaBackendNative *native = META_BACKEND_NATIVE (meta_get_backend ());
MetaBackendNativePrivate *priv =
meta_backend_native_get_instance_private (native);
meta_barrier_manager_native_process (priv->barrier_manager, meta_barrier_manager_native_process (native->barrier_manager,
device, device,
time, time,
new_x, new_y); new_x, new_y);
@ -575,26 +567,22 @@ meta_backend_native_class_init (MetaBackendNativeClass *klass)
static void static void
meta_backend_native_init (MetaBackendNative *native) meta_backend_native_init (MetaBackendNative *native)
{ {
MetaBackendNativePrivate *priv = meta_backend_native_get_instance_private (native);
GError *error = NULL; GError *error = NULL;
priv->launcher = meta_launcher_new (&error); native->launcher = meta_launcher_new (&error);
if (priv->launcher == NULL) if (native->launcher == NULL)
{ {
g_warning ("Can't initialize KMS backend: %s\n", error->message); g_warning ("Can't initialize KMS backend: %s\n", error->message);
exit (1); exit (1);
} }
priv->barrier_manager = meta_barrier_manager_native_new (); native->barrier_manager = meta_barrier_manager_native_new ();
} }
MetaLauncher * MetaLauncher *
meta_backend_native_get_launcher (MetaBackendNative *native) meta_backend_native_get_launcher (MetaBackendNative *native)
{ {
MetaBackendNativePrivate *priv = return native->launcher;
meta_backend_native_get_instance_private (native);
return priv->launcher;
} }
gboolean gboolean
@ -610,10 +598,7 @@ meta_activate_vt (int vt, GError **error)
MetaBarrierManagerNative * MetaBarrierManagerNative *
meta_backend_native_get_barrier_manager (MetaBackendNative *native) meta_backend_native_get_barrier_manager (MetaBackendNative *native)
{ {
MetaBackendNativePrivate *priv = return native->barrier_manager;
meta_backend_native_get_instance_private (native);
return priv->barrier_manager;
} }
/** /**
@ -634,9 +619,8 @@ meta_activate_session (void)
return TRUE; return TRUE;
MetaBackendNative *native = META_BACKEND_NATIVE (backend); MetaBackendNative *native = META_BACKEND_NATIVE (backend);
MetaBackendNativePrivate *priv = meta_backend_native_get_instance_private (native);
if (!meta_launcher_activate_session (priv->launcher, &error)) if (!meta_launcher_activate_session (native->launcher, &error))
{ {
g_warning ("Could not activate session: %s\n", error->message); g_warning ("Could not activate session: %s\n", error->message);
g_error_free (error); g_error_free (error);