colin/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

iface-modem-3gpp: minor rename of variables

Browse Source
This commit is contained in:
Aleksander Morgado
2023-04-14 11:43:24 +02:00
committed by Aleksander Morgado
parent d77674d3f4
commit b9a7cad247
1 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/mm-iface-modem-3gpp.c
View File

@@ -135,8 +135,8 @@ GET_NETWORK_SUPPORTED (5gs, 5GS)
typedef struct { typedef struct {
MMModem3gppPacketServiceState final_state; MMModem3gppPacketServiceState final_state;
gulong packet_service_state_changed_id; gulong state_changed_id;
guint packet_service_state_changed_wait_id; guint timeout_id;
} WaitForPacketServiceStateContext; } WaitForPacketServiceStateContext;
MMModem3gppPacketServiceState MMModem3gppPacketServiceState
@@ -166,15 +166,15 @@ wait_for_packet_service_state_context_complete (GTask *t
self = g_task_get_source_object (task); self = g_task_get_source_object (task);
ctx = g_task_get_task_data (task); ctx = g_task_get_task_data (task);
if (ctx->packet_service_state_changed_id) { if (ctx->state_changed_id) {
if (g_signal_handler_is_connected (self, ctx->packet_service_state_changed_id)) if (g_signal_handler_is_connected (self, ctx->state_changed_id))
g_signal_handler_disconnect (self, ctx->packet_service_state_changed_id); g_signal_handler_disconnect (self, ctx->state_changed_id);
ctx->packet_service_state_changed_id = 0; ctx->state_changed_id = 0;
} }
if (ctx->packet_service_state_changed_wait_id) { if (ctx->timeout_id) {
g_source_remove (ctx->packet_service_state_changed_wait_id); g_source_remove (ctx->timeout_id);
ctx->packet_service_state_changed_wait_id = 0; ctx->timeout_id = 0;
} }
if (error) if (error)
@@ -253,12 +253,12 @@ mm_iface_modem_3gpp_wait_for_packet_service_state (MMIfaceModem3gpp
g_task_set_task_data (task, ctx, g_free); g_task_set_task_data (task, ctx, g_free);
/* Want to get notified when packet service state changes */ /* Want to get notified when packet service state changes */
ctx->packet_service_state_changed_id = g_signal_connect (self, ctx->state_changed_id = g_signal_connect (self,
"notify::" MM_IFACE_MODEM_3GPP_PACKET_SERVICE_STATE, "notify::" MM_IFACE_MODEM_3GPP_PACKET_SERVICE_STATE,
G_CALLBACK (packet_service_state_changed), G_CALLBACK (packet_service_state_changed),
task); task);
/* But we don't want to wait forever */ /* But we don't want to wait forever */
ctx->packet_service_state_changed_wait_id = g_timeout_add_seconds (10, ctx->timeout_id = g_timeout_add_seconds (10,
(GSourceFunc)packet_service_state_changed_wait_expired, (GSourceFunc)packet_service_state_changed_wait_expired,
task); task);
} }