aboutsummaryrefslogtreecommitdiff
path: root/libmm-glib
diff options
context:
space:
mode:
Diffstat (limited to 'libmm-glib')
-rw-r--r--libmm-glib/Makefile.am3
-rw-r--r--libmm-glib/mm-modem-simple-connect-properties.c123
-rw-r--r--libmm-glib/mm-modem-simple-connect-properties.h71
-rw-r--r--libmm-glib/mm-modem-simple.c10
-rw-r--r--libmm-glib/mm-modem-simple.h5
5 files changed, 6 insertions, 206 deletions
diff --git a/libmm-glib/Makefile.am b/libmm-glib/Makefile.am
index adebf032..7e8e1a3d 100644
--- a/libmm-glib/Makefile.am
+++ b/libmm-glib/Makefile.am
@@ -24,8 +24,6 @@ libmm_glib_la_SOURCES = \
mm-modem-3gpp-ussd.c \
mm-modem-cdma.h \
mm-modem-cdma.c \
- mm-modem-simple-connect-properties.h \
- mm-modem-simple-connect-properties.c \
mm-modem-simple-status-properties.h \
mm-modem-simple-status-properties.c \
mm-modem-simple.h \
@@ -54,7 +52,6 @@ include_HEADERS = \
mm-object.h \
mm-modem.h \
mm-modem-3gpp.h \
- mm-modem-simple-connect-properties.h \
mm-modem-simple-status-properties.h \
mm-modem-simple.h \
mm-sim.h \
diff --git a/libmm-glib/mm-modem-simple-connect-properties.c b/libmm-glib/mm-modem-simple-connect-properties.c
deleted file mode 100644
index ce5ddafb..00000000
--- a/libmm-glib/mm-modem-simple-connect-properties.c
+++ /dev/null
@@ -1,123 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details:
- *
- * Copyright (C) 2011 Aleksander Morgado <aleksander@gnu.org>
- */
-
-#include "mm-modem-simple-connect-properties.h"
-
-void
-mm_modem_simple_connect_properties_set_pin (MMModemSimpleConnectProperties *self,
- const gchar *pin)
-{
- g_return_if_fail (MM_IS_MODEM_SIMPLE_CONNECT_PROPERTIES (self));
-
- mm_common_connect_properties_set_pin (self, pin);
-}
-
-void
-mm_modem_simple_connect_properties_set_operator_id (MMModemSimpleConnectProperties *self,
- const gchar *operator_id)
-{
- g_return_if_fail (MM_IS_MODEM_SIMPLE_CONNECT_PROPERTIES (self));
-
- mm_common_connect_properties_set_operator_id (self, operator_id);
-}
-
-void
-mm_modem_simple_connect_properties_set_bands (MMModemSimpleConnectProperties *self,
- const MMModemBand *bands,
- guint n_bands)
-{
- g_return_if_fail (MM_IS_MODEM_SIMPLE_CONNECT_PROPERTIES (self));
-
- mm_common_connect_properties_set_bands (self, bands, n_bands);
-}
-
-void
-mm_modem_simple_connect_properties_set_allowed_modes (MMModemSimpleConnectProperties *self,
- MMModemMode allowed,
- MMModemMode preferred)
-{
- g_return_if_fail (MM_IS_MODEM_SIMPLE_CONNECT_PROPERTIES (self));
-
- mm_common_connect_properties_set_allowed_modes (self, allowed, preferred);
-}
-
-void
-mm_modem_simple_connect_properties_set_apn (MMModemSimpleConnectProperties *self,
- const gchar *apn)
-{
- g_return_if_fail (MM_IS_MODEM_SIMPLE_CONNECT_PROPERTIES (self));
-
- mm_common_connect_properties_set_apn (self, apn);
-}
-
-void
-mm_modem_simple_connect_properties_set_user (MMModemSimpleConnectProperties *self,
- const gchar *user)
-{
- g_return_if_fail (MM_IS_MODEM_SIMPLE_CONNECT_PROPERTIES (self));
-
- mm_common_connect_properties_set_user (self, user);
-}
-
-void
-mm_modem_simple_connect_properties_set_password (MMModemSimpleConnectProperties *self,
- const gchar *password)
-{
- g_return_if_fail (MM_IS_MODEM_SIMPLE_CONNECT_PROPERTIES (self));
-
- mm_common_connect_properties_set_password (self, password);
-}
-
-void
-mm_modem_simple_connect_properties_set_ip_type (MMModemSimpleConnectProperties *self,
- const gchar *ip_type)
-{
- g_return_if_fail (MM_IS_MODEM_SIMPLE_CONNECT_PROPERTIES (self));
-
- mm_common_connect_properties_set_ip_type (self, ip_type);
-}
-
-void
-mm_modem_simple_connect_properties_set_allow_roaming (MMModemSimpleConnectProperties *self,
- gboolean allow_roaming)
-{
- g_return_if_fail (MM_IS_MODEM_SIMPLE_CONNECT_PROPERTIES (self));
-
- mm_common_connect_properties_set_allow_roaming (self, allow_roaming);
-}
-
-void
-mm_modem_simple_connect_properties_set_number (MMModemSimpleConnectProperties *self,
- const gchar *number)
-{
- g_return_if_fail (MM_IS_MODEM_SIMPLE_CONNECT_PROPERTIES (self));
-
- mm_common_connect_properties_set_number (self, number);
-}
-
-/*****************************************************************************/
-
-MMModemSimpleConnectProperties *
-mm_modem_simple_connect_properties_new_from_string (const gchar *str,
- GError **error)
-{
- return mm_common_connect_properties_new_from_string (str, error);
-}
-
-MMModemSimpleConnectProperties *
-mm_modem_simple_connect_properties_new (void)
-{
- return mm_common_connect_properties_new ();
-}
diff --git a/libmm-glib/mm-modem-simple-connect-properties.h b/libmm-glib/mm-modem-simple-connect-properties.h
deleted file mode 100644
index b4e7c7a3..00000000
--- a/libmm-glib/mm-modem-simple-connect-properties.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details:
- *
- * Copyright (C) 2011 Aleksander Morgado <aleksander@gnu.org>
- */
-
-#ifndef MM_MODEM_SIMPLE_CONNECT_PROPERTIES_H
-#define MM_MODEM_SIMPLE_CONNECT_PROPERTIES_H
-
-#include <ModemManager.h>
-#include <glib-object.h>
-
-#include <libmm-common.h>
-
-G_BEGIN_DECLS
-
-typedef MMCommonConnectProperties MMModemSimpleConnectProperties;
-#define MM_TYPE_MODEM_SIMPLE_CONNECT_PROPERTIES(o) MM_TYPE_COMMON_CONNECT_PROPERTIES (o)
-#define MM_MODEM_SIMPLE_CONNECT_PROPERTIES(o) MM_COMMON_CONNECT_PROPERTIES(o)
-#define MM_IS_MODEM_SIMPLE_CONNECT_PROPERTIES(o) MM_IS_COMMON_CONNECT_PROPERTIES(o)
-
-MMModemSimpleConnectProperties *mm_modem_simple_connect_properties_new (void);
-MMModemSimpleConnectProperties *mm_modem_simple_connect_properties_new_from_string (
- const gchar *str,
- GError **error);
-
-void mm_modem_simple_connect_properties_set_pin (
- MMModemSimpleConnectProperties *properties,
- const gchar *pin);
-void mm_modem_simple_connect_properties_set_operator_id (
- MMModemSimpleConnectProperties *properties,
- const gchar *operator_id);
-void mm_modem_simple_connect_properties_set_bands (
- MMModemSimpleConnectProperties *properties,
- const MMModemBand *bands,
- guint n_bands);
-void mm_modem_simple_connect_properties_set_allowed_modes (
- MMModemSimpleConnectProperties *properties,
- MMModemMode allowed,
- MMModemMode preferred);
-void mm_modem_simple_connect_properties_set_apn (
- MMModemSimpleConnectProperties *properties,
- const gchar *apn);
-void mm_modem_simple_connect_properties_set_user (
- MMModemSimpleConnectProperties *properties,
- const gchar *user);
-void mm_modem_simple_connect_properties_set_password (
- MMModemSimpleConnectProperties *properties,
- const gchar *password);
-void mm_modem_simple_connect_properties_set_ip_type (
- MMModemSimpleConnectProperties *properties,
- const gchar *ip_type);
-void mm_modem_simple_connect_properties_set_allow_roaming (
- MMModemSimpleConnectProperties *properties,
- gboolean allow_roaming);
-void mm_modem_simple_connect_properties_set_number (
- MMModemSimpleConnectProperties *properties,
- const gchar *number);
-
-G_END_DECLS
-
-#endif /* MM_MODEM_SIMPLE_CONNECT_PROPERTIES_H */
diff --git a/libmm-glib/mm-modem-simple.c b/libmm-glib/mm-modem-simple.c
index bec8c23d..e25ff595 100644
--- a/libmm-glib/mm-modem-simple.c
+++ b/libmm-glib/mm-modem-simple.c
@@ -140,7 +140,7 @@ simple_connect_ready (MMModemSimple *self,
void
mm_modem_simple_connect (MMModemSimple *self,
- MMModemSimpleConnectProperties *properties,
+ MMSimpleConnectProperties *properties,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data)
@@ -158,8 +158,7 @@ mm_modem_simple_connect (MMModemSimple *self,
if (cancellable)
ctx->cancellable = g_object_ref (cancellable);
- variant = mm_common_connect_properties_get_dictionary (
- MM_COMMON_CONNECT_PROPERTIES (properties));
+ variant = mm_simple_connect_properties_get_dictionary (properties);
mm_gdbus_modem_simple_call_connect (
self,
variant,
@@ -172,7 +171,7 @@ mm_modem_simple_connect (MMModemSimple *self,
MMBearer *
mm_modem_simple_connect_sync (MMModemSimple *self,
- MMModemSimpleConnectProperties *properties,
+ MMSimpleConnectProperties *properties,
GCancellable *cancellable,
GError **error)
{
@@ -182,8 +181,7 @@ mm_modem_simple_connect_sync (MMModemSimple *self,
g_return_val_if_fail (MM_GDBUS_IS_MODEM_SIMPLE (self), NULL);
- variant = mm_common_connect_properties_get_dictionary (
- MM_COMMON_CONNECT_PROPERTIES (properties));
+ variant = mm_simple_connect_properties_get_dictionary (properties);
mm_gdbus_modem_simple_call_connect_sync (self,
variant,
&bearer_path,
diff --git a/libmm-glib/mm-modem-simple.h b/libmm-glib/mm-modem-simple.h
index 96737b1a..969ee15d 100644
--- a/libmm-glib/mm-modem-simple.h
+++ b/libmm-glib/mm-modem-simple.h
@@ -27,7 +27,6 @@
#include <mm-gdbus-modem.h>
#include "mm-bearer.h"
-#include "mm-modem-simple-connect-properties.h"
#include "mm-modem-simple-status-properties.h"
G_BEGIN_DECLS
@@ -41,7 +40,7 @@ const gchar *mm_modem_simple_get_path (MMModemSimple *self);
gchar *mm_modem_simple_dup_path (MMModemSimple *self);
void mm_modem_simple_connect (MMModemSimple *self,
- MMModemSimpleConnectProperties *properties,
+ MMSimpleConnectProperties *properties,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
@@ -49,7 +48,7 @@ MMBearer *mm_modem_simple_connect_finish (MMModemSimple *self,
GAsyncResult *res,
GError **error);
MMBearer *mm_modem_simple_connect_sync (MMModemSimple *self,
- MMModemSimpleConnectProperties *properties,
+ MMSimpleConnectProperties *properties,
GCancellable *cancellable,
GError **error);
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-06-08 03:38:57 +0000