kbe/calls
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use correct parent class when chaining up overridden functions

Browse Source 
How `g_type_class_peek ()` was used it didn't return the correct parent
class in most cases.
G_DEFINE_TYPE macro creates a pointer we can use to get the parent
class `n_p_parent_class`.
Because we didn't use the correct parent class the object initialisation
wasn't fully completed for some GtkWidgets.
See https://developer.gnome.org/gobject/stable/chapter-gobject.html#gobject-instantiation
for more information.

This commit makes use of the `n_p_parent_class pointer` created for this
specific use case where ever possible.

Fixes: https://source.puri.sm/Librem5/calls/issues/118
This commit is contained in:
Julian Sparber
2020-02-18 16:01:22 +01:00
parent 06481155fd
commit e911f391c6
24 changed files with 50 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
plugins/mm/calls-mm-call.c
View File

@@ -311,7 +311,6 @@ set_property (GObject *object,
static void
constructed (GObject *object)
{
GObjectClass *parent_class = g_type_class_peek (G_TYPE_OBJECT);
CallsMMCall *self = CALLS_MM_CALL (object);
MmGdbusCall *gdbus_call = MM_GDBUS_CALL (self->mm_call);
MMCallState state;
@@ -336,7 +335,7 @@ constructed (GObject *object)
start_call (CALLS_CALL (self));
}
parent_class->constructed (object);
G_OBJECT_CLASS (calls_mm_call_parent_class)->constructed (object);
}
@@ -365,25 +364,23 @@ get_property (GObject *object,
static void
dispose (GObject *object)
{
GObjectClass *parent_class = g_type_class_peek (G_TYPE_OBJECT);
CallsMMCall *self = CALLS_MM_CALL (object);
g_clear_object (&self->mm_call);
parent_class->dispose (object);
G_OBJECT_CLASS (calls_mm_call_parent_class)->dispose (object);
}
static void
finalize (GObject *object)
{
GObjectClass *parent_class = g_type_class_peek (G_TYPE_OBJECT);
CallsMMCall *self = CALLS_MM_CALL (object);
g_free (self->disconnect_reason);
g_string_free (self->number, TRUE);
parent_class->finalize (object);
G_OBJECT_CLASS (calls_mm_call_parent_class)->finalize (object);
}

9
plugins/mm/calls-mm-origin.c
View File

@@ -446,7 +446,6 @@ modem_get_name (MMModem *modem)
static void
constructed (GObject *object)
{
GObjectClass *parent_class = g_type_class_peek (G_TYPE_OBJECT);
CallsMMOrigin *self = CALLS_MM_ORIGIN (object);
MmGdbusModemVoice *gdbus_voice;
@@ -466,33 +465,31 @@ constructed (GObject *object)
NULL,
(GAsyncReadyCallback) list_calls_cb,
self);
parent_class->constructed (object);
G_OBJECT_CLASS (calls_mm_origin_parent_class)->constructed (object);
}
static void
dispose (GObject *object)
{
GObjectClass *parent_class = g_type_class_peek (G_TYPE_OBJECT);
CallsMMOrigin *self = CALLS_MM_ORIGIN (object);
remove_calls (self, NULL);
g_clear_object (&self->mm_obj);
parent_class->dispose (object);
G_OBJECT_CLASS (calls_mm_origin_parent_class)->dispose (object);
}
static void
finalize (GObject *object)
{
GObjectClass *parent_class = g_type_class_peek (G_TYPE_OBJECT);
CallsMMOrigin *self = CALLS_MM_ORIGIN (object);
g_hash_table_unref (self->calls);
g_free (self->name);
parent_class->finalize (object);
G_OBJECT_CLASS (calls_mm_origin_parent_class)->finalize (object);
}

9
plugins/mm/calls-mm-provider.c
View File

@@ -357,7 +357,6 @@ mm_vanished_cb (GDBusConnection *connection,
static void
constructed (GObject *object)
{
GObjectClass *parent_class = g_type_class_peek (G_TYPE_OBJECT);
CallsMMProvider *self = CALLS_MM_PROVIDER (object);
self->watch_id =
@@ -370,7 +369,7 @@ constructed (GObject *object)
g_debug ("Watching for ModemManager");
parent_class->constructed (object);
G_OBJECT_CLASS (calls_mm_provider_parent_class)->constructed (object);
}
@@ -397,7 +396,6 @@ get_property (GObject *object,
static void
dispose (GObject *object)
{
GObjectClass *parent_class = g_type_class_peek (G_TYPE_OBJECT);
CallsMMProvider *self = CALLS_MM_PROVIDER (object);
if (self->watch_id)
@@ -408,20 +406,19 @@ dispose (GObject *object)
clear_dbus (self);
parent_class->dispose (object);
G_OBJECT_CLASS (calls_mm_provider_parent_class)->dispose (object);
}
static void
finalize (GObject *object)
{
GObjectClass *parent_class = g_type_class_peek (G_TYPE_OBJECT);
CallsMMProvider *self = CALLS_MM_PROVIDER (object);
g_hash_table_unref (self->origins);
g_free (self->status);
parent_class->finalize (object);
G_OBJECT_CLASS (calls_mm_provider_parent_class)->finalize (object);
}