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

iface-modem-time: port to use object logging

Browse Source
This commit is contained in:
Aleksander Morgado
2020-03-29 19:10:47 +02:00
parent 91de19e3ae
commit c8c31f0613
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/mm-iface-modem-time.c
View File

@@ -19,7 +19,7 @@
#include "mm-iface-modem.h" #include "mm-iface-modem.h"
#include "mm-iface-modem-time.h" #include "mm-iface-modem-time.h"
#include "mm-log.h" #include "mm-log-object.h"
#define SUPPORT_CHECKED_TAG "time-support-checked-tag" #define SUPPORT_CHECKED_TAG "time-support-checked-tag"
#define SUPPORTED_TAG "time-supported-tag" #define SUPPORTED_TAG "time-supported-tag"
@@ -202,7 +202,7 @@ load_network_timezone_ready (MMIfaceModemTime *self,
if (!tz) { if (!tz) {
NetworkTimezoneContext *ctx; NetworkTimezoneContext *ctx;
mm_dbg ("Couldn't load network timezone: %s", error->message); mm_obj_dbg (self, "couldn't load network timezone: %s", error->message);
g_error_free (error); g_error_free (error);
/* Note: may be NULL if the polling has been removed while processing the async operation */ /* Note: may be NULL if the polling has been removed while processing the async operation */
@@ -216,7 +216,7 @@ load_network_timezone_ready (MMIfaceModemTime *self,
/* If no more retries, we don't do anything else */ /* If no more retries, we don't do anything else */
if (ctx->network_timezone_poll_retries == 0 || if (ctx->network_timezone_poll_retries == 0 ||
!g_error_matches (error, MM_CORE_ERROR, MM_CORE_ERROR_RETRY)) { !g_error_matches (error, MM_CORE_ERROR, MM_CORE_ERROR_RETRY)) {
mm_warn ("Couldn't load network timezone from the current network"); mm_obj_warn (self, "couldn't load network timezone from the current network");
return; return;
} }
@@ -255,7 +255,7 @@ start_network_timezone_poll (MMIfaceModemTime *self)
ctx = (NetworkTimezoneContext *) g_object_get_qdata (G_OBJECT (self), network_timezone_context_quark); ctx = (NetworkTimezoneContext *) g_object_get_qdata (G_OBJECT (self), network_timezone_context_quark);
mm_dbg ("Network timezone polling started"); mm_obj_dbg (self, "network timezone polling started");
ctx->network_timezone_poll_retries = NETWORK_TIMEZONE_POLL_RETRIES; ctx->network_timezone_poll_retries = NETWORK_TIMEZONE_POLL_RETRIES;
ctx->network_timezone_poll_id = g_timeout_add_seconds (NETWORK_TIMEZONE_POLL_INTERVAL_SEC, (GSourceFunc)network_timezone_poll_cb, self); ctx->network_timezone_poll_id = g_timeout_add_seconds (NETWORK_TIMEZONE_POLL_INTERVAL_SEC, (GSourceFunc)network_timezone_poll_cb, self);
} }
@@ -268,7 +268,7 @@ stop_network_timezone_poll (MMIfaceModemTime *self)
ctx = (NetworkTimezoneContext *) g_object_get_qdata (G_OBJECT (self), network_timezone_context_quark); ctx = (NetworkTimezoneContext *) g_object_get_qdata (G_OBJECT (self), network_timezone_context_quark);
if (ctx->network_timezone_poll_id) { if (ctx->network_timezone_poll_id) {
mm_dbg ("Network timezone polling stopped"); mm_obj_dbg (self, "network timezone polling stopped");
g_source_remove (ctx->network_timezone_poll_id); g_source_remove (ctx->network_timezone_poll_id);
ctx->network_timezone_poll_id = 0; ctx->network_timezone_poll_id = 0;
} }
@@ -322,7 +322,7 @@ start_network_timezone (MMIfaceModemTime *self)
/* If loading network timezone not supported, just finish here */ /* If loading network timezone not supported, just finish here */
if (!MM_IFACE_MODEM_TIME_GET_INTERFACE (self)->load_network_timezone || if (!MM_IFACE_MODEM_TIME_GET_INTERFACE (self)->load_network_timezone ||
!MM_IFACE_MODEM_TIME_GET_INTERFACE (self)->load_network_timezone_finish) { !MM_IFACE_MODEM_TIME_GET_INTERFACE (self)->load_network_timezone_finish) {
mm_dbg ("Loading network timezone is not supported"); mm_obj_dbg (self, "loading network timezone is not supported");
return; return;
} }
@@ -622,7 +622,7 @@ enable_unsolicited_events_ready (MMIfaceModemTime *self,
/* Not critical! */ /* Not critical! */
if (!MM_IFACE_MODEM_TIME_GET_INTERFACE (self)->enable_unsolicited_events_finish (self, res, &error)) { if (!MM_IFACE_MODEM_TIME_GET_INTERFACE (self)->enable_unsolicited_events_finish (self, res, &error)) {
mm_dbg ("Couldn't enable unsolicited events: '%s'", error->message); mm_obj_dbg (self, "couldn't enable unsolicited events: %s", error->message);
g_error_free (error); g_error_free (error);
} }
@@ -764,7 +764,7 @@ check_support_ready (MMIfaceModemTime *self,
&error)) { &error)) {
if (error) { if (error) {
/* This error shouldn't be treated as critical */ /* This error shouldn't be treated as critical */
mm_dbg ("Time support check failed: '%s'", error->message); mm_obj_dbg (self, "time support check failed: %s", error->message);
g_error_free (error); g_error_free (error);
} }
} else { } else {