| 1 |
From a66a557038c0e3d21bc4f14090efb497558a12be Mon Sep 17 00:00:00 2001 |
| 2 |
From: Lucas De Marchi <lucas.demarchi@profusion.mobi> |
| 3 |
Date: Tue, 26 Jun 2012 18:11:25 -0300 |
| 4 |
Subject: [PATCH 1/1] Fix GDBus flags after conversion to macros |
| 5 |
|
| 6 |
Commit "aa3b9016bf444b60e1b7e1804dfc323a23a93c5a Convert GDBus methods |
| 7 |
to use macro helpers" converted the previous tables to use the new |
| 8 |
macros but some flags were lost. |
| 9 |
--- |
| 10 |
attrib/client.c | 2 +- |
| 11 |
audio/control.c | 2 +- |
| 12 |
audio/headset.c | 2 +- |
| 13 |
audio/transport.c | 2 +- |
| 14 |
src/manager.c | 2 +- |
| 15 |
5 files changed, 5 insertions(+), 5 deletions(-) |
| 16 |
|
| 17 |
diff --git a/attrib/client.c b/attrib/client.c |
| 18 |
index 8d119df..b3e3abe 100644 |
| 19 |
--- a/attrib/client.c |
| 20 |
+++ b/attrib/client.c |
| 21 |
@@ -519,7 +519,7 @@ static const GDBusMethodTable char_methods[] = { |
| 22 |
{ GDBUS_METHOD("GetProperties", |
| 23 |
NULL, GDBUS_ARGS({ "properties", "a{sv}" }), |
| 24 |
get_properties) }, |
| 25 |
- { GDBUS_METHOD("SetProperty", |
| 26 |
+ { GDBUS_ASYNC_METHOD("SetProperty", |
| 27 |
GDBUS_ARGS({ "name", "s" }, { "value", "v" }), NULL, |
| 28 |
set_property) }, |
| 29 |
{ } |
| 30 |
diff --git a/audio/control.c b/audio/control.c |
| 31 |
index c5a6a58..187f838 100644 |
| 32 |
--- a/audio/control.c |
| 33 |
+++ b/audio/control.c |
| 34 |
@@ -198,7 +198,7 @@ static DBusMessage *control_get_properties(DBusConnection *conn, |
| 35 |
} |
| 36 |
|
| 37 |
static const GDBusMethodTable control_methods[] = { |
| 38 |
- { GDBUS_ASYNC_METHOD("IsConnected", |
| 39 |
+ { GDBUS_DEPRECATED_METHOD("IsConnected", |
| 40 |
NULL, GDBUS_ARGS({ "connected", "b" }), |
| 41 |
control_is_connected) }, |
| 42 |
{ GDBUS_METHOD("GetProperties", |
| 43 |
diff --git a/audio/headset.c b/audio/headset.c |
| 44 |
index 729e4dc..b9c6265 100644 |
| 45 |
--- a/audio/headset.c |
| 46 |
+++ b/audio/headset.c |
| 47 |
@@ -2094,7 +2094,7 @@ static const GDBusMethodTable headset_methods[] = { |
| 48 |
static const GDBusSignalTable headset_signals[] = { |
| 49 |
{ GDBUS_DEPRECATED_SIGNAL("Connected", NULL) }, |
| 50 |
{ GDBUS_DEPRECATED_SIGNAL("Disconnected", NULL) }, |
| 51 |
- { GDBUS_DEPRECATED_SIGNAL("AnswerRequested", NULL) }, |
| 52 |
+ { GDBUS_SIGNAL("AnswerRequested", NULL) }, |
| 53 |
{ GDBUS_DEPRECATED_SIGNAL("Stopped", NULL) }, |
| 54 |
{ GDBUS_DEPRECATED_SIGNAL("Playing", NULL) }, |
| 55 |
{ GDBUS_DEPRECATED_SIGNAL("SpeakerGainChanged", |
| 56 |
diff --git a/audio/transport.c b/audio/transport.c |
| 57 |
index b015625..832ad2a 100644 |
| 58 |
--- a/audio/transport.c |
| 59 |
+++ b/audio/transport.c |
| 60 |
@@ -959,7 +959,7 @@ static const GDBusMethodTable transport_methods[] = { |
| 61 |
{ GDBUS_ASYNC_METHOD("Release", |
| 62 |
GDBUS_ARGS({ "access_type", "s" }), NULL, |
| 63 |
release ) }, |
| 64 |
- { GDBUS_ASYNC_METHOD("SetProperty", |
| 65 |
+ { GDBUS_METHOD("SetProperty", |
| 66 |
GDBUS_ARGS({ "name", "s" }, { "value", "v" }), |
| 67 |
NULL, set_property) }, |
| 68 |
{ }, |
| 69 |
diff --git a/src/manager.c b/src/manager.c |
| 70 |
index 385354d..7061f64 100644 |
| 71 |
--- a/src/manager.c |
| 72 |
+++ b/src/manager.c |
| 73 |
@@ -207,7 +207,7 @@ static const GDBusMethodTable manager_methods[] = { |
| 74 |
GDBUS_ARGS({ "pattern", "s" }), |
| 75 |
GDBUS_ARGS({ "adapter", "o" }), |
| 76 |
find_adapter) }, |
| 77 |
- { GDBUS_ASYNC_METHOD("ListAdapters", |
| 78 |
+ { GDBUS_DEPRECATED_METHOD("ListAdapters", |
| 79 |
NULL, GDBUS_ARGS({ "adapters", "ao" }), |
| 80 |
list_adapters) }, |
| 81 |
{ } |
| 82 |
-- |
| 83 |
1.7.7.6 |
Parent Directory
| 
Revision Log