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

Merge branch 'dispose' into 'master'

Browse Source 
Drop macros already in GLib

See merge request Librem5/calls!12
This commit is contained in:
Bob Ham
2018-08-03 09:50:34 +00:00
parent 700966ccfe 90f3933e95
commit bd5858006c
10 changed files with 32 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/calls-call-data.c
View File

@@ -72,11 +72,11 @@ set_property (GObject *object,
switch (property_id) {
case PROP_CALL:
CALLS_SET_OBJECT_PROPERTY (self->call, CALLS_CALL (g_value_get_object (value)));
g_set_object (&self->call, CALLS_CALL (g_value_get_object (value)));
break;
case PROP_PARTY:
CALLS_SET_OBJECT_PROPERTY (self->party, CALLS_PARTY (g_value_get_object (value)));
g_set_object (&self->party, CALLS_PARTY (g_value_get_object (value)));
break;
default:
@@ -116,8 +116,8 @@ dispose (GObject *object)
GObjectClass *parent_class = g_type_class_peek (G_TYPE_OBJECT);
CallsCallData *self = CALLS_CALL_DATA (object);
CALLS_DISPOSE_OBJECT (self->call);
CALLS_DISPOSE_OBJECT (self->party);
g_clear_object (&self->call);
g_clear_object (&self->party);
parent_class->dispose (object);
}

2
src/calls-call-display.c
View File

@@ -279,7 +279,7 @@ dispose (GObject *object)
GObjectClass *parent_class = g_type_class_peek (GTK_TYPE_BOX);
CallsCallDisplay *self = CALLS_CALL_DISPLAY (object);
CALLS_DISPOSE_OBJECT (self->call);
g_clear_object (&self->call);
parent_class->dispose (object);
}

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

@@ -134,9 +134,9 @@ dispose (GObject *object)
GObjectClass *parent_class = g_type_class_peek (G_TYPE_OBJECT);
CallsCallHolder *self = CALLS_CALL_HOLDER (object);
CALLS_DISPOSE_OBJECT (self->selector_item);
CALLS_DISPOSE_OBJECT (self->display);
CALLS_DISPOSE_OBJECT (self->data);
g_clear_object (&self->selector_item);
g_clear_object (&self->display);
g_clear_object (&self->data);
parent_class->dispose (object);
}

4
src/calls-call-selector-item.c
View File

@@ -140,7 +140,7 @@ static void
set_call_holder (CallsCallSelectorItem *self, CallsCallHolder *holder)
{
set_call_data (self, calls_call_holder_get_data (holder));
CALLS_SET_OBJECT_PROPERTY (self->holder, holder);
g_set_object (&self->holder, holder);
}
@@ -191,7 +191,7 @@ dispose (GObject *object)
GObjectClass *parent_class = g_type_class_peek (GTK_TYPE_EVENT_BOX);
CallsCallSelectorItem *self = CALLS_CALL_SELECTOR_ITEM (object);
CALLS_DISPOSE_OBJECT (self->holder);
g_clear_object (&self->holder);
parent_class->dispose (object);
}

4
src/calls-main-window.c
View File

@@ -688,8 +688,8 @@ dispose (GObject *object)
remove_origins (self);
}
CALLS_DISPOSE_OBJECT (self->call_holders);
CALLS_DISPOSE_OBJECT (self->provider);
g_clear_object (&self->call_holders);
g_clear_object (&self->provider);
parent_class->dispose (object);
}

12
src/calls-ofono-call.c
View File

@@ -199,8 +199,8 @@ set_property (GObject *object,
switch (property_id) {
case PROP_VOICE_CALL:
CALLS_SET_OBJECT_PROPERTY
(self->voice_call, GDBO_VOICE_CALL (g_value_get_object (value)));
g_set_object
(&self->voice_call, GDBO_VOICE_CALL (g_value_get_object (value)));
break;
case PROP_PROPERTIES:
@@ -291,7 +291,7 @@ dispose (GObject *object)
GObjectClass *parent_class = g_type_class_peek (G_TYPE_OBJECT);
CallsOfonoCall *self = CALLS_OFONO_CALL (object);
CALLS_DISPOSE_OBJECT (self->voice_call);
g_clear_object (&self->voice_call);
parent_class->dispose (object);
}
@@ -303,9 +303,9 @@ finalize (GObject *object)
GObjectClass *parent_class = g_type_class_peek (G_TYPE_OBJECT);
CallsOfonoCall *self = CALLS_OFONO_CALL (object);
CALLS_FREE_PTR_PROPERTY (self->disconnect_reason);
CALLS_FREE_PTR_PROPERTY (self->name);
CALLS_FREE_PTR_PROPERTY (self->number);
g_free (self->disconnect_reason);
g_free (self->name);
g_free (self->number);
parent_class->finalize (object);
}

6
src/calls-ofono-object.c
View File

@@ -130,9 +130,9 @@ dispose (GObject *object)
GObjectClass *parent_class = g_type_class_peek (G_TYPE_OBJECT);
CallsOfonoObject *self = CALLS_OFONO_OBJECT (object);
CALLS_DISPOSE_OBJECT (self->selector_item);
CALLS_DISPOSE_OBJECT (self->display);
CALLS_DISPOSE_OBJECT (self->data);
g_clear_object (&self->selector_item);
g_clear_object (&self->display);
g_clear_object (&self->data);
parent_class->dispose (object);
}

12
src/calls-ofono-origin.c
View File

@@ -134,8 +134,8 @@ set_property (GObject *object,
switch (property_id) {
case PROP_MODEM:
CALLS_SET_OBJECT_PROPERTY
(self->modem, GDBO_MODEM (g_value_get_object (value)));
g_set_object
(&self->modem, GDBO_MODEM (g_value_get_object (value)));
break;
default:
@@ -476,7 +476,7 @@ constructed (GObject *object)
(GAsyncReadyCallback)voice_new_cb,
self);
CALLS_DISPOSE_OBJECT (self->modem);
g_clear_object (&self->modem);
parent_class->constructed (object);
}
@@ -489,8 +489,8 @@ dispose (GObject *object)
CallsOfonoOrigin *self = CALLS_OFONO_ORIGIN (object);
remove_calls (self, NULL);
CALLS_DISPOSE_OBJECT (self->modem);
CALLS_DISPOSE_OBJECT (self->connection);
g_clear_object (&self->modem);
g_clear_object (&self->connection);
parent_class->dispose (object);
}
@@ -506,7 +506,7 @@ finalize (GObject *object)
{
g_string_free (self->tone_queue, TRUE);
}
CALLS_FREE_PTR_PROPERTY (self->name);
g_free (self->name);
parent_class->finalize (object);
}

8
src/calls-ofono-provider.c
View File

@@ -111,8 +111,8 @@ set_property (GObject *object,
switch (property_id) {
case PROP_CONNECTION:
CALLS_SET_OBJECT_PROPERTY (self->connection,
g_value_get_object (value));
g_set_object (&self->connection,
g_value_get_object (value));
break;
default:
@@ -442,8 +442,8 @@ dispose (GObject *object)
// FIXME
CALLS_DISPOSE_OBJECT (self->manager);
CALLS_DISPOSE_OBJECT (self->connection);
g_clear_object (&self->manager);
g_clear_object (&self->connection);
parent_class->dispose (object);
}

25
src/util.h
View File

@@ -71,31 +71,8 @@ G_BEGIN_DECLS
#define CALLS_DISPOSE_OBJECT(obj_ptr) \
if (obj_ptr) \
{ \
g_object_unref (G_OBJECT (obj_ptr)); \
obj_ptr = NULL; \
}
#define CALLS_SET_OBJECT_PROPERTY(obj_ptr,new_value) \
if (obj_ptr) \
{ \
g_object_unref (G_OBJECT (obj_ptr)); \
} \
obj_ptr = new_value; \
g_object_ref (G_OBJECT (obj_ptr));
#define CALLS_FREE_PTR_PROPERTY(ptr) \
if (ptr) \
{ \
g_free (ptr); \
} \
#define CALLS_SET_PTR_PROPERTY(ptr,new_value) \
CALLS_FREE_PTR_PROPERTY (ptr) \
g_free (ptr); \
ptr = new_value;