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

call: Move inbound property into base class

Browse Source 
This avoids some repetition in the derived classes.
This commit is contained in:
Evangelos Ribeiro Tzaras
2021-12-10 08:00:11 +01:00
parent 88cd7ce222
commit ddf1dd7349
7 changed files with 66 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
plugins/dummy/calls-dummy-call.c
View File

@@ -33,7 +33,6 @@ struct _CallsDummyCall
{
GObject parent_instance;
gchar *id;
gboolean inbound;
CallsCallState state;
};
@@ -46,7 +45,6 @@ G_DEFINE_TYPE_WITH_CODE (CallsDummyCall, calls_dummy_call, CALLS_TYPE_CALL,
enum {
PROP_0,
PROP_ID_CONSTRUCTOR,
PROP_INBOUND_CONSTRUCTOR,
PROP_LAST_PROP
};
static GParamSpec *props[PROP_LAST_PROP];
@@ -86,14 +84,6 @@ calls_dummy_call_get_state (CallsCall *call)
return self->state;
}
static gboolean
calls_dummy_call_get_inbound (CallsCall *call)
{
CallsDummyCall *self = CALLS_DUMMY_CALL (call);
return self->inbound;
}
static const char*
calls_dummy_call_get_protocol (CallsCall *call)
{
@@ -163,7 +153,7 @@ calls_dummy_call_new (const gchar *id,
return g_object_new (CALLS_TYPE_DUMMY_CALL,
"id-constructor", id,
"inbound-constructor", inbound,
"inbound", inbound,
NULL);
}
@@ -181,10 +171,6 @@ set_property (GObject *object,
self->id = g_value_dup_string (value);
break;
case PROP_INBOUND_CONSTRUCTOR:
self->inbound = g_value_get_boolean (value);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
break;
@@ -197,15 +183,12 @@ constructed (GObject *object)
{
CallsDummyCall *self = CALLS_DUMMY_CALL (object);
if (self->inbound)
{
self->state = CALLS_CALL_STATE_INCOMING;
}
else
{
self->state = CALLS_CALL_STATE_DIALING;
g_timeout_add_seconds (1, (GSourceFunc)outbound_timeout_cb, self);
}
if (calls_call_get_inbound (CALLS_CALL (object))) {
self->state = CALLS_CALL_STATE_INCOMING;
} else {
self->state = CALLS_CALL_STATE_DIALING;
g_timeout_add_seconds (1, (GSourceFunc)outbound_timeout_cb, self);
}
G_OBJECT_CLASS (calls_dummy_call_parent_class)->constructed (object);
}
@@ -233,7 +216,6 @@ calls_dummy_call_class_init (CallsDummyCallClass *klass)
call_class->get_id = calls_dummy_call_get_id;
call_class->get_state = calls_dummy_call_get_state;
call_class->get_inbound = calls_dummy_call_get_inbound;
call_class->get_protocol = calls_dummy_call_get_protocol;
call_class->answer = calls_dummy_call_answer;
call_class->hang_up = calls_dummy_call_hang_up;
@@ -246,14 +228,6 @@ calls_dummy_call_class_init (CallsDummyCallClass *klass)
"+441234567890",
G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY);
g_object_class_install_property (object_class, PROP_ID_CONSTRUCTOR, props[PROP_ID_CONSTRUCTOR]);
props[PROP_INBOUND_CONSTRUCTOR] =
g_param_spec_boolean ("inbound-constructor",
"Inbound (constructor)",
"Whether the calls is inbound (dummy class constructor)",
FALSE,
G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY);
g_object_class_install_property (object_class, PROP_INBOUND_CONSTRUCTOR, props[PROP_INBOUND_CONSTRUCTOR]);
}
static void