SymbX/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libmm-glib,voice: minor coding style fixes

Browse Source
This commit is contained in:
Aleksander Morgado
2015-08-02 10:39:47 +02:00
parent ca88d6333f
commit d00fe0d628
6 changed files with 195 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libmm-glib/mm-call-properties.c
+16 -16
View File
@@ -36,10 +36,10 @@
G_DEFINE_TYPE (MMCallProperties, mm_call_properties, G_TYPE_OBJECT)
#define PROPERTY_NUMBER "number"
#define PROPERTY_DIRECTION "direction"
#define PROPERTY_STATE_REASON "state-reason"
#define PROPERTY_STATE "state"
#define PROPERTY_NUMBER "number"
#define PROPERTY_DIRECTION "direction"
#define PROPERTY_STATE_REASON "state-reason"
#define PROPERTY_STATE "state"
struct _MMCallPropertiesPrivate {
gchar *number;
@@ -59,7 +59,7 @@ struct _MMCallPropertiesPrivate {
*/
void
mm_call_properties_set_number (MMCallProperties *self,
const gchar *number)
const gchar *number)
{
g_return_if_fail (MM_IS_CALL_PROPERTIES (self));
@@ -94,7 +94,7 @@ mm_call_properties_get_number (MMCallProperties *self)
*/
void
mm_call_properties_set_direction (MMCallProperties *self,
MMCallDirection direction)
MMCallDirection direction)
{
g_return_if_fail (MM_IS_CALL_PROPERTIES (self));
@@ -128,7 +128,7 @@ mm_call_properties_get_direction (MMCallProperties *self)
*/
void
mm_call_properties_set_state (MMCallProperties *self,
MMCallState state)
MMCallState state)
{
g_return_if_fail (MM_IS_CALL_PROPERTIES (self));
@@ -162,7 +162,7 @@ mm_call_properties_get_state (MMCallProperties *self)
*/
void
mm_call_properties_set_state_reason (MMCallProperties *self,
MMCallStateReason state_reason)
MMCallStateReason state_reason)
{
g_return_if_fail (MM_IS_CALL_PROPERTIES (self));
@@ -211,18 +211,18 @@ mm_call_properties_get_dictionary (MMCallProperties *self)
"{sv}",
PROPERTY_STATE_REASON,
g_variant_new_uint32 (self->priv->state_reason));
if (self->priv->state != MM_CALL_STATE_UNKNOWN)
g_variant_builder_add (&builder,
"{sv}",
PROPERTY_STATE,
g_variant_new_uint32 (self->priv->state));
g_variant_builder_add (&builder,
"{sv}",
PROPERTY_DIRECTION,
g_variant_new_uint32 (self->priv->direction));
return g_variant_ref_sink (g_variant_builder_end (&builder));
}
@@ -267,7 +267,7 @@ consume_string (MMCallProperties *self,
return FALSE;
}
mm_call_properties_set_state_reason(self, state_reason);
mm_call_properties_set_state_reason (self, state_reason);
} else {
g_set_error (error,
MM_CORE_ERROR,
@@ -451,10 +451,10 @@ mm_call_properties_init (MMCallProperties *self)
MM_TYPE_CALL_PROPERTIES,
MMCallPropertiesPrivate);
self->priv->number = NULL;
self->priv->direction = MM_CALL_DIRECTION_UNKNOWN;
self->priv->state = MM_CALL_STATE_UNKNOWN;
self->priv->state_reason = MM_CALL_STATE_REASON_UNKNOWN;
self->priv->number = NULL;
self->priv->direction = MM_CALL_DIRECTION_UNKNOWN;
self->priv->state = MM_CALL_STATE_UNKNOWN;
self->priv->state_reason = MM_CALL_STATE_REASON_UNKNOWN;
}
static void
libmm-glib/mm-call-properties.h
+14 -14
View File
@@ -57,20 +57,20 @@ GType mm_call_properties_get_type (void);
MMCallProperties *mm_call_properties_new (void);
void mm_call_properties_set_number (MMCallProperties *self,
const gchar *text);
void mm_call_properties_set_direction (MMCallProperties *self,
MMCallDirection direction);
void mm_call_properties_set_state_reason (MMCallProperties *self,
MMCallStateReason state_reason);
void mm_call_properties_set_state (MMCallProperties *self,
MMCallState state);
void mm_call_properties_set_number (MMCallProperties *self,
const gchar *text);
void mm_call_properties_set_direction (MMCallProperties *self,
MMCallDirection direction);
void mm_call_properties_set_state_reason (MMCallProperties *self,
MMCallStateReason state_reason);
void mm_call_properties_set_state (MMCallProperties *self,
MMCallState state);
const gchar *mm_call_properties_get_number (MMCallProperties *self);
MMCallDirection mm_call_properties_get_direction (MMCallProperties *self);
MMCallStateReason mm_call_properties_get_state_reason(MMCallProperties *self);
MMCallState mm_call_properties_get_state (MMCallProperties *self);
const gchar *mm_call_properties_get_number (MMCallProperties *self);
MMCallDirection mm_call_properties_get_direction (MMCallProperties *self);
MMCallStateReason mm_call_properties_get_state_reason(MMCallProperties *self);
MMCallState mm_call_properties_get_state (MMCallProperties *self);
/*****************************************************************************/
/* ModemManager/libmm-glib/mmcli specific methods */
@@ -79,9 +79,9 @@ MMCallState mm_call_properties_get_state (MMCallProperties *self);
defined (LIBMM_GLIB_COMPILATION)
MMCallProperties *mm_call_properties_new_from_string (const gchar *str,
GError **error);
GError **error);
MMCallProperties *mm_call_properties_new_from_dictionary (GVariant *dictionary,
GError **error);
GError **error);
MMCallProperties *mm_call_properties_dup (MMCallProperties *orig);
libmm-glib/mm-call.c
+38 -38
View File
@@ -83,7 +83,7 @@ mm_call_dup_path (MMCall *self)
* mm_call_get_number:
* @self: A #MMCall.
*
* Gets the call number. In outgoing calls contains the dialing number or
* Gets the call number. In outgoing calls contains the dialing number or
* the remote number in incoming calls
*
* <warning>The returned value is only valid until the property changes so
@@ -106,7 +106,7 @@ mm_call_get_number (MMCall *self)
* mm_call_dup_number:
* @self: A #MMCall.
*
* Gets the call number. In outgoing calls contains the dialing number or
* Gets the call number. In outgoing calls contains the dialing number or
* the remote number in incoming calls
*
* Returns: (transfer full): The number, or %NULL if it couldn't be retrieved. The returned value should be freed with g_free().
@@ -188,8 +188,8 @@ mm_call_get_state_reason (MMCall *self)
*/
gboolean
mm_call_start_finish (MMCall *self,
GAsyncResult *res,
GError **error)
GAsyncResult *res,
GError **error)
{
g_return_val_if_fail (MM_IS_CALL (self), FALSE);
@@ -214,16 +214,16 @@ mm_call_start_finish (MMCall *self,
*/
void
mm_call_start (MMCall *self,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data)
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data)
{
g_return_if_fail (MM_IS_CALL (self));
mm_gdbus_call_call_start (MM_GDBUS_CALL (self),
cancellable,
callback,
user_data);
cancellable,
callback,
user_data);
}
/**
@@ -243,14 +243,14 @@ mm_call_start (MMCall *self,
*/
gboolean
mm_call_start_sync (MMCall *self,
GCancellable *cancellable,
GError **error)
GCancellable *cancellable,
GError **error)
{
g_return_val_if_fail (MM_IS_CALL (self), FALSE);
return mm_gdbus_call_call_start_sync (MM_GDBUS_CALL (self),
cancellable,
error);
cancellable,
error);
}
/*****************************************************************************/
@@ -267,8 +267,8 @@ mm_call_start_sync (MMCall *self,
*/
gboolean
mm_call_accept_finish (MMCall *self,
GAsyncResult *res,
GError **error)
GAsyncResult *res,
GError **error)
{
g_return_val_if_fail (MM_IS_CALL (self), FALSE);
@@ -293,16 +293,16 @@ mm_call_accept_finish (MMCall *self,
*/
void
mm_call_accept (MMCall *self,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data)
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data)
{
g_return_if_fail (MM_IS_CALL (self));
mm_gdbus_call_call_accept (MM_GDBUS_CALL (self),
cancellable,
callback,
user_data);
cancellable,
callback,
user_data);
}
/**
@@ -322,8 +322,8 @@ mm_call_accept (MMCall *self,
*/
gboolean
mm_call_accept_sync (MMCall *self,
GCancellable *cancellable,
GError **error)
GCancellable *cancellable,
GError **error)
{
g_return_val_if_fail (MM_IS_CALL (self), FALSE);
@@ -346,8 +346,8 @@ mm_call_accept_sync (MMCall *self,
*/
gboolean
mm_call_hangup_finish (MMCall *self,
GAsyncResult *res,
GError **error)
GAsyncResult *res,
GError **error)
{
g_return_val_if_fail (MM_IS_CALL (self), FALSE);
@@ -372,16 +372,16 @@ mm_call_hangup_finish (MMCall *self,
*/
void
mm_call_hangup (MMCall *self,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data)
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data)
{
g_return_if_fail (MM_IS_CALL (self));
mm_gdbus_call_call_hangup (MM_GDBUS_CALL (self),
cancellable,
callback,
user_data);
cancellable,
callback,
user_data);
}
/**
@@ -401,14 +401,14 @@ mm_call_hangup (MMCall *self,
*/
gboolean
mm_call_hangup_sync (MMCall *self,
GCancellable *cancellable,
GError **error)
GCancellable *cancellable,
GError **error)
{
g_return_val_if_fail (MM_IS_CALL (self), FALSE);
return mm_gdbus_call_call_hangup_sync (MM_GDBUS_CALL (self),
cancellable,
error);
cancellable,
error);
}
/*****************************************************************************/
@@ -440,7 +440,7 @@ mm_call_send_tone_finish (MMCall *self,
* @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL.
* @user_data: User data to pass to @callback.
*
* Asynchronously requests to send_tone the call.
* Asynchronously requests to send tone the call.
*
* Call objects can only be executed once.
*
@@ -471,7 +471,7 @@ mm_call_send_tone (MMCall *self,
* @cancellable: (allow-none): A #GCancellable or %NULL.
* @error: Return location for error or %NULL.
*
* Synchronously requests to send_tone the call.
* Synchronously requests to send tone the call.
*
* Call objects can only be sent once.
*
libmm-glib/mm-call.h
+49 -49
View File
@@ -59,76 +59,76 @@ struct _MMCallClass {
GType mm_call_get_type (void);
const gchar *mm_call_get_path (MMCall *self);
gchar *mm_call_dup_path (MMCall *self);
const gchar *mm_call_get_path (MMCall *self);
gchar *mm_call_dup_path (MMCall *self);
const gchar *mm_call_get_number (MMCall *self);
gchar *mm_call_dup_number (MMCall *self);
const gchar *mm_call_get_number (MMCall *self);
gchar *mm_call_dup_number (MMCall *self);
MMCallState mm_call_get_state (MMCall *self);
MMCallState mm_call_get_state (MMCall *self);
MMCallStateReason mm_call_get_state_reason (MMCall *self);
MMCallStateReason mm_call_get_state_reason (MMCall *self);
MMCallDirection mm_call_get_direction (MMCall *self);
MMCallDirection mm_call_get_direction (MMCall *self);
void mm_call_start (MMCall *self,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
void mm_call_start (MMCall *self,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
gboolean mm_call_start_finish (MMCall *self,
GAsyncResult *res,
GError **error);
gboolean mm_call_start_finish (MMCall *self,
GAsyncResult *res,
GError **error);
gboolean mm_call_start_sync (MMCall *self,
GCancellable *cancellable,
GError **error);
gboolean mm_call_start_sync (MMCall *self,
GCancellable *cancellable,
GError **error);
void mm_call_accept (MMCall *self,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
void mm_call_accept (MMCall *self,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
gboolean mm_call_accept_finish (MMCall *self,
GAsyncResult *res,
GError **error);
gboolean mm_call_accept_finish (MMCall *self,
GAsyncResult *res,
GError **error);
gboolean mm_call_accept_sync (MMCall *self,
GCancellable *cancellable,
GError **error);
gboolean mm_call_accept_sync (MMCall *self,
GCancellable *cancellable,
GError **error);
void mm_call_hangup (MMCall *self,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
void mm_call_hangup (MMCall *self,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
gboolean mm_call_hangup_finish (MMCall *self,
GAsyncResult *res,
GError **error);
gboolean mm_call_hangup_finish (MMCall *self,
GAsyncResult *res,
GError **error);
gboolean mm_call_hangup_sync (MMCall *self,
GCancellable *cancellable,
GError **error);
gboolean mm_call_hangup_sync (MMCall *self,
GCancellable *cancellable,
GError **error);
void mm_call_send_tone (MMCall *self,
const gchar *tone,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
void mm_call_send_tone (MMCall *self,
const gchar *tone,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
gboolean mm_call_send_tone_finish (MMCall *self,
GAsyncResult *res,
GError **error);
gboolean mm_call_send_tone_finish (MMCall *self,
GAsyncResult *res,
GError **error);
gboolean mm_call_send_tone_sync (MMCall *self,
const gchar *tone,
GCancellable *cancellable,
GError **error);
gboolean mm_call_send_tone_sync (MMCall *self,
const gchar *tone,
GCancellable *cancellable,
GError **error);
G_END_DECLS
libmm-glib/mm-modem-voice.c
+53 -68
View File
@@ -124,8 +124,8 @@ list_call_context_complete_and_free (ListCallContext *ctx)
*/
GList *
mm_modem_voice_list_call_finish (MMModemVoice *self,
GAsyncResult *res,
GError **error)
GAsyncResult *res,
GError **error)
{
GList *list;
@@ -212,9 +212,9 @@ create_next_call (ListCallContext *ctx)
*/
void
mm_modem_voice_list_call (MMModemVoice *self,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data)
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data)
{
ListCallContext *ctx;
@@ -258,8 +258,8 @@ mm_modem_voice_list_call (MMModemVoice *self,
*/
GList *
mm_modem_voice_list_call_sync (MMModemVoice *self,
GCancellable *cancellable,
GError **error)
GCancellable *cancellable,
GError **error)
{
GList *call_objects = NULL;
gchar **call_paths = NULL;
@@ -277,14 +277,14 @@ mm_modem_voice_list_call_sync (MMModemVoice *self,
GObject *call;
call = g_initable_new (MM_TYPE_CALL,
cancellable,
error,
"g-flags", G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START,
"g-name", MM_DBUS_SERVICE,
"g-connection", g_dbus_proxy_get_connection (G_DBUS_PROXY (self)),
"g-object-path", call_paths[i],
"g-interface-name", "org.freedesktop.ModemManager1.Call",
NULL);
cancellable,
error,
"g-flags", G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START,
"g-name", MM_DBUS_SERVICE,
"g-connection", g_dbus_proxy_get_connection (G_DBUS_PROXY (self)),
"g-object-path", call_paths[i],
"g-interface-name", "org.freedesktop.ModemManager1.Call",
NULL);
if (!call) {
call_object_list_free (call_objects);
g_strfreev (call_paths);
@@ -371,9 +371,9 @@ create_call_ready (MMModemVoice *self,
gchar *call_path = NULL;
if (!mm_gdbus_modem_voice_call_create_call_finish (MM_GDBUS_MODEM_VOICE (self),
&call_path,
res,
&error)) {
&call_path,
res,
&error)) {
g_simple_async_result_take_error (ctx->result, error);
create_call_context_complete_and_free (ctx);
g_free (call_path);
@@ -411,10 +411,10 @@ create_call_ready (MMModemVoice *self,
*/
void
mm_modem_voice_create_call (MMModemVoice *self,
MMCallProperties *properties,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data)
MMCallProperties *properties,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data)
{
CreateCallContext *ctx;
GVariant *dictionary;
@@ -456,9 +456,9 @@ mm_modem_voice_create_call (MMModemVoice *self,
*/
MMCall *
mm_modem_voice_create_call_sync (MMModemVoice *self,
MMCallProperties *properties,
GCancellable *cancellable,
GError **error)
MMCallProperties *properties,
GCancellable *cancellable,
GError **error)
{
MMCall *call = NULL;
gchar *call_path = NULL;
@@ -468,20 +468,20 @@ mm_modem_voice_create_call_sync (MMModemVoice *self,
dictionary = (mm_call_properties_get_dictionary (properties));
mm_gdbus_modem_voice_call_create_call_sync (MM_GDBUS_MODEM_VOICE (self),
dictionary,
&call_path,
cancellable,
error);
dictionary,
&call_path,
cancellable,
error);
if (call_path) {
call = g_initable_new (MM_TYPE_CALL,
cancellable,
error,
"g-flags", G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START,
"g-name", MM_DBUS_SERVICE,
"g-connection", g_dbus_proxy_get_connection (G_DBUS_PROXY (self)),
"g-object-path", call_path,
"g-interface-name", "org.freedesktop.ModemManager1.Call",
NULL);
cancellable,
error,
"g-flags", G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START,
"g-name", MM_DBUS_SERVICE,
"g-connection", g_dbus_proxy_get_connection (G_DBUS_PROXY (self)),
"g-object-path", call_path,
"g-interface-name", "org.freedesktop.ModemManager1.Call",
NULL);
g_free (call_path);
}
@@ -504,8 +504,8 @@ mm_modem_voice_create_call_sync (MMModemVoice *self,
*/
gboolean
mm_modem_voice_delete_call_finish (MMModemVoice *self,
GAsyncResult *res,
GError **error)
GAsyncResult *res,
GError **error)
{
g_return_val_if_fail (MM_IS_MODEM_VOICE (self), FALSE);
@@ -529,18 +529,18 @@ mm_modem_voice_delete_call_finish (MMModemVoice *self,
*/
void
mm_modem_voice_delete_call (MMModemVoice *self,
const gchar *call,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data)
const gchar *call,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data)
{
g_return_if_fail (MM_IS_MODEM_VOICE (self));
mm_gdbus_modem_voice_call_delete_call (MM_GDBUS_MODEM_VOICE (self),
call,
cancellable,
callback,
user_data);
call,
cancellable,
callback,
user_data);
}
/**
@@ -559,16 +559,16 @@ mm_modem_voice_delete_call (MMModemVoice *self,
*/
gboolean
mm_modem_voice_delete_call_sync (MMModemVoice *self,
const gchar *call,
GCancellable *cancellable,
GError **error)
const gchar *call,
GCancellable *cancellable,
GError **error)
{
g_return_val_if_fail (MM_IS_MODEM_VOICE (self), FALSE);
return mm_gdbus_modem_voice_call_delete_call_sync (MM_GDBUS_MODEM_VOICE (self),
call,
cancellable,
error);
call,
cancellable,
error);
}
/*****************************************************************************/
@@ -576,24 +576,9 @@ mm_modem_voice_delete_call_sync (MMModemVoice *self,
static void
mm_modem_voice_init (MMModemVoice *self)
{
/* Setup private data */
}
static void
finalize (GObject *object)
{
//MMModemVoice *self = MM_MODEM_VOICE (object);
G_OBJECT_CLASS (mm_modem_voice_parent_class)->finalize (object);
}
static void
mm_modem_voice_class_init (MMModemVoiceClass *modem_class)
{
GObjectClass *object_class = G_OBJECT_CLASS (modem_class);
//g_type_class_add_private (object_class, sizeof (MMModemVoicePrivate));
/* Virtual methods */
object_class->finalize = finalize;
}
libmm-glib/mm-modem-voice.h
+25 -25
View File
@@ -70,41 +70,41 @@ const gchar *mm_modem_voice_get_path (MMModemVoice *self);
gchar *mm_modem_voice_dup_path (MMModemVoice *self);
void mm_modem_voice_create_call (MMModemVoice *self,
MMCallProperties *properties,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
MMCallProperties *properties,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
MMCall *mm_modem_voice_create_call_finish (MMModemVoice *self,
GAsyncResult *res,
GError **error);
GAsyncResult *res,
GError **error);
MMCall *mm_modem_voice_create_call_sync (MMModemVoice *self,
MMCallProperties *properties,
GCancellable *cancellable,
GError **error);
MMCallProperties *properties,
GCancellable *cancellable,
GError **error);
void mm_modem_voice_list_call (MMModemVoice *self,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
GList *mm_modem_voice_list_call_finish (MMModemVoice *self,
GAsyncResult *res,
GError **error);
GAsyncResult *res,
GError **error);
GList *mm_modem_voice_list_call_sync (MMModemVoice *self,
GCancellable *cancellable,
GError **error);
GCancellable *cancellable,
GError **error);
void mm_modem_voice_delete_call (MMModemVoice *self,
const gchar *call,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
const gchar *call,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
gboolean mm_modem_voice_delete_call_finish (MMModemVoice *self,
GAsyncResult *res,
GError **error);
GAsyncResult *res,
GError **error);
gboolean mm_modem_voice_delete_call_sync (MMModemVoice *self,
const gchar *call,
GCancellable *cancellable,
GError **error);
const gchar *call,
GCancellable *cancellable,
GError **error);
G_END_DECLS