[PATCH 0/6] Return specific ofono errors after SS transaction
by Philippe Nunes
As pointed by the first GCF tests, the user indication does not distinguish the type of error occured after an SS request.
Actually, the ofono error type .Failed is returned whatever is the telephony error.
In order to return more specific ofono error types, I introduced an utility function to map the telephony errors into ofono errors.
I extended also the ofono error types to match more closely with the telephony errors.
Philippe Nunes (6):
common: Fix typos in error strings
dbus: Add new error types
error-mapping: Add function to map telephony errors into ofono error
types
build: Add error-mapping utility to build
Return specific ofono errors according telephony errors
Extend the list of ofono error types returned by the method initiate
Makefile.am | 1 +
doc/supplementaryservices-api.txt | 6 +++
src/call-barring.c | 11 ++++--
src/call-forwarding.c | 6 ++-
src/call-settings.c | 18 +++++----
src/common.c | 19 ++++-----
src/dbus.c | 13 +++++++
src/error-mapping.c | 77 +++++++++++++++++++++++++++++++++++++
src/error-mapping.h | 25 ++++++++++++
src/ofono.h | 2 +
10 files changed, 155 insertions(+), 23 deletions(-)
create mode 100644 src/error-mapping.c
create mode 100644 src/error-mapping.h
--
1.7.9.5
8 years, 6 months
[PATCH] v2: support Wavecom Q2403/Q2686 modems
by pablo＠gnumonks.org
From: Pablo Neira Ayuso <pablo(a)gnumonks.org>
Hi!
This is the second version of the patch to support Wavecom Q2403/Q2686
modems. I've tried to address all comments from Denis Kenzior.
I've splitted the patch in two, one per directory directory as you
suggested.
Please, let me know if you find any issue with this patch.
Thank you!
Pablo Neira Ayuso (2):
wavecom: add support for Wavecom Q2403/Q2686 modems
wavecom: add support for Wavecom Q2403/Q2686 modems
drivers/atmodem/sim.c | 3 +-
drivers/atmodem/sms.c | 27 +++++++++++++---
drivers/atmodem/vendor.h | 1 +
plugins/udev.c | 15 +++++++++
plugins/wavecom.c | 77 ++++++++++++++++++++++++++++++++++++++++++----
5 files changed, 111 insertions(+), 12 deletions(-)
--
1.7.10
8 years, 6 months
[PATCH] test: Add new script for SS GCF test cases
by Guillaume Zajac
This script uses dynamic SS codes in input and
displays answers to the different requests.
It handles all SS: call barring, call forwarding,
call waiting, CLIP, CLIR, ...
---
test/test-ss | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 55 insertions(+), 0 deletions(-)
create mode 100755 test/test-ss
diff --git a/test/test-ss b/test/test-ss
new file mode 100755
index 0000000..adeff33
--- /dev/null
+++ b/test/test-ss
@@ -0,0 +1,55 @@
+#!/usr/bin/python
+
+import sys
+import gobject
+
+import dbus
+import dbus.mainloop.glib
+
+if __name__ == "__main__":
+ dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
+
+ bus = dbus.SystemBus()
+
+ manager = dbus.Interface(bus.get_object('org.ofono', '/'),
+ 'org.ofono.Manager')
+
+ modems = manager.GetModems()
+ modem = modems[0][0]
+
+ if (len(sys.argv) == 2):
+ ss_code = sys.argv[1]
+ else:
+ modem = sys.argv[1]
+ ss_code = sys.argv[2]
+
+ ss = dbus.Interface(bus.get_object('org.ofono', modem),
+ 'org.ofono.SupplementaryServices')
+
+ try:
+ ss_type, properties = ss.Initiate(ss_code, timeout=100)
+ except dbus.DBusException, e:
+ print "Unable to perform operation: ", e
+ sys.exit(1);
+
+ if (ss_type == "CallBarring"):
+ print "%s : Operation [ %s ] Service Type [ %s ]" % (ss_type, properties[0], properties[1])
+ for key in properties[2]:
+ print "%s : %s" % (key, properties[2][key])
+ sys.exit(1);
+ elif (ss_type == "CallForwarding"):
+ print "%s : Operation [ %s ] Service Type [ %s ]" % (ss_type, properties[0], properties[1])
+ for key in properties[2]:
+ print "%s : %s" % (key, properties[2][key])
+ sys.exit(1);
+ elif (ss_type == "CallWaiting"):
+ print "%s : Operation [ %s ]" % (ss_type, properties[0])
+ for key in properties[1]:
+ print "%s : %s" % (key, properties[1][key])
+ sys.exit(1);
+ else:
+ print "%s : Operation [ %s ] Status [ %s ]" % (ss_type, properties[0], properties[1])
+ sys.exit(1);
+
+ mainloop = gobject.MainLoop()
+ mainloop.run()
--
1.7.5.4
8 years, 6 months
[PATCH v7 00/16] Add DUN support
by Daniel Wagner
From: Daniel Wagner <daniel.wagner(a)bmw-carit.de>
Hi,
Changes v7:
- Fixed test scripts
- SetProperty("Active", True) will be deferred until PPP link is up
or an error happens
- GDBUS changes added
- Fixed a crash in set_property_active: device->ppp can be NULL
- Copyright year update and whitespace fixes
cheers,
daniel
Daniel Wagner (16):
bluetooth: Add Serial interface definition
dundee: Add documentation
dundee: Add test scripts
dundee: Add skeleton implementation
dundee: Add D-Bus error messages
dundee: Add D-Bus configuration file
dundee: Add systemd configuration file
dundee: Add Manager interface
dundee: Add skeleton implementation for device
dundee: Manager append devices
dundee: Add callback helpers
dundee: Add device un/register
dundee: Add driver helper functions
dundee: Add device D-Bus interface
dundee: Add PPP handling code to device
dundee: Add Bluetooth DUN driver
Makefile.am | 25 ++
bootstrap-configure | 1 +
configure.ac | 7 +-
doc/dundee-api.txt | 76 ++++++
dundee/bluetooth.c | 290 ++++++++++++++++++++
dundee/dbus.c | 45 ++++
dundee/device.c | 660 ++++++++++++++++++++++++++++++++++++++++++++++
dundee/dundee.conf | 23 ++
dundee/dundee.h | 144 ++++++++++
dundee/dundee.service.in | 11 +
dundee/main.c | 256 ++++++++++++++++++
dundee/manager.c | 122 +++++++++
plugins/bluetooth.h | 1 +
test/dundee-connect | 20 ++
test/dundee-disconnect | 20 ++
test/monitor-dundee | 109 ++++++++
16 files changed, 1809 insertions(+), 1 deletion(-)
create mode 100644 doc/dundee-api.txt
create mode 100644 dundee/bluetooth.c
create mode 100644 dundee/dbus.c
create mode 100644 dundee/device.c
create mode 100644 dundee/dundee.conf
create mode 100644 dundee/dundee.h
create mode 100644 dundee/dundee.service.in
create mode 100644 dundee/main.c
create mode 100644 dundee/manager.c
create mode 100755 test/dundee-connect
create mode 100755 test/dundee-disconnect
create mode 100755 test/monitor-dundee
--
1.7.10.130.g36e6c
8 years, 6 months
[HEADS UP] vim users
by Lucas De Marchi
Hey,
As I sent previously to BlueZ mailing list, the patches for d-bus
introspection exposes a bug in vim c syntax highlight. There's already
a fix for that:
https://groups.google.com/forum/#!msg/vim_dev/_IL5jM1-t_w/D-vIwZM2RfwJ
I'm not sure when there will be a new version, so I'm attaching to
this email the fixed c.vim file. Replace
/usr/share/vim/vim73/syntax/c.vim with this one and highlight will be
fixed.
Regards,
Lucas De Marchi
8 years, 6 months
[PATCH 0/3] mmsd: new tasks definition
by Ronald Tessier
These patches concern mmsd and update TODO and documentation to describe new
functionalities to add to mmsd.
Ronald Tessier (3):
TODO: Add new tasks
doc: Describe delivered group in storage doc
doc: Add new D-Bus methods to service interface
TODO | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++
doc/service-api.txt | 20 +++++++++++++++
doc/storage.txt | 30 ++++++++++++++++++++++
3 files changed, 117 insertions(+), 0 deletions(-)
--
1.7.4.1
8 years, 6 months
[PATCH 0/3] mmsd: new tasks definition
by Ronald Tessier
These patches concern mmsd and update TODO and documentation to describe new
functionalities to add to mmsd.
Ronald Tessier (3):
TODO: Add new tasks
doc: Describe delivered group in storage doc
doc: Add new D-Bus methods to service interface
TODO | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++
doc/service-api.txt | 20 +++++++++++++++
doc/storage.txt | 30 ++++++++++++++++++++++
3 files changed, 117 insertions(+), 0 deletions(-)
--
1.7.4.1
8 years, 6 months
[PATCH] test: Add timeout to be compliant with GCF
by Guillaume Zajac
With some GCF test cases, default python script timeout
is too short to pass the tests.
---
test/private-chat | 2 +-
test/swap-calls | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/test/private-chat b/test/private-chat
index 4938a25..e7c8026 100755
--- a/test/private-chat
+++ b/test/private-chat
@@ -14,7 +14,7 @@ path = modems[0][0]
manager = dbus.Interface(bus.get_object('org.ofono', path),
'org.ofono.VoiceCallManager')
-mpty = manager.PrivateChat(sys.argv[1])
+mpty = manager.PrivateChat(sys.argv[1], timeout=100)
for path in mpty:
print path
diff --git a/test/swap-calls b/test/swap-calls
index 4996e0c..eeb257b 100755
--- a/test/swap-calls
+++ b/test/swap-calls
@@ -17,4 +17,4 @@ if (len(sys.argv) == 2):
manager = dbus.Interface(bus.get_object('org.ofono', modem),
'org.ofono.VoiceCallManager')
-manager.SwapCalls()
+manager.SwapCalls(timeout=100)
--
1.7.5.4
8 years, 6 months
[PATCH 01/12] Constify GDBus method tables
by Lucas De Marchi
From: Henrique Dante de Almeida <hdante(a)profusion.mobi>
Constify method tables with the following command:
find . -name '*.[ch]' -exec \
sed -i 's/\(GDBusMethodTable .* =\)/const \1/g' {} \;
---
plugins/hfp_hf.c | 2 +-
plugins/push-notification.c | 2 +-
plugins/smart-messaging.c | 2 +-
src/audio-settings.c | 2 +-
src/call-barring.c | 2 +-
src/call-forwarding.c | 2 +-
src/call-meter.c | 2 +-
src/call-settings.c | 2 +-
src/call-volume.c | 2 +-
src/cbs.c | 2 +-
src/cdma-connman.c | 2 +-
src/cdma-netreg.c | 2 +-
src/cdma-sms.c | 2 +-
src/cdma-voicecall.c | 2 +-
src/ctm.c | 2 +-
src/gnss.c | 2 +-
src/gprs.c | 4 ++--
src/handsfree.c | 2 +-
src/location-reporting.c | 2 +-
src/manager.c | 2 +-
src/message-waiting.c | 2 +-
src/message.c | 2 +-
src/modem.c | 2 +-
src/network.c | 4 ++--
src/phonebook.c | 2 +-
src/radio-settings.c | 2 +-
src/sim.c | 2 +-
src/sms.c | 2 +-
src/stk.c | 2 +-
src/ussd.c | 2 +-
src/voicecall.c | 4 ++--
31 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/plugins/hfp_hf.c b/plugins/hfp_hf.c
index c11525e..19a362f 100644
--- a/plugins/hfp_hf.c
+++ b/plugins/hfp_hf.c
@@ -198,7 +198,7 @@ static DBusMessage *hfp_agent_release(DBusConnection *conn,
return dbus_message_new_method_return(msg);
}
-static GDBusMethodTable agent_methods[] = {
+static const GDBusMethodTable agent_methods[] = {
{ "NewConnection", "hq", "", hfp_agent_new_connection,
G_DBUS_METHOD_FLAG_ASYNC },
{ "Release", "", "", hfp_agent_release },
diff --git a/plugins/push-notification.c b/plugins/push-notification.c
index 1c19bf2..1b8f729 100644
--- a/plugins/push-notification.c
+++ b/plugins/push-notification.c
@@ -151,7 +151,7 @@ static DBusMessage *push_notification_unregister_agent(DBusConnection *conn,
return dbus_message_new_method_return(msg);
}
-static GDBusMethodTable push_notification_methods[] = {
+static const GDBusMethodTable push_notification_methods[] = {
{ "RegisterAgent", "o", "", push_notification_register_agent },
{ "UnregisterAgent", "o", "", push_notification_unregister_agent },
{ }
diff --git a/plugins/smart-messaging.c b/plugins/smart-messaging.c
index d6d77cf..6820b20 100644
--- a/plugins/smart-messaging.c
+++ b/plugins/smart-messaging.c
@@ -268,7 +268,7 @@ static DBusMessage *smart_messaging_send_vcal(DBusConnection *conn,
return NULL;
}
-static GDBusMethodTable smart_messaging_methods[] = {
+static const GDBusMethodTable smart_messaging_methods[] = {
{ "RegisterAgent", "o", "", smart_messaging_register_agent },
{ "UnregisterAgent", "o", "", smart_messaging_unregister_agent },
{ "SendBusinessCard", "say", "o", smart_messaging_send_vcard,
diff --git a/src/audio-settings.c b/src/audio-settings.c
index 77930d9..6388c3e 100644
--- a/src/audio-settings.c
+++ b/src/audio-settings.c
@@ -117,7 +117,7 @@ static DBusMessage *audio_get_properties(DBusConnection *conn,
return audio_get_properties_reply(msg, as);
}
-static GDBusMethodTable audio_methods[] = {
+static const GDBusMethodTable audio_methods[] = {
{ "GetProperties", "", "a{sv}", audio_get_properties,
G_DBUS_METHOD_FLAG_ASYNC },
{ }
diff --git a/src/call-barring.c b/src/call-barring.c
index afb3fce..952e4c2 100644
--- a/src/call-barring.c
+++ b/src/call-barring.c
@@ -966,7 +966,7 @@ static DBusMessage *cb_set_passwd(DBusConnection *conn, DBusMessage *msg,
return NULL;
}
-static GDBusMethodTable cb_methods[] = {
+static const GDBusMethodTable cb_methods[] = {
{ "GetProperties", "", "a{sv}", cb_get_properties,
G_DBUS_METHOD_FLAG_ASYNC },
{ "SetProperty", "svs", "", cb_set_property,
diff --git a/src/call-forwarding.c b/src/call-forwarding.c
index c025942..c70d140 100644
--- a/src/call-forwarding.c
+++ b/src/call-forwarding.c
@@ -881,7 +881,7 @@ static DBusMessage *cf_disable_all(DBusConnection *conn, DBusMessage *msg,
return NULL;
}
-static GDBusMethodTable cf_methods[] = {
+static const GDBusMethodTable cf_methods[] = {
{ "GetProperties", "", "a{sv}", cf_get_properties,
G_DBUS_METHOD_FLAG_ASYNC },
{ "SetProperty", "sv", "", cf_set_property,
diff --git a/src/call-meter.c b/src/call-meter.c
index c3ae6f7..fd5edc2 100644
--- a/src/call-meter.c
+++ b/src/call-meter.c
@@ -646,7 +646,7 @@ static DBusMessage *cm_acm_reset(DBusConnection *conn, DBusMessage *msg,
return NULL;
}
-static GDBusMethodTable cm_methods[] = {
+static const GDBusMethodTable cm_methods[] = {
{ "GetProperties", "", "a{sv}", cm_get_properties,
G_DBUS_METHOD_FLAG_ASYNC },
{ "SetProperty", "svs", "", cm_set_property,
diff --git a/src/call-settings.c b/src/call-settings.c
index 94e606c..9d4ff7b 100644
--- a/src/call-settings.c
+++ b/src/call-settings.c
@@ -1330,7 +1330,7 @@ static DBusMessage *cs_set_property(DBusConnection *conn, DBusMessage *msg,
return __ofono_error_invalid_args(msg);
}
-static GDBusMethodTable cs_methods[] = {
+static const GDBusMethodTable cs_methods[] = {
{ "GetProperties", "", "a{sv}", cs_get_properties,
G_DBUS_METHOD_FLAG_ASYNC },
{ "SetProperty", "sv", "", cs_set_property,
diff --git a/src/call-volume.c b/src/call-volume.c
index a1c0392..81b7564 100644
--- a/src/call-volume.c
+++ b/src/call-volume.c
@@ -301,7 +301,7 @@ static DBusMessage *cv_set_property(DBusConnection *conn, DBusMessage *msg,
return __ofono_error_invalid_args(msg);
}
-static GDBusMethodTable cv_methods[] = {
+static const GDBusMethodTable cv_methods[] = {
{ "GetProperties", "", "a{sv}", cv_get_properties },
{ "SetProperty", "sv", "", cv_set_property,
G_DBUS_METHOD_FLAG_ASYNC },
diff --git a/src/cbs.c b/src/cbs.c
index d898823..1c20cc6 100644
--- a/src/cbs.c
+++ b/src/cbs.c
@@ -540,7 +540,7 @@ static DBusMessage *cbs_set_property(DBusConnection *conn, DBusMessage *msg,
return __ofono_error_invalid_args(msg);
}
-static GDBusMethodTable cbs_methods[] = {
+static const GDBusMethodTable cbs_methods[] = {
{ "GetProperties", "", "a{sv}", cbs_get_properties },
{ "SetProperty", "sv", "", cbs_set_property,
G_DBUS_METHOD_FLAG_ASYNC },
diff --git a/src/cdma-connman.c b/src/cdma-connman.c
index 0c8b061..90652e7 100644
--- a/src/cdma-connman.c
+++ b/src/cdma-connman.c
@@ -517,7 +517,7 @@ static DBusMessage *cdma_connman_set_property(DBusConnection *conn,
return __ofono_error_invalid_args(msg);
}
-static GDBusMethodTable cdma_connman_methods[] = {
+static const GDBusMethodTable cdma_connman_methods[] = {
{ "GetProperties", "", "a{sv}",
cdma_connman_get_properties },
{ "SetProperty", "sv", "", cdma_connman_set_property,
diff --git a/src/cdma-netreg.c b/src/cdma-netreg.c
index 1a88d33..e6074a8 100644
--- a/src/cdma-netreg.c
+++ b/src/cdma-netreg.c
@@ -107,7 +107,7 @@ static DBusMessage *network_get_properties(DBusConnection *conn,
return reply;
}
-static GDBusMethodTable cdma_netreg_manager_methods[] = {
+static const GDBusMethodTable cdma_netreg_manager_methods[] = {
{ "GetProperties", "", "a{sv}", network_get_properties },
{ }
};
diff --git a/src/cdma-sms.c b/src/cdma-sms.c
index 12ea57e..a368124 100644
--- a/src/cdma-sms.c
+++ b/src/cdma-sms.c
@@ -43,7 +43,7 @@ struct ofono_cdma_sms {
struct ofono_atom *atom;
};
-static GDBusMethodTable cdma_sms_manager_methods[] = {
+static const GDBusMethodTable cdma_sms_manager_methods[] = {
/* TODO */
{ }
};
diff --git a/src/cdma-voicecall.c b/src/cdma-voicecall.c
index f7e3b67..3d0c55e 100644
--- a/src/cdma-voicecall.c
+++ b/src/cdma-voicecall.c
@@ -405,7 +405,7 @@ static DBusMessage *voicecall_manager_tone(DBusConnection *conn,
return NULL;
}
-static GDBusMethodTable manager_methods[] = {
+static const GDBusMethodTable manager_methods[] = {
{ "GetProperties", "", "a{sv}",
voicecall_manager_get_properties },
{ "Dial", "s", "o", voicecall_manager_dial,
diff --git a/src/ctm.c b/src/ctm.c
index 9cece8a..2ff1cca 100644
--- a/src/ctm.c
+++ b/src/ctm.c
@@ -202,7 +202,7 @@ static DBusMessage *ctm_set_property(DBusConnection *conn, DBusMessage *msg,
return __ofono_error_invalid_args(msg);
}
-static GDBusMethodTable ctm_methods[] = {
+static const GDBusMethodTable ctm_methods[] = {
{ "GetProperties", "", "a{sv}", ctm_get_properties,
G_DBUS_METHOD_FLAG_ASYNC },
{ "SetProperty", "sv", "", ctm_set_property,
diff --git a/src/gnss.c b/src/gnss.c
index f4c3311..f622ed1 100644
--- a/src/gnss.c
+++ b/src/gnss.c
@@ -232,7 +232,7 @@ static DBusMessage *gnss_send_element(DBusConnection *conn,
return NULL;
}
-static GDBusMethodTable gnss_methods[] = {
+static const GDBusMethodTable gnss_methods[] = {
{ "SendPositioningElement", "s", "",
gnss_send_element, G_DBUS_METHOD_FLAG_ASYNC },
{ "RegisterPositioningRequestAgent", "o", "",
diff --git a/src/gprs.c b/src/gprs.c
index 0d25506..887422a 100644
--- a/src/gprs.c
+++ b/src/gprs.c
@@ -1282,7 +1282,7 @@ static DBusMessage *pri_set_property(DBusConnection *conn,
return __ofono_error_invalid_args(msg);
}
-static GDBusMethodTable context_methods[] = {
+static const GDBusMethodTable context_methods[] = {
{ "GetProperties", "", "a{sv}", pri_get_properties },
{ "SetProperty", "sv", "", pri_set_property,
G_DBUS_METHOD_FLAG_ASYNC },
@@ -2062,7 +2062,7 @@ static DBusMessage *gprs_get_contexts(DBusConnection *conn,
return reply;
}
-static GDBusMethodTable manager_methods[] = {
+static const GDBusMethodTable manager_methods[] = {
{ "GetProperties", "", "a{sv}", gprs_get_properties },
{ "SetProperty", "sv", "", gprs_set_property },
{ "AddContext", "s", "o", gprs_add_context,
diff --git a/src/handsfree.c b/src/handsfree.c
index 66daaf1..2566dd8 100644
--- a/src/handsfree.c
+++ b/src/handsfree.c
@@ -270,7 +270,7 @@ static DBusMessage *handsfree_request_phone_number(DBusConnection *conn,
return NULL;
}
-static GDBusMethodTable handsfree_methods[] = {
+static const GDBusMethodTable handsfree_methods[] = {
{ "GetProperties", "", "a{sv}", handsfree_get_properties },
{ "SetProperty", "sv", "", handsfree_set_property,
G_DBUS_METHOD_FLAG_ASYNC },
diff --git a/src/location-reporting.c b/src/location-reporting.c
index 40aae66..d279814 100644
--- a/src/location-reporting.c
+++ b/src/location-reporting.c
@@ -239,7 +239,7 @@ static DBusMessage *location_reporting_release(DBusConnection *conn,
return NULL;
}
-static GDBusMethodTable location_reporting_methods[] = {
+static const GDBusMethodTable location_reporting_methods[] = {
{ "GetProperties", "", "a{sv}", location_reporting_get_properties },
{ "Request", "", "h", location_reporting_request,
G_DBUS_METHOD_FLAG_ASYNC },
diff --git a/src/manager.c b/src/manager.c
index 9614527..783ea76 100644
--- a/src/manager.c
+++ b/src/manager.c
@@ -80,7 +80,7 @@ static DBusMessage *manager_get_modems(DBusConnection *conn,
return reply;
}
-static GDBusMethodTable manager_methods[] = {
+static const GDBusMethodTable manager_methods[] = {
{ "GetModems", "", "a(oa{sv})", manager_get_modems },
{ }
};
diff --git a/src/message-waiting.c b/src/message-waiting.c
index 328e193..7bd2576 100644
--- a/src/message-waiting.c
+++ b/src/message-waiting.c
@@ -368,7 +368,7 @@ static DBusMessage *mw_set_property(DBusConnection *conn, DBusMessage *msg,
return __ofono_error_invalid_args(msg);
}
-static GDBusMethodTable message_waiting_methods[] = {
+static const GDBusMethodTable message_waiting_methods[] = {
{ "GetProperties", "", "a{sv}", mw_get_properties },
{ "SetProperty", "sv", "", mw_set_property,
G_DBUS_METHOD_FLAG_ASYNC },
diff --git a/src/message.c b/src/message.c
index 7cc6538..e0e7280 100644
--- a/src/message.c
+++ b/src/message.c
@@ -103,7 +103,7 @@ static DBusMessage *message_cancel(DBusConnection *conn,
}
}
-static GDBusMethodTable message_methods[] = {
+static const GDBusMethodTable message_methods[] = {
{ "GetProperties", "", "a{sv}", message_get_properties },
{ "Cancel", "", "", message_cancel },
{ }
diff --git a/src/modem.c b/src/modem.c
index 43d7e9e..f9fd37a 100644
--- a/src/modem.c
+++ b/src/modem.c
@@ -1123,7 +1123,7 @@ static DBusMessage *modem_set_property(DBusConnection *conn,
return __ofono_error_invalid_args(msg);
}
-static GDBusMethodTable modem_methods[] = {
+static const GDBusMethodTable modem_methods[] = {
{ "GetProperties", "", "a{sv}", modem_get_properties },
{ "SetProperty", "sv", "", modem_set_property,
G_DBUS_METHOD_FLAG_ASYNC },
diff --git a/src/network.c b/src/network.c
index b8a8cfe..68749ba 100644
--- a/src/network.c
+++ b/src/network.c
@@ -623,7 +623,7 @@ static DBusMessage *network_operator_register(DBusConnection *conn,
return NULL;
}
-static GDBusMethodTable network_operator_methods[] = {
+static const GDBusMethodTable network_operator_methods[] = {
{ "GetProperties", "", "a{sv}", network_operator_get_properties },
{ "Register", "", "", network_operator_register,
G_DBUS_METHOD_FLAG_ASYNC },
@@ -1020,7 +1020,7 @@ static DBusMessage *network_get_operators(DBusConnection *conn,
return reply;
}
-static GDBusMethodTable network_registration_methods[] = {
+static const GDBusMethodTable network_registration_methods[] = {
{ "GetProperties", "", "a{sv}", network_get_properties },
{ "Register", "", "", network_register,
G_DBUS_METHOD_FLAG_ASYNC },
diff --git a/src/phonebook.c b/src/phonebook.c
index 6baf7bb..3563cee 100644
--- a/src/phonebook.c
+++ b/src/phonebook.c
@@ -479,7 +479,7 @@ static DBusMessage *import_entries(DBusConnection *conn, DBusMessage *msg,
return NULL;
}
-static GDBusMethodTable phonebook_methods[] = {
+static const GDBusMethodTable phonebook_methods[] = {
{ "Import", "", "s", import_entries,
G_DBUS_METHOD_FLAG_ASYNC },
{ }
diff --git a/src/radio-settings.c b/src/radio-settings.c
index a8637bb..132fd4a 100644
--- a/src/radio-settings.c
+++ b/src/radio-settings.c
@@ -601,7 +601,7 @@ static DBusMessage *radio_set_property(DBusConnection *conn, DBusMessage *msg,
return __ofono_error_invalid_args(msg);
}
-static GDBusMethodTable radio_methods[] = {
+static const GDBusMethodTable radio_methods[] = {
{ "GetProperties", "", "a{sv}", radio_get_properties,
G_DBUS_METHOD_FLAG_ASYNC },
{ "SetProperty", "sv", "", radio_set_property,
diff --git a/src/sim.c b/src/sim.c
index eb25e07..b979ddd 100644
--- a/src/sim.c
+++ b/src/sim.c
@@ -1067,7 +1067,7 @@ static DBusMessage *sim_reset_pin(DBusConnection *conn, DBusMessage *msg,
return NULL;
}
-static GDBusMethodTable sim_methods[] = {
+static const GDBusMethodTable sim_methods[] = {
{ "GetProperties", "", "a{sv}", sim_get_properties },
{ "SetProperty", "sv", "", sim_set_property,
G_DBUS_METHOD_FLAG_ASYNC },
diff --git a/src/sms.c b/src/sms.c
index 26dbd89..1f64be9 100644
--- a/src/sms.c
+++ b/src/sms.c
@@ -1103,7 +1103,7 @@ int __ofono_sms_txq_cancel(struct ofono_sms *sms, const struct ofono_uuid *uuid)
return 0;
}
-static GDBusMethodTable sms_manager_methods[] = {
+static const GDBusMethodTable sms_manager_methods[] = {
{ "GetProperties", "", "a{sv}", sms_get_properties,
G_DBUS_METHOD_FLAG_ASYNC },
{ "SetProperty", "sv", "", sms_set_property,
diff --git a/src/stk.c b/src/stk.c
index e557e90..61b29bb 100644
--- a/src/stk.c
+++ b/src/stk.c
@@ -817,7 +817,7 @@ static DBusMessage *stk_select_item(DBusConnection *conn,
return NULL;
}
-static GDBusMethodTable stk_methods[] = {
+static const GDBusMethodTable stk_methods[] = {
{ "GetProperties", "", "a{sv}",stk_get_properties },
{ "SelectItem", "yo", "", stk_select_item,
G_DBUS_METHOD_FLAG_ASYNC },
diff --git a/src/ussd.c b/src/ussd.c
index d2d3621..25ef61f 100644
--- a/src/ussd.c
+++ b/src/ussd.c
@@ -728,7 +728,7 @@ static DBusMessage *ussd_get_properties(DBusConnection *conn,
return reply;
}
-static GDBusMethodTable ussd_methods[] = {
+static const GDBusMethodTable ussd_methods[] = {
{ "Initiate", "s", "sv", ussd_initiate,
G_DBUS_METHOD_FLAG_ASYNC },
{ "Respond", "s", "s", ussd_respond,
diff --git a/src/voicecall.c b/src/voicecall.c
index 104b600..73b84b9 100644
--- a/src/voicecall.c
+++ b/src/voicecall.c
@@ -667,7 +667,7 @@ static DBusMessage *voicecall_answer(DBusConnection *conn,
return NULL;
}
-static GDBusMethodTable voicecall_methods[] = {
+static const GDBusMethodTable voicecall_methods[] = {
{ "GetProperties", "", "a{sv}", voicecall_get_properties },
{ "Deflect", "s", "", voicecall_deflect,
G_DBUS_METHOD_FLAG_ASYNC },
@@ -2117,7 +2117,7 @@ static DBusMessage *manager_get_calls(DBusConnection *conn,
return reply;
}
-static GDBusMethodTable manager_methods[] = {
+static const GDBusMethodTable manager_methods[] = {
{ "GetProperties", "", "a{sv}", manager_get_properties },
{ "Dial", "ss", "o", manager_dial,
G_DBUS_METHOD_FLAG_ASYNC },
--
1.7.10.2
8 years, 6 months
[PATCH mmsd 01/12] Constify GDBus tables
by Lucas De Marchi
Constify method tables with the following commands:
find . -name '*.[ch]' -exec sed -i \
's/\(c\)\(GDBusSignalTable .* =\)/\1 const \2/g' {} \;
find . -name '*.[ch]' -exec sed -i \
's/\(c\)\(GDBusMethodTable .* =\)/\1 const \2/g' {} \;
---
plugins/ofono.c | 2 +-
src/service.c | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/plugins/ofono.c b/plugins/ofono.c
index f598c5e..29e8f06 100644
--- a/plugins/ofono.c
+++ b/plugins/ofono.c
@@ -114,7 +114,7 @@ static DBusMessage *agent_release(DBusConnection *conn,
return NULL;
}
-static GDBusMethodTable agent_methods[] = {
+static const GDBusMethodTable agent_methods[] = {
{ "ReceiveNotification", "aya{sv}", "", agent_receive },
{ "Release", "", "", agent_release,
G_DBUS_METHOD_FLAG_NOREPLY },
diff --git a/src/service.c b/src/service.c
index 6bcdede..a269556 100644
--- a/src/service.c
+++ b/src/service.c
@@ -222,13 +222,13 @@ static DBusMessage *msg_mark_read(DBusConnection *conn,
return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
}
-static GDBusMethodTable message_methods[] = {
+static const GDBusMethodTable message_methods[] = {
{ "MarkRead", "", "", msg_mark_read },
{ "Delete", "", "", msg_delete },
{ }
};
-static GDBusSignalTable message_signals[] = {
+static const GDBusSignalTable message_signals[] = {
{ "PropertyChanged", "sv" },
{ }
};
@@ -979,14 +979,14 @@ release_msg:
return __mms_error_trans_failure(dbus_msg);
}
-static GDBusMethodTable service_methods[] = {
+static const GDBusMethodTable service_methods[] = {
{ "SendMessage", "assa(sss)", "o", send_message },
{ "GetMessages", "", "a(oa{sv})", get_messages },
{ "GetConversation", "su", "a(oa{sv})", get_conversation },
{ }
};
-static GDBusSignalTable service_signals[] = {
+static const GDBusSignalTable service_signals[] = {
{ "MessageAdded", "oa{sv}" },
{ "MessageRemoved", "o" },
{ }
@@ -2342,12 +2342,12 @@ static DBusMessage *get_services(DBusConnection *conn,
return reply;
}
-static GDBusMethodTable manager_methods[] = {
+static const GDBusMethodTable manager_methods[] = {
{ "GetServices", "", "a(oa{sv})", get_services },
{ }
};
-static GDBusSignalTable manager_signals[] = {
+static const GDBusSignalTable manager_signals[] = {
{ "ServiceAdded", "oa{sv}" },
{ "ServiceRemoved", "o" },
{ }
--
1.7.10.2
8 years, 6 months
