2012-08-16 12:51:19

by Jaganath Kanakkassery

Subject: [PATCH BlueZ v1] gdbus: Fix compilation error if macro "error" is defined

The variable "signature" used in error is not defined and "args" is now
a struct instead of a string.
---
v1 -> Made a note of the removal of variable "args" in the commit message

gdbus/object.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gdbus/object.c b/gdbus/object.c
index 900e7ab..9689006 100644
--- a/gdbus/object.c
+++ b/gdbus/object.c
@@ -645,8 +645,8 @@ static dbus_bool_t emit_signal_valist(DBusConnection *conn,
goto fail;

if (g_dbus_args_have_signature(args, signal) == FALSE) {
- error("%s.%s: expected signature'%s' but got '%s'",
- interface, name, args, signature);
+ error("%s.%s: got unexpected signature '%s'", interface, name,
+ dbus_message_get_signature(signal));
ret = FALSE;
goto fail;
}
--
1.7.1

2012-08-16 19:01:24

by Johan Hedberg

Subject: Re: [PATCH BlueZ v1] gdbus: Fix compilation error if macro "error" is defined

Hi Jaganath,

On Thu, Aug 16, 2012, Jaganath Kanakkassery wrote:
> The variable "signature" used in error is not defined and "args" is now
> a struct instead of a string.
> ---
> v1 -> Made a note of the removal of variable "args" in the commit message
>
> gdbus/object.c | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)

Applied to bluez.git and obexd.git. Thanks.

Johan