aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libmm-glib/mm-manager.c2
-rw-r--r--libmm-glib/mm-modem-3gpp-ussd.c321
-rw-r--r--libmm-glib/mm-modem-3gpp-ussd.h34
3 files changed, 265 insertions, 92 deletions
diff --git a/libmm-glib/mm-manager.c b/libmm-glib/mm-manager.c
index d9caca33..6ee7dfd9 100644
--- a/libmm-glib/mm-manager.c
+++ b/libmm-glib/mm-manager.c
@@ -80,7 +80,7 @@ get_proxy_type (GDBusObjectManagerClient *manager,
g_hash_table_insert (lookup_hash, "org.freedesktop.ModemManager1.Modem.Contacts", GSIZE_TO_POINTER (MM_GDBUS_TYPE_MODEM_CONTACTS_PROXY));
g_hash_table_insert (lookup_hash, "org.freedesktop.ModemManager1.Modem.ModemCdma", GSIZE_TO_POINTER (MM_GDBUS_TYPE_MODEM_CDMA_PROXY));
g_hash_table_insert (lookup_hash, "org.freedesktop.ModemManager1.Modem.Modem3gpp", GSIZE_TO_POINTER (MM_TYPE_MODEM_3GPP));
- g_hash_table_insert (lookup_hash, "org.freedesktop.ModemManager1.Modem.Modem3gpp.Ussd", GSIZE_TO_POINTER (MM_GDBUS_TYPE_MODEM3GPP_USSD_PROXY));
+ g_hash_table_insert (lookup_hash, "org.freedesktop.ModemManager1.Modem.Modem3gpp.Ussd", GSIZE_TO_POINTER (MM_TYPE_MODEM_3GPP_USSD));
g_hash_table_insert (lookup_hash, "org.freedesktop.ModemManager1.Modem.Simple", GSIZE_TO_POINTER (MM_GDBUS_TYPE_MODEM_SIMPLE_PROXY));
g_once_init_leave (&once_init_value, 1);
}
diff --git a/libmm-glib/mm-modem-3gpp-ussd.c b/libmm-glib/mm-modem-3gpp-ussd.c
index 623aa7a3..993c7e25 100644
--- a/libmm-glib/mm-modem-3gpp-ussd.c
+++ b/libmm-glib/mm-modem-3gpp-ussd.c
@@ -17,6 +17,7 @@
* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301 USA.
*
+ * Copyright (C) 2011 - 2012 Aleksander Morgado <aleksander@gnu.org>
* Copyright (C) 2012 Google, Inc.
*/
@@ -26,6 +27,21 @@
#include "mm-modem-3gpp-ussd.h"
/**
+ * SECTION: mm-modem-3gpp-ussd
+ * @title: MMModem3gppUssd
+ * @short_description: The 3GPP USSD interface
+ *
+ * The #MMModem3gppUssd is an object providing access to the methods, signals and
+ * properties of the 3GPP USSD interface.
+ *
+ * This interface is only exposed when the 3GPP modem is known to handle USSD operations.
+ */
+
+G_DEFINE_TYPE (MMModem3gppUssd, mm_modem_3gpp_ussd, MM_GDBUS_TYPE_MODEM3GPP_USSD_PROXY)
+
+/*****************************************************************************/
+
+/**
* mm_modem_3gpp_ussd_get_path:
* @self: A #MMModem3gppUssd.
*
@@ -36,7 +52,7 @@
const gchar *
mm_modem_3gpp_ussd_get_path (MMModem3gppUssd *self)
{
- g_return_val_if_fail (G_IS_DBUS_PROXY (self), NULL);
+ g_return_val_if_fail (MM_IS_MODEM_3GPP_USSD (self), NULL);
RETURN_NON_EMPTY_CONSTANT_STRING (
g_dbus_proxy_get_object_path (G_DBUS_PROXY (self)));
@@ -55,7 +71,7 @@ mm_modem_3gpp_ussd_dup_path (MMModem3gppUssd *self)
{
gchar *value;
- g_return_val_if_fail (G_IS_DBUS_PROXY (self), NULL);
+ g_return_val_if_fail (MM_IS_MODEM_3GPP_USSD (self), NULL);
g_object_get (G_OBJECT (self),
"g-object-path", &value,
@@ -63,23 +79,28 @@ mm_modem_3gpp_ussd_dup_path (MMModem3gppUssd *self)
RETURN_NON_EMPTY_STRING (value);
}
+/*****************************************************************************/
+
/**
* mm_modem_3gpp_ussd_get_network_request:
* @self: A #MMModem3gppUssd.
*
* Gets any pending network-initiated request.
*
- * <warning>It is only safe to use this function on the thread where @self was constructed. Use mm_modem_3gpp_ussd_dup_network_request() if on another thread.</warning>
+ * <warning>The returned value is only valid until the property changes so
+ * it is only safe to use this function on the thread where
+ * @self was constructed. Use mm_modem_3gpp_ussd_dup_network_request() if on another
+ * thread.</warning>
*
* Returns: (transfer none): The network request, or %NULL if none available.
*/
const gchar *
mm_modem_3gpp_ussd_get_network_request (MMModem3gppUssd *self)
{
- g_return_val_if_fail (MM_GDBUS_IS_MODEM3GPP_USSD (self), NULL);
+ g_return_val_if_fail (MM_IS_MODEM_3GPP_USSD (self), NULL);
RETURN_NON_EMPTY_CONSTANT_STRING (
- mm_gdbus_modem3gpp_ussd_get_network_request (self));
+ mm_gdbus_modem3gpp_ussd_get_network_request (MM_GDBUS_MODEM3GPP_USSD (self)));
}
/**
@@ -93,29 +114,34 @@ mm_modem_3gpp_ussd_get_network_request (MMModem3gppUssd *self)
gchar *
mm_modem_3gpp_ussd_dup_network_request (MMModem3gppUssd *self)
{
- g_return_val_if_fail (MM_GDBUS_IS_MODEM3GPP_USSD (self), NULL);
+ g_return_val_if_fail (MM_IS_MODEM_3GPP_USSD (self), NULL);
RETURN_NON_EMPTY_STRING (
- mm_gdbus_modem3gpp_ussd_dup_network_request (self));
+ mm_gdbus_modem3gpp_ussd_dup_network_request (MM_GDBUS_MODEM3GPP_USSD (self)));
}
+/*****************************************************************************/
+
/**
* mm_modem_3gpp_ussd_get_network_notification:
* @self: A #MMModem3gppUssd.
*
* Gets any pending network-initiated request to which no USSD response is required.
*
- * <warning>It is only safe to use this function on the thread where @self was constructed. Use mm_modem_3gpp_ussd_dup_network_notification() if on another thread.</warning>
+ * <warning>The returned value is only valid until the property changes so
+ * it is only safe to use this function on the thread where
+ * @self was constructed. Use mm_modem_3gpp_ussd_dup_network_notification() if on another
+ * thread.</warning>
*
* Returns: (transfer none): The network notification, or %NULL if none available.
*/
const gchar *
mm_modem_3gpp_ussd_get_network_notification (MMModem3gppUssd *self)
{
- g_return_val_if_fail (MM_GDBUS_IS_MODEM3GPP_USSD (self), NULL);
+ g_return_val_if_fail (MM_IS_MODEM_3GPP_USSD (self), NULL);
RETURN_NON_EMPTY_CONSTANT_STRING (
- mm_gdbus_modem3gpp_ussd_get_network_notification (self));
+ mm_gdbus_modem3gpp_ussd_get_network_notification (MM_GDBUS_MODEM3GPP_USSD (self)));
}
/**
@@ -129,45 +155,42 @@ mm_modem_3gpp_ussd_get_network_notification (MMModem3gppUssd *self)
gchar *
mm_modem_3gpp_ussd_dup_network_notification (MMModem3gppUssd *self)
{
- g_return_val_if_fail (MM_GDBUS_IS_MODEM3GPP_USSD (self), NULL);
+ g_return_val_if_fail (MM_IS_MODEM_3GPP_USSD (self), NULL);
RETURN_NON_EMPTY_STRING (
- mm_gdbus_modem3gpp_ussd_dup_network_notification (self));
+ mm_gdbus_modem3gpp_ussd_dup_network_notification (MM_GDBUS_MODEM3GPP_USSD (self)));
}
+/*****************************************************************************/
+
/**
* mm_modem_3gpp_ussd_get_state:
* @self: A #MMModem.
*
* Get the state of the ongoing USSD session, if any.
- * section 10.1.19.
*
* Returns: A #MMModem3gppUssdSessionState value, specifying the current state.
*/
MMModem3gppUssdSessionState
mm_modem_3gpp_ussd_get_state (MMModem3gppUssd *self)
{
- g_return_val_if_fail (MM_GDBUS_IS_MODEM3GPP_USSD (self), MM_MODEM_3GPP_USSD_SESSION_STATE_UNKNOWN);
+ g_return_val_if_fail (MM_IS_MODEM_3GPP_USSD (self), MM_MODEM_3GPP_USSD_SESSION_STATE_UNKNOWN);
- return mm_gdbus_modem3gpp_ussd_get_state (self);
+ return mm_gdbus_modem3gpp_ussd_get_state (MM_GDBUS_MODEM3GPP_USSD (self));
}
-void
-mm_modem_3gpp_ussd_initiate (MMModem3gppUssd *self,
- const gchar *command,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data)
-{
- g_return_if_fail (MM_GDBUS_IS_MODEM3GPP_USSD (self));
-
- mm_gdbus_modem3gpp_ussd_call_initiate (self,
- command,
- cancellable,
- callback,
- user_data);
-}
+/*****************************************************************************/
+/**
+ * mm_modem_3gpp_ussd_initiate_finish:
+ * @self: A #MMModem3gppUssd.
+ * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to mm_modem_3gpp_ussd_initiate().
+ * @error: Return location for error or %NULL.
+ *
+ * Finishes an operation started with mm_modem_3gpp_ussd_initiate().
+ *
+ * Returns: The response from the network, if any. The returned value should be freed with g_free().
+ */
gchar *
mm_modem_3gpp_ussd_initiate_finish (MMModem3gppUssd *self,
GAsyncResult *res,
@@ -175,15 +198,62 @@ mm_modem_3gpp_ussd_initiate_finish (MMModem3gppUssd *self,
{
gchar *reply = NULL;
- g_return_val_if_fail (MM_GDBUS_IS_MODEM3GPP_USSD (self), NULL);
+ g_return_val_if_fail (MM_IS_MODEM_3GPP_USSD (self), NULL);
+
+ mm_gdbus_modem3gpp_ussd_call_initiate_finish (MM_GDBUS_MODEM3GPP_USSD (self), &reply, res, error);
- mm_gdbus_modem3gpp_ussd_call_initiate_finish (self,
- &reply,
- res,
- error);
return reply;
}
+/**
+ * mm_modem_3gpp_ussd_initiate:
+ * @self: A #MMModem3gppUssd.
+ * @command: The command to start the USSD session with.
+ * @cancellable: (allow-none): A #GCancellable or %NULL.
+ * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL.
+ * @user_data: User data to pass to @callback.
+ *
+ * Asynchronously sends a USSD command string to the network initiating a USSD session.
+ *
+ * When the request is handled by the network, the method returns the
+ * response or an appropriate error. The network may be awaiting further
+ * response from the ME after returning from this method and no new command.
+ *
+ * When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from.
+ * You can then call mm_modem_3gpp_ussd_initiate_finish() to get the result of the operation.
+ *
+ * See mm_modem_3gpp_ussd_initiate_sync() for the synchronous, blocking version of this method.
+ */
+void
+mm_modem_3gpp_ussd_initiate (MMModem3gppUssd *self,
+ const gchar *command,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data)
+{
+ g_return_if_fail (MM_IS_MODEM_3GPP_USSD (self));
+
+ mm_gdbus_modem3gpp_ussd_call_initiate (MM_GDBUS_MODEM3GPP_USSD (self), command, cancellable, callback, user_data);
+}
+
+/**
+ * mm_modem_3gpp_ussd_initiate_sync:
+ * @self: A #MMModem3gppUssd.
+ * @command: The command to start the USSD session with.
+ * @cancellable: (allow-none): A #GCancellable or %NULL.
+ * @error: Return location for error or %NULL.
+ *
+ * Synchronously sends a USSD command string to the network initiating a USSD session.
+ *
+ * When the request is handled by the network, the method returns the
+ * response or an appropriate error. The network may be awaiting further
+ * response from the ME after returning from this method and no new command.
+ *
+ * The calling thread is blocked until a reply is received. See mm_modem_3gpp_ussd_initiate()
+ * for the asynchronous version of this method.
+ *
+ * Returns: The response from the network, if any. The returned value should be freed with g_free().
+ */
gchar *
mm_modem_3gpp_ussd_initiate_sync (MMModem3gppUssd *self,
const gchar *command,
@@ -192,32 +262,25 @@ mm_modem_3gpp_ussd_initiate_sync (MMModem3gppUssd *self,
{
gchar *reply = NULL;
- g_return_val_if_fail (MM_GDBUS_IS_MODEM3GPP_USSD (self), NULL);
+ g_return_val_if_fail (MM_IS_MODEM_3GPP_USSD (self), NULL);
+
+ mm_gdbus_modem3gpp_ussd_call_initiate_sync (MM_GDBUS_MODEM3GPP_USSD (self), command, &reply, cancellable, error);
- mm_gdbus_modem3gpp_ussd_call_initiate_sync (self,
- command,
- &reply,
- cancellable,
- error);
return reply;
}
-void
-mm_modem_3gpp_ussd_respond (MMModem3gppUssd *self,
- const gchar *response,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data)
-{
- g_return_if_fail (MM_GDBUS_IS_MODEM3GPP_USSD (self));
-
- mm_gdbus_modem3gpp_ussd_call_respond (self,
- response,
- cancellable,
- callback,
- user_data);
-}
+/*****************************************************************************/
+/**
+ * mm_modem_3gpp_ussd_respond_finish:
+ * @self: A #MMModem3gppUssd.
+ * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to mm_modem_3gpp_ussd_respond().
+ * @error: Return location for error or %NULL.
+ *
+ * Finishes an operation started with mm_modem_3gpp_ussd_respond().
+ *
+ * Returns: The network reply to this response to the network-initiated USSD command. The reply may require further responses. The returned value should be freed with g_free().
+ */
gchar *
mm_modem_3gpp_ussd_respond_finish (MMModem3gppUssd *self,
GAsyncResult *res,
@@ -225,15 +288,58 @@ mm_modem_3gpp_ussd_respond_finish (MMModem3gppUssd *self,
{
gchar *reply = NULL;
- g_return_val_if_fail (MM_GDBUS_IS_MODEM3GPP_USSD (self), NULL);
+ g_return_val_if_fail (MM_IS_MODEM_3GPP_USSD (self), NULL);
+
+ mm_gdbus_modem3gpp_ussd_call_respond_finish (MM_GDBUS_MODEM3GPP_USSD (self), &reply, res, error);
- mm_gdbus_modem3gpp_ussd_call_respond_finish (self,
- &reply,
- res,
- error);
return reply;
}
+/**
+ * mm_modem_3gpp_ussd_respond:
+ * @self: A #MMModem3gppUssd.
+ * @response: The response to network-initiated USSD command, or a response to a request for further input.
+ * @cancellable: (allow-none): A #GCancellable or %NULL.
+ * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL.
+ * @user_data: User data to pass to @callback.
+ *
+ * Asynchronously responds to a USSD request that is either initiated by the
+ * mobile network, or that is awaiting further input after a previous call to
+ * mm_modem_3gpp_ussd_initiate().
+ *
+ * When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from.
+ * You can then call mm_modem_3gpp_ussd_respond_finish() to get the result of the operation.
+ *
+ * See mm_modem_3gpp_ussd_respond_sync() for the synchronous, blocking version of this method.
+ */
+void
+mm_modem_3gpp_ussd_respond (MMModem3gppUssd *self,
+ const gchar *response,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data)
+{
+ g_return_if_fail (MM_IS_MODEM_3GPP_USSD (self));
+
+ mm_gdbus_modem3gpp_ussd_call_respond (MM_GDBUS_MODEM3GPP_USSD (self), response, cancellable, callback, user_data);
+}
+
+/**
+ * mm_modem_3gpp_ussd_respond_sync:
+ * @self: A #MMModem3gppUssd.
+ * @response: The response to network-initiated USSD command, or a response to a request for further input.
+ * @cancellable: (allow-none): A #GCancellable or %NULL.
+ * @error: Return location for error or %NULL.
+ *
+ * Synchronously responds to a USSD request that is either initiated by the
+ * mobile network, or that is awaiting further input after a previous call to
+ * mm_modem_3gpp_ussd_initiate().
+ *
+ * The calling thread is blocked until a reply is received. See mm_modem_3gpp_ussd_respond()
+ * for the asynchronous version of this method.
+ *
+ * Returns: The network reply to this response to the network-initiated USSD command. The reply may require further responses. The returned value should be freed with g_free().
+ */
gchar *
mm_modem_3gpp_ussd_respond_sync (MMModem3gppUssd *self,
const gchar *response,
@@ -242,50 +348,91 @@ mm_modem_3gpp_ussd_respond_sync (MMModem3gppUssd *self,
{
gchar *reply = NULL;
- g_return_val_if_fail (MM_GDBUS_IS_MODEM3GPP_USSD (self), NULL);
+ g_return_val_if_fail (MM_IS_MODEM_3GPP_USSD (self), NULL);
+
+ mm_gdbus_modem3gpp_ussd_call_respond_sync (MM_GDBUS_MODEM3GPP_USSD (self), response, &reply, cancellable, error);
- mm_gdbus_modem3gpp_ussd_call_respond_sync (self,
- response,
- &reply,
- cancellable,
- error);
return reply;
}
+/*****************************************************************************/
+
+/**
+ * mm_modem_3gpp_ussd_cancel_finish:
+ * @self: A #MMModem3gppUssd.
+ * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to mm_modem_3gpp_ussd_cancel().
+ * @error: Return location for error or %NULL.
+ *
+ * Finishes an operation started with mm_modem_3gpp_ussd_cancel().
+ *
+ * Returns: %TRUE if the session was successfully cancelled, %FALSE if @error is set.
+ */
+gboolean
+mm_modem_3gpp_ussd_cancel_finish (MMModem3gppUssd *self,
+ GAsyncResult *res,
+ GError **error)
+{
+ g_return_val_if_fail (MM_IS_MODEM_3GPP_USSD (self), FALSE);
+
+ return mm_gdbus_modem3gpp_ussd_call_cancel_finish (MM_GDBUS_MODEM3GPP_USSD (self), res, error);
+}
+
+/**
+ * mm_modem_3gpp_ussd_cancel:
+ * @self: A #MMModem3gppUssd.
+ * @cancellable: (allow-none): A #GCancellable or %NULL.
+ * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL.
+ * @user_data: User data to pass to @callback.
+ *
+ * Asynchronously cancels an ongoing USSD session, either mobile or network initiated.
+ *
+ * When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from.
+ * You can then call mm_modem_3gpp_ussd_cancel_finish() to get the result of the operation.
+ *
+ * See mm_modem_3gpp_ussd_cancel_sync() for the synchronous, blocking version of this method.
+ */
void
mm_modem_3gpp_ussd_cancel (MMModem3gppUssd *self,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data)
{
- g_return_if_fail (MM_GDBUS_IS_MODEM3GPP_USSD (self));
+ g_return_if_fail (MM_IS_MODEM_3GPP_USSD (self));
- mm_gdbus_modem3gpp_ussd_call_cancel (self,
- cancellable,
- callback,
- user_data);
+ mm_gdbus_modem3gpp_ussd_call_cancel (MM_GDBUS_MODEM3GPP_USSD (self), cancellable, callback, user_data);
}
+/**
+ * mm_modem_3gpp_ussd_cancel_sync:
+ * @self: A #MMModem3gppUssd.
+ * @cancellable: (allow-none): A #GCancellable or %NULL.
+ * @error: Return location for error or %NULL.
+ *
+ * Synchronously cancels an ongoing USSD session, either mobile or network initiated.
+ *
+ * The calling thread is blocked until a reply is received. See mm_modem_3gpp_ussd_cancel()
+ * for the asynchronous version of this method.
+ *
+ * Returns: %TRUE if the session was successfully cancelled, %FALSE if @error is set.
+ */
gboolean
-mm_modem_3gpp_ussd_cancel_finish (MMModem3gppUssd *self,
- GAsyncResult *res,
- GError **error)
+mm_modem_3gpp_ussd_cancel_sync (MMModem3gppUssd *self,
+ GCancellable *cancellable,
+ GError **error)
{
- g_return_val_if_fail (MM_GDBUS_IS_MODEM3GPP_USSD (self), FALSE);
+ g_return_val_if_fail (MM_IS_MODEM_3GPP_USSD (self), FALSE);
- return mm_gdbus_modem3gpp_ussd_call_cancel_finish (self,
- res,
- error);
+ return mm_gdbus_modem3gpp_ussd_call_cancel_sync (MM_GDBUS_MODEM3GPP_USSD (self), cancellable, error);
}
-gboolean
-mm_modem_3gpp_ussd_cancel_sync (MMModem3gppUssd *self,
- GCancellable *cancellable,
- GError **error)
+/*****************************************************************************/
+
+static void
+mm_modem_3gpp_ussd_init (MMModem3gppUssd *self)
{
- g_return_val_if_fail (MM_GDBUS_IS_MODEM3GPP_USSD (self), FALSE);
+}
- return mm_gdbus_modem3gpp_ussd_call_cancel_sync (self,
- cancellable,
- error);
+static void
+mm_modem_3gpp_ussd_class_init (MMModem3gppUssdClass *modem_class)
+{
}
diff --git a/libmm-glib/mm-modem-3gpp-ussd.h b/libmm-glib/mm-modem-3gpp-ussd.h
index 932ff5af..22a2abfa 100644
--- a/libmm-glib/mm-modem-3gpp-ussd.h
+++ b/libmm-glib/mm-modem-3gpp-ussd.h
@@ -17,6 +17,7 @@
* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301 USA.
*
+ * Copyright (C) 2011 - 2012 Aleksander Morgado <aleksander@gnu.org>
* Copyright (C) 2012 Google, Inc.
*/
@@ -28,10 +29,34 @@
G_BEGIN_DECLS
-typedef MmGdbusModem3gppUssd MMModem3gppUssd;
-#define MM_TYPE_MODEM_3GPP_USSD(o) MM_GDBUS_TYPE_MODEM3GPP_USSD (o)
-#define MM_MODEM_3GPP_USSD(o) MM_GDBUS_MODEM3GPP_USSD(o)
-#define MM_IS_MODEM_3GPP_USSD(o) MM_GDBUS_IS_MODEM3GPP_USSD(o)
+#define MM_TYPE_MODEM_3GPP_USSD (mm_modem_3gpp_ussd_get_type ())
+#define MM_MODEM_3GPP_USSD(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MM_TYPE_MODEM_3GPP_USSD, MMModem3gppUssd))
+#define MM_MODEM_3GPP_USSD_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), MM_TYPE_MODEM_3GPP_USSD, MMModem3gppUssdClass))
+#define MM_IS_MODEM_3GPP_USSD(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MM_TYPE_MODEM_3GPP_USSD))
+#define MM_IS_MODEM_3GPP_USSD_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), MM_TYPE_MODEM_3GPP_USSD))
+#define MM_MODEM_3GPP_USSD_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), MM_TYPE_MODEM_3GPP_USSD, MMModem3gppUssdClass))
+
+typedef struct _MMModem3gppUssd MMModem3gppUssd;
+typedef struct _MMModem3gppUssdClass MMModem3gppUssdClass;
+
+/**
+ * MMModem3gppUssd:
+ *
+ * The #MMModem3gppUssd structure contains private data and should only be accessed
+ * using the provided API.
+ */
+struct _MMModem3gppUssd {
+ /*< private >*/
+ MmGdbusModem3gppUssdProxy parent;
+ gpointer unused;
+};
+
+struct _MMModem3gppUssdClass {
+ /*< private >*/
+ MmGdbusModem3gppUssdProxyClass parent;
+};
+
+GType mm_modem_3gpp_ussd_get_type (void);
const gchar *mm_modem_3gpp_ussd_get_path (MMModem3gppUssd *self);
gchar *mm_modem_3gpp_ussd_dup_path (MMModem3gppUssd *self);
@@ -40,6 +65,7 @@ MMModem3gppUssdSessionState mm_modem_3gpp_ussd_get_state (MMModem3gppUssd *self)
const gchar *mm_modem_3gpp_ussd_get_network_notification (MMModem3gppUssd *self);
gchar *mm_modem_3gpp_ussd_dup_network_notification (MMModem3gppUssd *self);
+
const gchar *mm_modem_3gpp_ussd_get_network_request (MMModem3gppUssd *self);
gchar *mm_modem_3gpp_ussd_dup_network_request (MMModem3gppUssd *self);