diff options
Diffstat (limited to 'libmm-glib')
| -rw-r--r-- | libmm-glib/Makefile.am | 3 | ||||
| -rw-r--r-- | libmm-glib/mm-modem-simple-status-properties.c | 115 | ||||
| -rw-r--r-- | libmm-glib/mm-modem-simple-status-properties.h | 50 | ||||
| -rw-r--r-- | libmm-glib/mm-modem-simple.c | 16 | ||||
| -rw-r--r-- | libmm-glib/mm-modem-simple.h | 21 |
5 files changed, 18 insertions, 187 deletions
diff --git a/libmm-glib/Makefile.am b/libmm-glib/Makefile.am index f9c18a4a..c9a8e2f1 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-status-properties.h \ - mm-modem-simple-status-properties.c \ mm-modem-simple.h \ mm-modem-simple.c \ mm-modem-location.h \ @@ -50,7 +48,6 @@ include_HEADERS = \ mm-object.h \ mm-modem.h \ mm-modem-3gpp.h \ - mm-modem-simple-status-properties.h \ mm-modem-simple.h \ mm-sim.h \ mm-sms.h \ diff --git a/libmm-glib/mm-modem-simple-status-properties.c b/libmm-glib/mm-modem-simple-status-properties.c deleted file mode 100644 index 464c9d2a..00000000 --- a/libmm-glib/mm-modem-simple-status-properties.c +++ /dev/null @@ -1,115 +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-status-properties.h" -#include "mm-modem-cdma.h" - -MMModemState -mm_modem_simple_status_properties_get_state (MMModemSimpleStatusProperties *self) -{ - g_return_val_if_fail (MM_IS_MODEM_SIMPLE_STATUS_PROPERTIES (self), - MM_MODEM_STATE_UNKNOWN); - - return mm_common_simple_properties_get_state (self); -} - -guint32 -mm_modem_simple_status_properties_get_signal_quality (MMModemSimpleStatusProperties *self, - gboolean *recent) -{ - g_return_val_if_fail (MM_IS_MODEM_SIMPLE_STATUS_PROPERTIES (self), 0); - - return mm_common_simple_properties_get_signal_quality (self, recent); -} - -void -mm_modem_simple_status_properties_get_bands (MMModemSimpleStatusProperties *self, - const MMModemBand **bands, - guint *n_bands) -{ - g_return_if_fail (MM_IS_MODEM_SIMPLE_STATUS_PROPERTIES (self)); - - return mm_common_simple_properties_get_bands (self, bands, n_bands); -} - -MMModemAccessTechnology -mm_modem_simple_status_properties_get_access_technologies (MMModemSimpleStatusProperties *self) -{ - g_return_val_if_fail (MM_IS_MODEM_SIMPLE_STATUS_PROPERTIES (self), - MM_MODEM_ACCESS_TECHNOLOGY_UNKNOWN); - - return mm_common_simple_properties_get_access_technologies (self); -} - -MMModem3gppRegistrationState -mm_modem_simple_status_properties_get_3gpp_registration_state (MMModemSimpleStatusProperties *self) -{ - g_return_val_if_fail (MM_IS_MODEM_SIMPLE_STATUS_PROPERTIES (self), - MM_MODEM_3GPP_REGISTRATION_STATE_UNKNOWN); - - return mm_common_simple_properties_get_3gpp_registration_state (self); -} - -const gchar * -mm_modem_simple_status_properties_get_3gpp_operator_code (MMModemSimpleStatusProperties *self) -{ - g_return_val_if_fail (MM_IS_MODEM_SIMPLE_STATUS_PROPERTIES (self), NULL); - - return mm_common_simple_properties_get_3gpp_operator_code (self); -} - -const gchar * -mm_modem_simple_status_properties_get_3gpp_operator_name (MMModemSimpleStatusProperties *self) -{ - g_return_val_if_fail (MM_IS_MODEM_SIMPLE_STATUS_PROPERTIES (self), NULL); - - return mm_common_simple_properties_get_3gpp_operator_name (self); -} - -MMModemCdmaRegistrationState -mm_modem_simple_status_properties_get_cdma_cdma1x_registration_state (MMModemSimpleStatusProperties *self) -{ - g_return_val_if_fail (MM_IS_MODEM_SIMPLE_STATUS_PROPERTIES (self), - MM_MODEM_CDMA_REGISTRATION_STATE_UNKNOWN); - - return mm_common_simple_properties_get_cdma_cdma1x_registration_state (self); -} - -MMModemCdmaRegistrationState -mm_modem_simple_status_properties_get_cdma_evdo_registration_state (MMModemSimpleStatusProperties *self) -{ - g_return_val_if_fail (MM_IS_MODEM_SIMPLE_STATUS_PROPERTIES (self), - MM_MODEM_CDMA_REGISTRATION_STATE_UNKNOWN); - - return mm_common_simple_properties_get_cdma_evdo_registration_state (self); -} - -guint -mm_modem_simple_status_properties_get_cdma_sid (MMModemSimpleStatusProperties *self) -{ - g_return_val_if_fail (MM_IS_MODEM_SIMPLE_STATUS_PROPERTIES (self), - MM_MODEM_CDMA_SID_UNKNOWN); - - return mm_common_simple_properties_get_cdma_sid (self); -} - -guint -mm_modem_simple_status_properties_get_cdma_nid (MMModemSimpleStatusProperties *self) -{ - g_return_val_if_fail (MM_IS_MODEM_SIMPLE_STATUS_PROPERTIES (self), - MM_MODEM_CDMA_NID_UNKNOWN); - - return mm_common_simple_properties_get_cdma_nid (self); -} diff --git a/libmm-glib/mm-modem-simple-status-properties.h b/libmm-glib/mm-modem-simple-status-properties.h deleted file mode 100644 index 4c5c8708..00000000 --- a/libmm-glib/mm-modem-simple-status-properties.h +++ /dev/null @@ -1,50 +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_STATUS_PROPERTIES_H -#define MM_MODEM_SIMPLE_STATUS_PROPERTIES_H - -#include <ModemManager.h> -#include <glib-object.h> - -#include <libmm-common.h> - -G_BEGIN_DECLS - -typedef MMCommonSimpleProperties MMModemSimpleStatusProperties; -#define MM_TYPE_MODEM_SIMPLE_STATUS_PROPERTIES(o) MM_TYPE_COMMON_SIMPLE_PROPERTIES (o) -#define MM_MODEM_SIMPLE_STATUS_PROPERTIES(o) MM_COMMON_SIMPLE_PROPERTIES(o) -#define MM_IS_MODEM_SIMPLE_STATUS_PROPERTIES(o) MM_IS_COMMON_SIMPLE_PROPERTIES(o) - -MMModemState mm_modem_simple_status_properties_get_state (MMModemSimpleStatusProperties *self); -guint32 mm_modem_simple_status_properties_get_signal_quality (MMModemSimpleStatusProperties *self, - gboolean *recent); -void mm_modem_simple_status_properties_get_bands (MMModemSimpleStatusProperties *self, - const MMModemBand **bands, - guint *n_bands); -MMModemAccessTechnology mm_modem_simple_status_properties_get_access_technologies (MMModemSimpleStatusProperties *self); - -MMModem3gppRegistrationState mm_modem_simple_status_properties_get_3gpp_registration_state (MMModemSimpleStatusProperties *self); -const gchar *mm_modem_simple_status_properties_get_3gpp_operator_code (MMModemSimpleStatusProperties *self); -const gchar *mm_modem_simple_status_properties_get_3gpp_operator_name (MMModemSimpleStatusProperties *self); - -MMModemCdmaRegistrationState mm_modem_simple_status_properties_get_cdma_cdma1x_registration_state (MMModemSimpleStatusProperties *self); -MMModemCdmaRegistrationState mm_modem_simple_status_properties_get_cdma_evdo_registration_state (MMModemSimpleStatusProperties *self); -guint mm_modem_simple_status_properties_get_cdma_sid (MMModemSimpleStatusProperties *self); -guint mm_modem_simple_status_properties_get_cdma_nid (MMModemSimpleStatusProperties *self); - -G_END_DECLS - -#endif /* MM_MODEM_SIMPLE_STATUS_PROPERTIES_H */ diff --git a/libmm-glib/mm-modem-simple.c b/libmm-glib/mm-modem-simple.c index e25ff595..4d5c5645 100644 --- a/libmm-glib/mm-modem-simple.c +++ b/libmm-glib/mm-modem-simple.c @@ -244,12 +244,12 @@ mm_modem_simple_disconnect_sync (MMModemSimple *self, error); } -MMModemSimpleStatusProperties * +MMSimpleStatus * mm_modem_simple_get_status_finish (MMModemSimple *self, GAsyncResult *res, GError **error) { - MMCommonSimpleProperties *properties; + MMSimpleStatus *status; GVariant *dictionary = NULL; g_return_val_if_fail (MM_GDBUS_IS_MODEM_SIMPLE (self), NULL); @@ -257,9 +257,9 @@ mm_modem_simple_get_status_finish (MMModemSimple *self, if (!mm_gdbus_modem_simple_call_get_status_finish (self, &dictionary, res, error)) return NULL; - properties = mm_common_simple_properties_new_from_dictionary (dictionary, error); + status = mm_simple_status_new_from_dictionary (dictionary, error); g_variant_unref (dictionary); - return (MMModemSimpleStatusProperties *)properties; + return status; } void @@ -276,12 +276,12 @@ mm_modem_simple_get_status (MMModemSimple *self, user_data); } -MMModemSimpleStatusProperties * +MMSimpleStatus * mm_modem_simple_get_status_sync (MMModemSimple *self, GCancellable *cancellable, GError **error) { - MMCommonSimpleProperties *properties; + MMSimpleStatus *status; GVariant *dictionary = NULL; g_return_val_if_fail (MM_GDBUS_IS_MODEM_SIMPLE (self), NULL); @@ -289,7 +289,7 @@ mm_modem_simple_get_status_sync (MMModemSimple *self, if (!mm_gdbus_modem_simple_call_get_status_sync (self, &dictionary, cancellable, error)) return NULL; - properties = mm_common_simple_properties_new_from_dictionary (dictionary, error); + status = mm_simple_status_new_from_dictionary (dictionary, error); g_variant_unref (dictionary); - return (MMModemSimpleStatusProperties *)properties; + return status; } diff --git a/libmm-glib/mm-modem-simple.h b/libmm-glib/mm-modem-simple.h index 969ee15d..2f9c3498 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-status-properties.h" G_BEGIN_DECLS @@ -65,16 +64,16 @@ gboolean mm_modem_simple_disconnect_sync (MMModemSimple *self, GCancellable *cancellable, GError **error); -void mm_modem_simple_get_status (MMModemSimple *self, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data); -MMModemSimpleStatusProperties *mm_modem_simple_get_status_finish (MMModemSimple *self, - GAsyncResult *res, - GError **error); -MMModemSimpleStatusProperties *mm_modem_simple_get_status_sync (MMModemSimple *self, - GCancellable *cancellable, - GError **error); +void mm_modem_simple_get_status (MMModemSimple *self, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); +MMSimpleStatus *mm_modem_simple_get_status_finish (MMModemSimple *self, + GAsyncResult *res, + GError **error); +MMSimpleStatus *mm_modem_simple_get_status_sync (MMModemSimple *self, + GCancellable *cancellable, + GError **error); G_END_DECLS #endif /* _MM_MODEM_SIMPLE_H_ */ |