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

Convert multiple return values to structs.

Browse Source 
Python DBus bindings are unable to implement methods that return multiple
values.
This commit is contained in:
Tambet Ingo
2008-12-17 13:35:22 +02:00
parent 614aa0316a
commit a1223a9eaf
6 changed files with 64 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
introspection/mm-modem-gsm-card.xml
View File

@@ -34,19 +34,9 @@
</tp:docstring>
<annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
<annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_gsm_modem_get_info"/>
<arg name="manufacturer" type="s" direction="out">
<arg name="info" type="(sss)" direction="out">
<tp:docstring>
The manufacturer of the card.
</tp:docstring>
</arg>
<arg name="modem" type="s" direction="out">
<tp:docstring>
The model of the card.
</tp:docstring>
</arg>
<arg name="version" type="s" direction="out">
<tp:docstring>
The version (revision) of the card.
Structure containing manufacturer, model, and version (revision) of the card.
</tp:docstring>
</arg>
</method>

14
introspection/mm-modem-gsm-contacts.xml
View File

@@ -49,19 +49,9 @@
The index of the contact.
</tp:docstring>
</arg>
<arg name="found_index" type="u" direction="out">
<arg name="contact" type="(uss)" direction="out">
<tp:docstring>
The index of the contact (same as the passed index).
</tp:docstring>
</arg>
<arg name="name" type="s" direction="out">
<tp:docstring>
The name of the contact.
</tp:docstring>
</arg>
<arg name="number" type="s" direction="out">
<tp:docstring>
The number of the contact.
The contact structure containing index, name, and number.
</tp:docstring>
</arg>
</method>

17
introspection/mm-modem-gsm-network.xml
View File

@@ -112,19 +112,12 @@
</tp:docstring>
<annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
<annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_gsm_modem_get_reg_info"/>
<arg name="status" type="u" direction="out" tp:type="MM_MODEM_GSM_NETWORK_REG_STATUS">
<arg name="info" type="(uss)" direction="out">
<tp:docstring>
The network status.
</tp:docstring>
</arg>
<arg name="operator_code" type="s" direction="out">
<tp:docstring>
The current operator code.
</tp:docstring>
</arg>
<arg name="operator_name" type="s" direction="out">
<tp:docstring>
The current operator name.
The returned information contains:
* Network status.
* Current operator code.
* Current operator name,
</tp:docstring>
</arg>
</method>

19
introspection/mm-modem-gsm-sms.xml
View File

@@ -26,24 +26,9 @@
The index of the SMS.
</tp:docstring>
</arg>
<arg name="found_index" type="u" direction="out">
<arg name="sms" type="(ussd)" direction="out">
<tp:docstring>
The index of the SMS (same as the passed index).
</tp:docstring>
</arg>
<arg name="number" type="s" direction="out">
<tp:docstring>
The number the SMS was received from.
</tp:docstring>
</arg>
<arg name="contents" type="s" direction="out">
<tp:docstring>
The contents of the SMS.
</tp:docstring>
</arg>
<arg name="time" type="d" direction="out">
<tp:docstring>
The timestamp.
The SMS structure containing index, number, contents and time stamp.
</tp:docstring>
</arg>
</method>

28
src/mm-modem-gsm-card.c
View File

@@ -75,8 +75,32 @@ info_call_done (MMModemGsmCard *self,
if (error)
dbus_g_method_return_error (context, error);
else
dbus_g_method_return (context, manufacturer, model, version);
else {
GValueArray *array;
GValue value = { 0, };
array = g_value_array_new (3);
/* Manufacturer */
g_value_init (&value, G_TYPE_STRING);
g_value_set_string (&value, manufacturer);
g_value_array_append (array, &value);
g_value_unset (&value);
/* Model */
g_value_init (&value, G_TYPE_STRING);
g_value_set_string (&value, model);
g_value_array_append (array, &value);
g_value_unset (&value);
/* Version */
g_value_init (&value, G_TYPE_STRING);
g_value_set_string (&value, version);
g_value_array_append (array, &value);
g_value_unset (&value);
dbus_g_method_return (context, array);
}
}
static void

31
src/mm-modem-gsm-network.c
View File

@@ -116,9 +116,30 @@ reg_info_call_done (MMModemGsmNetwork *self,
if (error)
dbus_g_method_return_error (context, error);
else {
dbus_g_method_return (context, status,
oper_code ? oper_code : "",
oper_name ? oper_name : "");
GValueArray *array;
GValue value = { 0, };
array = g_value_array_new (3);
/* Status */
g_value_init (&value, G_TYPE_UINT);
g_value_set_uint (&value, (guint32) status);
g_value_array_append (array, &value);
g_value_unset (&value);
/* Operator code */
g_value_init (&value, G_TYPE_STRING);
g_value_set_string (&value, oper_code);
g_value_array_append (array, &value);
g_value_unset (&value);
/* Operator name */
g_value_init (&value, G_TYPE_STRING);
g_value_set_string (&value, oper_name);
g_value_array_append (array, &value);
g_value_unset (&value);
dbus_g_method_return (context, array);
}
}
@@ -330,7 +351,9 @@ mm_modem_gsm_network_registration_info (MMModemGsmNetwork *self,
{
g_return_if_fail (MM_IS_MODEM_GSM_NETWORK (self));
g_signal_emit (self, signals[REGISTRATION_INFO], 0, status, oper_code, oper_name);
g_signal_emit (self, signals[REGISTRATION_INFO], 0, status,
oper_code ? oper_code : "",
oper_name ? oper_name : "");
}
void