[at-spi2-core] _ATSPI_DBUS_CHECK_SIG: remove warning when no message received
- From: Mike Gorse <mgorse src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [at-spi2-core] _ATSPI_DBUS_CHECK_SIG: remove warning when no message received
- Date: Wed, 23 May 2012 19:16:16 +0000 (UTC)
commit 1dc8c769980b75adcdede5eb89289be50f4d19d1
Author: Mike Gorse <mgorse suse com>
Date: Wed May 23 14:19:26 2012 -0500
_ATSPI_DBUS_CHECK_SIG: remove warning when no message received
atspi/atspi-accessible.c | 2 +-
atspi/atspi-misc-private.h | 4 +---
2 files changed, 2 insertions(+), 4 deletions(-)
---
diff --git a/atspi/atspi-accessible.c b/atspi/atspi-accessible.c
index d19d976..3159f05 100644
--- a/atspi/atspi-accessible.c
+++ b/atspi/atspi-accessible.c
@@ -661,10 +661,10 @@ defunct_set ()
AtspiStateSet *
atspi_accessible_get_state_set (AtspiAccessible *obj)
{
+ /* TODO: Should take a GError **, but would be an API break */
if (!obj->parent.app || !obj->parent.app->bus)
return defunct_set ();
-
if (!_atspi_accessible_test_cache (obj, ATSPI_CACHE_STATES))
{
DBusMessage *reply;
diff --git a/atspi/atspi-misc-private.h b/atspi/atspi-misc-private.h
index e00df3f..f3f4d71 100644
--- a/atspi/atspi-misc-private.h
+++ b/atspi/atspi-misc-private.h
@@ -113,10 +113,8 @@ void _atspi_dbus_set_interfaces (AtspiAccessible *accessible, DBusMessageIter *i
void _atspi_dbus_set_state (AtspiAccessible *accessible, DBusMessageIter *iter);
#define _ATSPI_DBUS_CHECK_SIG(message, type, error, ret) \
- if (!message) { \
- g_warning ("at-spi: Got no message at %s line %d\n", __FILE__, __LINE__); \
+ if (!message) \
return (ret); \
- } \
if (dbus_message_get_type (message) == DBUS_MESSAGE_TYPE_ERROR) \
{ \
const char *err; \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]