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

iface-modem-messaging: port to use object logging

Browse Source
This commit is contained in:
Aleksander Morgado
2020-03-29 18:58:07 +02:00
parent 7d5871c59c
commit 135b5c8065
1 changed files with 24 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
src/mm-iface-modem-messaging.c
View File

@@ -20,7 +20,7 @@
#include "mm-iface-modem.h" #include "mm-iface-modem.h"
#include "mm-iface-modem-messaging.h" #include "mm-iface-modem-messaging.h"
#include "mm-sms-list.h" #include "mm-sms-list.h"
#include "mm-log.h" #include "mm-log-object.h"
#define SUPPORT_CHECKED_TAG "messaging-support-checked-tag" #define SUPPORT_CHECKED_TAG "messaging-support-checked-tag"
#define SUPPORTED_TAG "messaging-supported-tag" #define SUPPORTED_TAG "messaging-supported-tag"
@@ -426,7 +426,7 @@ mm_iface_modem_messaging_take_part (MMIfaceModemMessaging *self,
added = mm_sms_list_take_part (list, sms_part, state, storage, &error); added = mm_sms_list_take_part (list, sms_part, state, storage, &error);
if (!added) { if (!added) {
mm_dbg ("Couldn't take part in SMS list: '%s'", error->message); mm_obj_dbg (self, "couldn't take part in SMS list: %s", error->message);
g_error_free (error); g_error_free (error);
/* If part wasn't taken, we need to free the part ourselves */ /* If part wasn't taken, we need to free the part ourselves */
@@ -503,24 +503,20 @@ update_message_list (MmGdbusModemMessaging *skeleton,
} }
static void static void
sms_added (MMSmsList *list, sms_added (MMSmsList *list,
const gchar *sms_path, const gchar *sms_path,
gboolean received, gboolean received,
MmGdbusModemMessaging *skeleton) MmGdbusModemMessaging *skeleton)
{ {
mm_dbg ("Added %s SMS at '%s'",
received ? "received" : "local",
sms_path);
update_message_list (skeleton, list); update_message_list (skeleton, list);
mm_gdbus_modem_messaging_emit_added (skeleton, sms_path, received); mm_gdbus_modem_messaging_emit_added (skeleton, sms_path, received);
} }
static void static void
sms_deleted (MMSmsList *list, sms_deleted (MMSmsList *list,
const gchar *sms_path, const gchar *sms_path,
MmGdbusModemMessaging *skeleton) MmGdbusModemMessaging *skeleton)
{ {
mm_dbg ("Deleted SMS at '%s'", sms_path);
update_message_list (skeleton, list); update_message_list (skeleton, list);
mm_gdbus_modem_messaging_emit_deleted (skeleton, sms_path); mm_gdbus_modem_messaging_emit_deleted (skeleton, sms_path);
} }
@@ -762,11 +758,11 @@ load_initial_sms_parts_ready (MMIfaceModemMessaging *self,
StorageContext *storage_ctx; StorageContext *storage_ctx;
storage_ctx = get_storage_context (self); storage_ctx = get_storage_context (self);
mm_dbg ("Couldn't load SMS parts from storage '%s': '%s'", mm_obj_dbg (self, "couldn't load SMS parts from storage '%s': %s",
mm_sms_storage_get_string (g_array_index (storage_ctx->supported_mem1, mm_sms_storage_get_string (g_array_index (storage_ctx->supported_mem1,
MMSmsStorage, MMSmsStorage,
ctx->mem1_storage_index)), ctx->mem1_storage_index)),
error->message); error->message);
g_error_free (error); g_error_free (error);
} }
@@ -784,7 +780,7 @@ set_default_storage_ready (MMIfaceModemMessaging *self,
GError *error = NULL; GError *error = NULL;
if (!MM_IFACE_MODEM_MESSAGING_GET_INTERFACE (self)->set_default_storage_finish (self, res, &error)) { if (!MM_IFACE_MODEM_MESSAGING_GET_INTERFACE (self)->set_default_storage_finish (self, res, &error)) {
mm_warn ("Could not set default storage: '%s'", error->message); mm_obj_warn (self, "could not set default storage: %s", error->message);
g_error_free (error); g_error_free (error);
} }
@@ -866,7 +862,7 @@ enable_unsolicited_events_ready (MMIfaceModemMessaging *self,
/* Not critical! */ /* Not critical! */
if (!MM_IFACE_MODEM_MESSAGING_GET_INTERFACE (self)->enable_unsolicited_events_finish (self, res, &error)) { if (!MM_IFACE_MODEM_MESSAGING_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);
} }
@@ -989,7 +985,7 @@ interface_enabling_step (GTask *task)
NULL); NULL);
if (default_storage == MM_SMS_STORAGE_UNKNOWN) if (default_storage == MM_SMS_STORAGE_UNKNOWN)
mm_info ("Cannot set default storage, none of the suggested ones supported"); mm_obj_warn (self, "cannot set default storage, none of the suggested ones supported");
else if (MM_IFACE_MODEM_MESSAGING_GET_INTERFACE (self)->set_default_storage && else if (MM_IFACE_MODEM_MESSAGING_GET_INTERFACE (self)->set_default_storage &&
MM_IFACE_MODEM_MESSAGING_GET_INTERFACE (self)->set_default_storage_finish) { MM_IFACE_MODEM_MESSAGING_GET_INTERFACE (self)->set_default_storage_finish) {
MM_IFACE_MODEM_MESSAGING_GET_INTERFACE (self)->set_default_storage ( MM_IFACE_MODEM_MESSAGING_GET_INTERFACE (self)->set_default_storage (
@@ -1141,7 +1137,7 @@ load_supported_storages_ready (MMIfaceModemMessaging *self,
&storage_ctx->supported_mem2, &storage_ctx->supported_mem2,
&storage_ctx->supported_mem3, &storage_ctx->supported_mem3,
&error)) { &error)) {
mm_dbg ("Couldn't load supported storages: '%s'", error->message); mm_obj_dbg (self, "couldn't load supported storages: %s", error->message);
g_error_free (error); g_error_free (error);
} else { } else {
gchar *mem1; gchar *mem1;
@@ -1162,10 +1158,10 @@ load_supported_storages_ready (MMIfaceModemMessaging *self,
mem3 = mm_common_build_sms_storages_string ((MMSmsStorage *)storage_ctx->supported_mem3->data, mem3 = mm_common_build_sms_storages_string ((MMSmsStorage *)storage_ctx->supported_mem3->data,
storage_ctx->supported_mem3->len); storage_ctx->supported_mem3->len);
mm_dbg ("Supported storages loaded:"); mm_obj_dbg (self, "supported storages loaded:");
mm_dbg (" mem1 (list/read/delete) storages: '%s'", mem1); mm_obj_dbg (self, " mem1 (list/read/delete) storages: '%s'", mem1);
mm_dbg (" mem2 (write/send) storages: '%s'", mem2); mm_obj_dbg (self, " mem2 (write/send) storages: '%s'", mem2);
mm_dbg (" mem3 (reception) storages: '%s'", mem3); mm_obj_dbg (self, " mem3 (reception) storages: '%s'", mem3);
g_free (mem1); g_free (mem1);
g_free (mem2); g_free (mem2);
g_free (mem3); g_free (mem3);
@@ -1215,7 +1211,7 @@ check_support_ready (MMIfaceModemMessaging *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 ("Messaging support check failed: '%s'", error->message); mm_obj_dbg (self, "messaging support check failed: %s", error->message);
g_error_free (error); g_error_free (error);
} }
} else { } else {
@@ -1243,11 +1239,10 @@ init_current_storages_ready (MMIfaceModemMessaging *self,
self, self,
res, res,
&error)) { &error)) {
mm_dbg ("Couldn't initialize current storages: '%s'", error->message); mm_obj_dbg (self, "couldn't initialize current storages: %s", error->message);
g_error_free (error); g_error_free (error);
} else { } else
mm_dbg ("Current storages initialized"); mm_obj_dbg (self, "current storages initialized");
}
/* Go on to next step */ /* Go on to next step */
ctx = g_task_get_task_data (task); ctx = g_task_get_task_data (task);