aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksander Morgado <aleksander@aleksander.es>2019-07-02 18:56:54 +0200
committerAleksander Morgado <aleksander@aleksander.es>2019-07-11 23:21:00 +0200
commit272abc6394ae4dc29d8a3ac2d38e5943a9347f05 (patch)
tree121ebdc326ae17fc0f9c303393eda11c2304f2aa
parent148466f7680c287d4b7c8204203c3292a6250de4 (diff)
iface-modem-voice: use g_object_connect() to connect all handlers
-rw-r--r--src/mm-iface-modem-voice.c41
1 files changed, 10 insertions, 31 deletions
diff --git a/src/mm-iface-modem-voice.c b/src/mm-iface-modem-voice.c
index 5ced2dd9..de4efc62 100644
--- a/src/mm-iface-modem-voice.c
+++ b/src/mm-iface-modem-voice.c
@@ -2770,37 +2770,16 @@ interface_initialization_step (GTask *task)
ctx->step++;
case INITIALIZATION_STEP_LAST:
- /* We are done without errors! */
-
- /* Handle method invocations */
- g_signal_connect (ctx->skeleton,
- "handle-create-call",
- G_CALLBACK (handle_create),
- self);
- g_signal_connect (ctx->skeleton,
- "handle-delete-call",
- G_CALLBACK (handle_delete),
- self);
- g_signal_connect (ctx->skeleton,
- "handle-list-calls",
- G_CALLBACK (handle_list),
- self);
- g_signal_connect (ctx->skeleton,
- "handle-hangup-and-accept",
- G_CALLBACK (handle_hangup_and_accept),
- self);
- g_signal_connect (ctx->skeleton,
- "handle-hold-and-accept",
- G_CALLBACK (handle_hold_and_accept),
- self);
- g_signal_connect (ctx->skeleton,
- "handle-hangup-all",
- G_CALLBACK (handle_hangup_all),
- self);
- g_signal_connect (ctx->skeleton,
- "handle-transfer",
- G_CALLBACK (handle_transfer),
- self);
+ /* Setup all method handlers */
+ g_object_connect (ctx->skeleton,
+ "signal::handle-create-call", G_CALLBACK (handle_create), self,
+ "signal::handle-delete-call", G_CALLBACK (handle_delete), self,
+ "signal::handle-list-calls", G_CALLBACK (handle_list), self,
+ "signal::handle-hangup-and-accept", G_CALLBACK (handle_hangup_and_accept), self,
+ "signal::handle-hold-and-accept", G_CALLBACK (handle_hold_and_accept), self,
+ "signal::handle-hangup-all", G_CALLBACK (handle_hangup_all), self,
+ "signal::handle-transfer", G_CALLBACK (handle_transfer), self,
+ NULL);
/* Finally, export the new interface */
mm_gdbus_object_skeleton_set_modem_voice (MM_GDBUS_OBJECT_SKELETON (self),