summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gorse <mgorse@suse.com>2012-05-23 14:19:26 -0500
committerMike Gorse <mgorse@suse.com>2012-05-23 14:19:26 -0500
commit1dc8c769980b75adcdede5eb89289be50f4d19d1 (patch)
treeffae61d3c3d4bd0800d97a09f3c717c0c700f78a
parent6581952c14635348bb610af161e3acb61be5e698 (diff)
downloadat-spi2-core-1dc8c769980b75adcdede5eb89289be50f4d19d1.tar.gz
_ATSPI_DBUS_CHECK_SIG: remove warning when no message received
-rw-r--r--atspi/atspi-accessible.c2
-rw-r--r--atspi/atspi-misc-private.h4
2 files changed, 2 insertions, 4 deletions
diff --git a/atspi/atspi-accessible.c b/atspi/atspi-accessible.c
index d19d976d..3159f050 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 e00df3f2..f3f4d71b 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; \