[at-spi2-core: 1/2] atspi: Update error logs
- From: Mike Gorse <mgorse src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [at-spi2-core: 1/2] atspi: Update error logs
- Date: Tue, 13 Nov 2018 01:44:11 +0000 (UTC)
commit 2366c9e9dfb086d7d18687858bcf6e4fac7244d6
Author: Tapasweni Pathak <tapaswenipathak gmail com>
Date: Thu Oct 4 09:16:55 2018 +0530
atspi: Update error logs
Error logs has different naming convention in atspi/ files.
atspi/atspi-collection.c | 4 ++--
atspi/atspi-device-listener.c | 6 +++---
atspi/atspi-event-listener.c | 6 +++---
atspi/atspi-matchrule.c | 2 +-
atspi/atspi-misc-private.h | 2 +-
atspi/atspi-misc.c | 8 ++++----
6 files changed, 14 insertions(+), 14 deletions(-)
---
diff --git a/atspi/atspi-collection.c b/atspi/atspi-collection.c
index f4e33ef..d3f27da 100644
--- a/atspi/atspi-collection.c
+++ b/atspi/atspi-collection.c
@@ -36,7 +36,7 @@ atspi_collection_is_ancestor_of (AtspiCollection *collection,
AtspiAccessible *test,
GError **error)
{
- g_warning ("Atspi: TODO: Implement is_ancestor_of");
+ g_warning ("AT-SPI: TODO: Implement is_ancestor_of");
return FALSE;
}
@@ -267,7 +267,7 @@ atspi_collection_get_matches_from (AtspiCollection *collection,
AtspiAccessible *
atspi_collection_get_active_descendant (AtspiCollection *collection, GError **error)
{
- g_warning ("atspi: TODO: Implement get_active_descendants");
+ g_warning ("AT-SPI: TODO: Implement get_active_descendants");
return NULL;
}
diff --git a/atspi/atspi-device-listener.c b/atspi/atspi-device-listener.c
index 5aac60a..56597f7 100644
--- a/atspi/atspi-device-listener.c
+++ b/atspi/atspi-device-listener.c
@@ -351,13 +351,13 @@ _atspi_dbus_handle_DeviceEvent (DBusConnection *bus, DBusMessage *message, void
if (strcmp (dbus_message_get_signature (message), "(uiuuisb)") != 0)
{
- g_warning ("Atspi: Unknown signature for an event");
+ g_warning ("AT-SPI: Unknown signature for an event");
goto done;
}
if (sscanf (path, "/org/a11y/atspi/listeners/%d", &id) != 1)
{
- g_warning ("Atspi: Bad listener path: %s\n", path);
+ g_warning ("AT-SPI: Bad listener path: %s\n", path);
goto done;
}
@@ -379,7 +379,7 @@ _atspi_dbus_handle_DeviceEvent (DBusConnection *bus, DBusMessage *message, void
retval = (*klass->device_event) (listener, &event);
if (retval != 0 && retval != 1)
{
- g_warning ("at-spi: device event handler returned %d; should be 0 or 1", retval);
+ g_warning ("AT-SPI: device event handler returned %d; should be 0 or 1", retval);
retval = 0;
}
}
diff --git a/atspi/atspi-event-listener.c b/atspi/atspi-event-listener.c
index 752547d..6a3fe6b 100644
--- a/atspi/atspi-event-listener.c
+++ b/atspi/atspi-event-listener.c
@@ -101,7 +101,7 @@ callback_unref (gpointer callback)
info = g_hash_table_lookup (callbacks, callback);
if (!info)
{
- g_warning ("Atspi: Dereferencing invalid callback %p\n", callback);
+ g_warning ("AT-SPI: Dereferencing invalid callback %p\n", callback);
return;
}
info->ref_count--;
@@ -679,7 +679,7 @@ atspi_event_listener_register_from_callback_full (AtspiEventListenerCB callback,
dbus_bus_add_match (_atspi_bus(), matchrule, &d_error);
if (dbus_error_is_set (&d_error))
{
- g_warning ("Atspi: Adding match: %s", d_error.message);
+ g_warning ("AT-SPI: Adding match: %s", d_error.message);
dbus_error_free (&d_error);
/* TODO: Set error */
}
@@ -916,7 +916,7 @@ _atspi_send_event (AtspiEvent *e)
if (!convert_event_type_to_dbus (e->type, &category, &name, &detail, NULL))
{
- g_warning ("Atspi: Couldn't parse event: %s\n", e->type);
+ g_warning ("AT-SPI: Couldn't parse event: %s\n", e->type);
return;
}
for (l = event_listeners; l; l = g_list_next (l))
diff --git a/atspi/atspi-matchrule.c b/atspi/atspi-matchrule.c
index e995459..cf6a306 100644
--- a/atspi/atspi-matchrule.c
+++ b/atspi/atspi-matchrule.c
@@ -164,7 +164,7 @@ atspi_match_rule_new (AtspiStateSet *states,
if (role < 128)
rule->roles [role / 32] |= (1 << (role % 32));
else
- g_warning ("Atspi: unexpected role %d\n", role);
+ g_warning ("AT-SPI: unexpected role %d\n", role);
}
}
else
diff --git a/atspi/atspi-misc-private.h b/atspi/atspi-misc-private.h
index fe5ca56..314746e 100644
--- a/atspi/atspi-misc-private.h
+++ b/atspi/atspi-misc-private.h
@@ -125,7 +125,7 @@ void _atspi_dbus_set_state (AtspiAccessible *accessible, DBusMessageIter *iter);
} \
if (strcmp (dbus_message_get_signature (message), type) != 0) \
{ \
- g_warning ("at-spi: Expected message signature %s but got %s at %s line %d", type,
dbus_message_get_signature (message), __FILE__, __LINE__); \
+ g_warning ("AT-SPI: Expected message signature %s but got %s at %s line %d", type,
dbus_message_get_signature (message), __FILE__, __LINE__); \
dbus_message_unref (message); \
return (ret); \
}
diff --git a/atspi/atspi-misc.c b/atspi/atspi-misc.c
index eebbed4..9b97b18 100644
--- a/atspi/atspi-misc.c
+++ b/atspi/atspi-misc.c
@@ -203,7 +203,7 @@ handle_get_bus_address (DBusPendingCall *pending, void *user_data)
else
{
if (!strcmp (error.name, DBUS_ERROR_FILE_NOT_FOUND))
- g_warning ("Unable to open bus connection: %s", error.message);
+ g_warning ("AT-SPI: Unable to open bus connection: %s", error.message);
dbus_error_free (&error);
}
}
@@ -1258,7 +1258,7 @@ _atspi_dbus_get_property (gpointer obj, const char *interface, const char *name,
dbus_message_iter_init (reply, &iter);
if (dbus_message_iter_get_arg_type (&iter) != 'v')
{
- g_warning ("AT-SPI: expected a variant when fetching %s from interface %s; got %s\n", name, interface,
dbus_message_get_signature (reply));
+ g_warning ("atspi_dbus_get_property: expected a variant when fetching %s from interface %s; got %s\n",
name, interface, dbus_message_get_signature (reply));
goto done;
}
dbus_message_iter_recurse (&iter, &iter_variant);
@@ -1530,7 +1530,7 @@ get_accessibility_bus_address_dbus (void)
if (!reply)
{
- g_warning ("Error retrieving accessibility bus address: %s: %s",
+ g_warning ("AT-SPI: Error retrieving accessibility bus address: %s: %s",
error.name, error.message);
dbus_error_free (&error);
goto out;
@@ -1584,7 +1584,7 @@ atspi_get_a11y_bus (void)
if (a11y_dbus_slot == -1)
if (!dbus_connection_allocate_data_slot (&a11y_dbus_slot))
- g_warning ("at-spi: Unable to allocate D-Bus slot");
+ g_warning ("AT-SPI: Unable to allocate D-Bus slot");
address_env = g_getenv ("AT_SPI_BUS_ADDRESS");
if (address_env != NULL && *address_env != 0)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]