diff options
| -rw-r--r-- | libmm-glib/Makefile.am | 2 | ||||
| -rw-r--r-- | libmm-glib/mm-modem-time.c | 123 | ||||
| -rw-r--r-- | libmm-glib/mm-modem-time.h | 54 | ||||
| -rw-r--r-- | libmm-glib/mm-object.c | 37 | ||||
| -rw-r--r-- | libmm-glib/mm-object.h | 6 |
5 files changed, 220 insertions, 2 deletions
diff --git a/libmm-glib/Makefile.am b/libmm-glib/Makefile.am index c9a8e2f1..6ad46699 100644 --- a/libmm-glib/Makefile.am +++ b/libmm-glib/Makefile.am @@ -28,6 +28,8 @@ libmm_glib_la_SOURCES = \ mm-modem-simple.c \ mm-modem-location.h \ mm-modem-location.c \ + mm-modem-time.h \ + mm-modem-time.c \ mm-sim.h \ mm-sim.c \ mm-sms.h \ diff --git a/libmm-glib/mm-modem-time.c b/libmm-glib/mm-modem-time.c new file mode 100644 index 00000000..15011a93 --- /dev/null +++ b/libmm-glib/mm-modem-time.c @@ -0,0 +1,123 @@ +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * libmm -- Access modem status & information from glib applications + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301 USA. + * + * Copyright (C) 2012 Google, Inc. + */ + +#include <gio/gio.h> + +#include "mm-helpers.h" +#include "mm-modem-time.h" + +/** + * mm_modem_time_get_path: + * @self: A #MMModemTime. + * + * Gets the DBus path of the #MMObject which implements this interface. + * + * Returns: (transfer none): The DBus path of the #MMObject object. + */ +const gchar * +mm_modem_time_get_path (MMModemTime *self) +{ + g_return_val_if_fail (G_IS_DBUS_PROXY (self), NULL); + + RETURN_NON_EMPTY_CONSTANT_STRING ( + g_dbus_proxy_get_object_path (G_DBUS_PROXY (self))); +} + +/** + * mm_modem_time_dup_path: + * @self: A #MMModemTime. + * + * Gets a copy of the DBus path of the #MMObject object which implements this interface. + * + * Returns: (transfer full): The DBus path of the #MMObject. The returned value should be freed with g_free(). + */ +gchar * +mm_modem_time_dup_path (MMModemTime *self) +{ + gchar *value; + + g_return_val_if_fail (G_IS_DBUS_PROXY (self), NULL); + + g_object_get (G_OBJECT (self), + "g-object-path", &value, + NULL); + RETURN_NON_EMPTY_STRING (value); +} + +gchar * +mm_modem_time_get_network_time_finish (MMModemTime *self, + GAsyncResult *res, + GError **error) +{ + gchar *network_time = NULL; + + g_return_val_if_fail (MM_GDBUS_IS_MODEM_TIME (self), NULL); + + if (!mm_gdbus_modem_time_call_get_network_time_finish (self, &network_time, res, error)) + return NULL; + + return network_time; +} + +void +mm_modem_time_get_network_time (MMModemTime *self, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) +{ + g_return_if_fail (MM_GDBUS_IS_MODEM_TIME (self)); + + mm_gdbus_modem_time_call_get_network_time (self, + cancellable, + callback, + user_data); +} + +gchar * +mm_modem_time_get_network_time_sync (MMModemTime *self, + GCancellable *cancellable, + GError **error) +{ + gchar *network_time = NULL; + + g_return_val_if_fail (MM_GDBUS_IS_MODEM_TIME (self), NULL); + + if (!mm_gdbus_modem_time_call_get_network_time_sync (self, &network_time, cancellable, error)) + return NULL; + + return network_time; +} + +MMNetworkTimezone * +mm_modem_time_get_network_timezone (MMModemTime *self) +{ + GVariant *dictionary; + MMNetworkTimezone *tz; + + g_return_val_if_fail (MM_GDBUS_IS_MODEM_TIME (self), NULL); + + dictionary = mm_gdbus_modem_time_dup_network_timezone (self); + tz = mm_network_timezone_new_from_dictionary (dictionary, NULL); + g_variant_unref (dictionary); + + return tz; +} diff --git a/libmm-glib/mm-modem-time.h b/libmm-glib/mm-modem-time.h new file mode 100644 index 00000000..99afec7e --- /dev/null +++ b/libmm-glib/mm-modem-time.h @@ -0,0 +1,54 @@ +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * libmm -- Access modem status & information from glib applications + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301 USA. + * + * Copyright (C) 2012 Google, Inc. + */ + +#ifndef _MM_MODEM_TIME_H_ +#define _MM_MODEM_TIME_H_ + +#include <ModemManager.h> +#include <libmm-common.h> + +G_BEGIN_DECLS + +typedef MmGdbusModemTime MMModemTime; +#define MM_TYPE_MODEM_TIME(o) MM_GDBUS_TYPE_MODEM_TIME (o) +#define MM_MODEM_TIME(o) MM_GDBUS_MODEM_TIME(o) +#define MM_IS_MODEM_TIME(o) MM_GDBUS_IS_MODEM_TIME(o) + +const gchar *mm_modem_time_get_path (MMModemTime *self); +gchar *mm_modem_time_dup_path (MMModemTime *self); + +void mm_modem_time_get_network_time (MMModemTime *self, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); +gchar *mm_modem_time_get_network_time_finish (MMModemTime *self, + GAsyncResult *res, + GError **error); +gchar *mm_modem_time_get_network_time_sync (MMModemTime *self, + GCancellable *cancellable, + GError **error); + +MMNetworkTimezone *mm_modem_time_get_network_timezone (MMModemTime *self); + +G_END_DECLS + +#endif /* _MM_MODEM_TIME_H_ */ diff --git a/libmm-glib/mm-object.c b/libmm-glib/mm-object.c index 0d6672f1..4a83fbcc 100644 --- a/libmm-glib/mm-object.c +++ b/libmm-glib/mm-object.c @@ -17,7 +17,8 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * Copyright (C) 2011 Aleksander Morgado <aleksander@gnu.org> + * Copyright (C) 2011 - 2012 Aleksander Morgado <aleksander@gnu.org> + * Copyright (C) Google, Inc. */ #include "mm-object.h" @@ -173,6 +174,22 @@ mm_object_get_modem_messaging (MMObject *object) } /** + * mm_object_get_modem_time: + * @object: A #MMObject. + * + * Gets the #MMModemTime instance for the D-Bus interface <link linkend="gdbus-interface-org-freedesktop-ModemManager1-Modem-Time.top_of_page">org.freedesktop.ModemManager1.Modem.Time</link> on @object, if any. + * + * Returns: (transfer full): A #MMModemTime that must be freed with g_object_unref() or %NULL if @object does not implement the interface. + */ +MMModemTime * +mm_object_get_modem_time (MMObject *object) +{ + g_return_val_if_fail (MM_GDBUS_IS_OBJECT (object), NULL); + + return mm_gdbus_object_get_modem_time (object); +} + +/** * mm_object_peek_modem: (skip) * @object: A #MMObject. * @@ -279,3 +296,21 @@ mm_object_peek_modem_messaging (MMObject *object) return mm_gdbus_object_peek_modem_messaging (object); } + +/** + * mm_object_peek_modem_time: (skip) + * @object: A #MMObject. + * + * Like mm_object_get_modem_time() but doesn't increase the reference count on the returned object. + * + * <warning>It is not safe to use the returned object if you are on another thread than the one where the #MMManager is running.</warning> + * + * Returns: (transfer none): A #MMModemTime or %NULL if @object does not implement the interface. Do not free the returned object, it is owned by @object. + */ +MMModemTime * +mm_object_peek_modem_time (MMObject *object) +{ + g_return_val_if_fail (MM_GDBUS_IS_OBJECT (object), NULL); + + return mm_gdbus_object_peek_modem_time (object); +} diff --git a/libmm-glib/mm-object.h b/libmm-glib/mm-object.h index 53913db8..7b10007b 100644 --- a/libmm-glib/mm-object.h +++ b/libmm-glib/mm-object.h @@ -17,7 +17,8 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * Copyright (C) 2011 Aleksander Morgado <aleksander@gnu.org> + * Copyright (C) 2011 - 2012 Aleksander Morgado <aleksander@gnu.org> + * Copyright (C) 2012 Google, Inc. */ #ifndef _MM_OBJECT_H_ @@ -33,6 +34,7 @@ #include "mm-modem-simple.h" #include "mm-modem-location.h" #include "mm-modem-messaging.h" +#include "mm-modem-time.h" G_BEGIN_DECLS @@ -51,6 +53,7 @@ MMModemCdma *mm_object_get_modem_cdma (MMObject *object); MMModemSimple *mm_object_get_modem_simple (MMObject *object); MMModemLocation *mm_object_get_modem_location (MMObject *object); MMModemMessaging *mm_object_get_modem_messaging (MMObject *object); +MMModemTime *mm_object_get_modem_time (MMObject *object); MMModem *mm_object_peek_modem (MMObject *object); MMModem3gpp *mm_object_peek_modem_3gpp (MMObject *object); @@ -59,6 +62,7 @@ MMModemCdma *mm_object_peek_modem_cdma (MMObject *object); MMModemSimple *mm_object_peek_modem_simple (MMObject *object); MMModemLocation *mm_object_peek_modem_location (MMObject *object); MMModemMessaging *mm_object_peek_modem_messaging (MMObject *object); +MMModemTime *mm_object_peek_modem_time (MMObject *object); G_END_DECLS |