aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Williams <dan@ioncontrol.co>2025-04-19 20:26:43 -0500
committerDan Williams <dan@ioncontrol.co>2025-05-08 20:24:38 -0500
commit51ff44f1f5fc54470596ee538855e1ca42ee43b8 (patch)
treeab08f3424bafe7a1537d8c76b1c703ca4b1c9b79
parent03027b5ec2821b11c64966b2bf79d24ef42d5777 (diff)
sms-list: remove usage of MMBaseModem
Not used for anything anymore so we can remove the property. Signed-off-by: Dan Williams <dan@ioncontrol.co>
-rw-r--r--src/mm-iface-modem-messaging.c2
-rw-r--r--src/mm-sms-list.c24
-rw-r--r--src/mm-sms-list.h7
3 files changed, 4 insertions, 29 deletions
diff --git a/src/mm-iface-modem-messaging.c b/src/mm-iface-modem-messaging.c
index d349de35..93cd0ae1 100644
--- a/src/mm-iface-modem-messaging.c
+++ b/src/mm-iface-modem-messaging.c
@@ -1020,7 +1020,7 @@ interface_enabling_step (GTask *task)
case ENABLING_STEP_FIRST: {
MMSmsList *list;
- list = mm_sms_list_new (MM_BASE_MODEM (self), G_OBJECT (self));
+ list = mm_sms_list_new (G_OBJECT (self));
g_object_set (self,
MM_IFACE_MODEM_MESSAGING_SMS_LIST, list,
NULL);
diff --git a/src/mm-sms-list.c b/src/mm-sms-list.c
index b4b8619b..30ce1cc4 100644
--- a/src/mm-sms-list.c
+++ b/src/mm-sms-list.c
@@ -24,7 +24,6 @@
#define _LIBMM_INSIDE_MM
#include <libmm-glib.h>
-#include "mm-iface-modem-messaging.h"
#include "mm-sms-list.h"
#include "mm-base-sms.h"
#include "mm-log-object.h"
@@ -40,10 +39,8 @@ G_DEFINE_TYPE_EXTENDED (MMSmsList, mm_sms_list, G_TYPE_OBJECT, 0,
enum {
PROP_0,
PROP_BIND_TO,
- PROP_MODEM,
PROP_LAST
};
-static GParamSpec *properties[PROP_LAST];
enum {
SIGNAL_ADDED,
@@ -55,8 +52,6 @@ static guint signals[SIGNAL_LAST];
struct _MMSmsListPrivate {
/* The object this SMS list is bound to */
GObject *bind_to;
- /* The owner modem */
- MMBaseModem *modem;
/* List of sms objects */
GList *list;
};
@@ -456,11 +451,10 @@ log_object_build_id (MMLogObject *_self)
/*****************************************************************************/
MMSmsList *
-mm_sms_list_new (MMBaseModem *modem, GObject *bind_to)
+mm_sms_list_new (GObject *bind_to)
{
/* Create the object */
return g_object_new (MM_TYPE_SMS_LIST,
- MM_SMS_LIST_MODEM, modem,
MM_BIND_TO, bind_to,
NULL);
}
@@ -479,10 +473,6 @@ set_property (GObject *object,
self->priv->bind_to = g_value_dup_object (value);
mm_bind_to (MM_BIND (self), NULL, self->priv->bind_to);
break;
- case PROP_MODEM:
- g_clear_object (&self->priv->modem);
- self->priv->modem = g_value_dup_object (value);
- break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
@@ -501,9 +491,6 @@ get_property (GObject *object,
case PROP_BIND_TO:
g_value_set_object (value, self->priv->bind_to);
break;
- case PROP_MODEM:
- g_value_set_object (value, self->priv->modem);
- break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
@@ -524,7 +511,6 @@ dispose (GObject *object)
{
MMSmsList *self = MM_SMS_LIST (object);
- g_clear_object (&self->priv->modem);
g_clear_object (&self->priv->bind_to);
g_list_foreach (self->priv->list, (GFunc)_release_sms_internal, self);
g_clear_pointer (&self->priv->list, (GDestroyNotify)g_list_free);
@@ -556,14 +542,6 @@ mm_sms_list_class_init (MMSmsListClass *klass)
object_class->dispose = dispose;
/* Properties */
- properties[PROP_MODEM] =
- g_param_spec_object (MM_SMS_LIST_MODEM,
- "Modem",
- "The Modem which owns this SMS list",
- MM_TYPE_BASE_MODEM,
- G_PARAM_READWRITE);
- g_object_class_install_property (object_class, PROP_MODEM, properties[PROP_MODEM]);
-
g_object_class_override_property (object_class, PROP_BIND_TO, MM_BIND_TO);
/* Signals */
diff --git a/src/mm-sms-list.h b/src/mm-sms-list.h
index 53fa63f0..51228672 100644
--- a/src/mm-sms-list.h
+++ b/src/mm-sms-list.h
@@ -19,7 +19,7 @@
#include <glib.h>
#include <glib-object.h>
-#include "mm-base-modem.h"
+#include "mm-base-sms.h"
#include "mm-sms-part.h"
#define MM_TYPE_SMS_LIST (mm_sms_list_get_type ())
@@ -33,8 +33,6 @@ typedef struct _MMSmsList MMSmsList;
typedef struct _MMSmsListClass MMSmsListClass;
typedef struct _MMSmsListPrivate MMSmsListPrivate;
-#define MM_SMS_LIST_MODEM "sms-list-modem"
-
#define MM_SMS_ADDED "sms-added"
#define MM_SMS_DELETED "sms-deleted"
@@ -57,8 +55,7 @@ struct _MMSmsListClass {
GType mm_sms_list_get_type (void);
G_DEFINE_AUTOPTR_CLEANUP_FUNC (MMSmsList, g_object_unref)
-MMSmsList *mm_sms_list_new (MMBaseModem *modem,
- GObject *bind_to);
+MMSmsList *mm_sms_list_new (GObject *bind_to);
GStrv mm_sms_list_get_paths (MMSmsList *self);
guint mm_sms_list_get_count (MMSmsList *self);