diff options
Diffstat (limited to 'libmm-glib')
| -rw-r--r-- | libmm-glib/Makefile.am | 3 | ||||
| -rw-r--r-- | libmm-glib/mm-modem-messaging.c | 6 | ||||
| -rw-r--r-- | libmm-glib/mm-sms-properties.c | 76 | ||||
| -rw-r--r-- | libmm-glib/mm-sms-properties.h | 54 | ||||
| -rw-r--r-- | libmm-glib/mm-sms.h | 2 |
5 files changed, 2 insertions, 139 deletions
diff --git a/libmm-glib/Makefile.am b/libmm-glib/Makefile.am index 4cb2e9a0..a44312a0 100644 --- a/libmm-glib/Makefile.am +++ b/libmm-glib/Makefile.am @@ -36,8 +36,6 @@ libmm_glib_la_SOURCES = \ mm-modem-location.c \ mm-sim.h \ mm-sim.c \ - mm-sms-properties.h \ - mm-sms-properties.c \ mm-sms.h \ mm-sms.c \ mm-modem-messaging.h \ @@ -64,7 +62,6 @@ include_HEADERS = \ mm-modem-simple-status-properties.h \ mm-modem-simple.h \ mm-sim.h \ - mm-sms-properties.h \ mm-sms.h \ mm-bearer-properties.h \ mm-bearer-ip-config.h \ diff --git a/libmm-glib/mm-modem-messaging.c b/libmm-glib/mm-modem-messaging.c index 7eabf6a3..7cd473b2 100644 --- a/libmm-glib/mm-modem-messaging.c +++ b/libmm-glib/mm-modem-messaging.c @@ -405,8 +405,7 @@ mm_modem_messaging_create (MMModemMessaging *self, if (cancellable) ctx->cancellable = g_object_ref (cancellable); - dictionary = (mm_common_sms_properties_get_dictionary ( - MM_COMMON_SMS_PROPERTIES (properties))); + dictionary = (mm_sms_properties_get_dictionary (properties)); mm_gdbus_modem_messaging_call_create ( self, dictionary, @@ -443,8 +442,7 @@ mm_modem_messaging_create_sync (MMModemMessaging *self, g_return_val_if_fail (MM_GDBUS_IS_MODEM_MESSAGING (self), NULL); - dictionary = (mm_common_sms_properties_get_dictionary ( - MM_COMMON_SMS_PROPERTIES (properties))); + dictionary = (mm_sms_properties_get_dictionary (properties)); mm_gdbus_modem_messaging_call_create_sync (self, dictionary, &sms_path, diff --git a/libmm-glib/mm-sms-properties.c b/libmm-glib/mm-sms-properties.c deleted file mode 100644 index 161ac1fc..00000000 --- a/libmm-glib/mm-sms-properties.c +++ /dev/null @@ -1,76 +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) 2012 Google, Inc. - */ - -#include "mm-sms-properties.h" - -void -mm_sms_properties_set_text (MMSmsProperties *self, - const gchar *text) -{ - g_return_if_fail (MM_IS_SMS_PROPERTIES (self)); - - mm_common_sms_properties_set_text (self, text); -} - -void -mm_sms_properties_set_number (MMSmsProperties *self, - const gchar *number) -{ - g_return_if_fail (MM_IS_SMS_PROPERTIES (self)); - - mm_common_sms_properties_set_number (self, number); -} - -void -mm_sms_properties_set_smsc (MMSmsProperties *self, - const gchar *smsc) -{ - g_return_if_fail (MM_IS_SMS_PROPERTIES (self)); - - mm_common_sms_properties_set_smsc (self, smsc); -} - -void -mm_sms_properties_set_validity (MMSmsProperties *self, - guint validity) -{ - g_return_if_fail (MM_IS_SMS_PROPERTIES (self)); - - mm_common_sms_properties_set_validity (self, validity); -} - -void -mm_sms_properties_set_class (MMSmsProperties *self, - guint class) -{ - g_return_if_fail (MM_IS_SMS_PROPERTIES (self)); - - mm_common_sms_properties_set_class (self, class); -} - -/*****************************************************************************/ - -MMSmsProperties * -mm_sms_properties_new_from_string (const gchar *str, - GError **error) -{ - return mm_common_sms_properties_new_from_string (str, error); -} - -MMSmsProperties * -mm_sms_properties_new (void) -{ - return mm_common_sms_properties_new (); -} diff --git a/libmm-glib/mm-sms-properties.h b/libmm-glib/mm-sms-properties.h deleted file mode 100644 index f37e499d..00000000 --- a/libmm-glib/mm-sms-properties.h +++ /dev/null @@ -1,54 +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) 2012 Google, Inc. - */ - -#ifndef MM_SMS_PROPERTIES_H -#define MM_SMS_PROPERTIES_H - -#include <ModemManager.h> -#include <glib-object.h> - -#include <libmm-common.h> - -G_BEGIN_DECLS - -typedef MMCommonSmsProperties MMSmsProperties; -#define MM_TYPE_SMS_PROPERTIES(o) MM_TYPE_COMMON_SMS_PROPERTIES (o) -#define MM_SMS_PROPERTIES(o) MM_COMMON_SMS_PROPERTIES(o) -#define MM_IS_SMS_PROPERTIES(o) MM_IS_COMMON_SMS_PROPERTIES(o) - -MMSmsProperties *mm_sms_properties_new (void); -MMSmsProperties *mm_sms_properties_new_from_string ( - const gchar *str, - GError **error); - -void mm_sms_properties_set_text ( - MMSmsProperties *properties, - const gchar *text); -void mm_sms_properties_set_number ( - MMSmsProperties *properties, - const gchar *number); -void mm_sms_properties_set_smsc ( - MMSmsProperties *properties, - const gchar *smsc); -void mm_sms_properties_set_validity ( - MMSmsProperties *properties, - guint validity); -void mm_sms_properties_set_class ( - MMSmsProperties *properties, - guint class); - -G_END_DECLS - -#endif /* MM_SMS_PROPERTIES_H */ diff --git a/libmm-glib/mm-sms.h b/libmm-glib/mm-sms.h index 09e256ba..7d836909 100644 --- a/libmm-glib/mm-sms.h +++ b/libmm-glib/mm-sms.h @@ -26,8 +26,6 @@ #include <ModemManager.h> #include <libmm-common.h> -#include "mm-sms-properties.h" - G_BEGIN_DECLS typedef MmGdbusSms MMSms; |