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

6
src/calls-call-window.c
View File

@@ -639,7 +639,6 @@ notify (GObject *object,
static void
constructed (GObject *object)
{
GObjectClass *parent_class = g_type_class_peek (GTK_TYPE_APPLICATION_WINDOW);
CallsCallWindow *self = CALLS_CALL_WINDOW (object);
gtk_flow_box_bind_model (self->call_selector,
@@ -649,7 +648,7 @@ constructed (GObject *object)
update_visibility (self);
parent_class->constructed (object);
G_OBJECT_CLASS (calls_call_window_parent_class)->constructed (object);
}
@@ -665,7 +664,6 @@ calls_call_window_init (CallsCallWindow *self)
static void
dispose (GObject *object)
{
GObjectClass *parent_class = g_type_class_peek (GTK_TYPE_APPLICATION_WINDOW);
CallsCallWindow *self = CALLS_CALL_WINDOW (object);
if (self->call_holders)
@@ -676,7 +674,7 @@ dispose (GObject *object)
g_clear_object (&self->call_holders);
stop_info_timeout (self);
parent_class->dispose (object);
G_OBJECT_CLASS (calls_call_window_parent_class)->dispose (object);
}