From: Mike Gorse Date: Thu, 5 May 2011 21:57:25 +0000 (-0500) Subject: Don't translate g_warning messages X-Git-Tag: AT_SPI2_CORE_2_1_1~4 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=025bcc69f7fcede5f04194deae9b0c8f6a55b8ca;p=platform%2Fupstream%2Fat-spi2-core.git Don't translate g_warning messages The consensus seems to be that messages written out as a result of calls to g_warning/g_log should ot be translated; ie: http://mail.gnome.org/archives/desktop-devel-list/2011-March/msg00070.html So removing translations from these calls. --- diff --git a/atspi/atspi-accessible.c b/atspi/atspi-accessible.c index c78af49..dfeed59 100644 --- a/atspi/atspi-accessible.c +++ b/atspi/atspi-accessible.c @@ -1032,7 +1032,7 @@ atspi_accessible_is_streamable_content (AtspiAccessible *obj) return _atspi_accessible_is_a (obj, atspi_interface_streamable_content); #else - g_warning (_("Streamable content not implemented")); + g_warning ("Streamable content not implemented"); return FALSE; #endif } diff --git a/atspi/atspi-event-listener.c b/atspi/atspi-event-listener.c index bbeb176..e5a56c7 100644 --- a/atspi/atspi-event-listener.c +++ b/atspi/atspi-event-listener.c @@ -507,7 +507,7 @@ atspi_event_listener_register_from_callback (AtspiEventListenerCB callback, if (!event_type) { - g_warning (_("called atspi_event_listener_register_from_callback with a NULL event_type")); + g_warning ("called atspi_event_listener_register_from_callback with a NULL event_type"); return FALSE; } @@ -774,7 +774,7 @@ atspi_dbus_handle_event (DBusConnection *bus, DBusMessage *message, void *data) if (strcmp (signature, "siiv(so)") != 0) { - g_warning (_("Got invalid signature %s for signal %s from interface %s\n"), signature, member, category); + g_warning ("Got invalid signature %s for signal %s from interface %s\n", signature, member, category); return DBUS_HANDLER_RESULT_HANDLED; } diff --git a/atspi/atspi-misc-private.h b/atspi/atspi-misc-private.h index 80653ed..7540f66 100644 --- a/atspi/atspi-misc-private.h +++ b/atspi/atspi-misc-private.h @@ -28,6 +28,8 @@ /* Private internal implementation details of at-spi. */ +#include + #include "atspi.h" #include "dbus/dbus.h" diff --git a/atspi/atspi-misc.c b/atspi/atspi-misc.c index 886f92c..d0ded39 100644 --- a/atspi/atspi-misc.c +++ b/atspi/atspi-misc.c @@ -290,7 +290,7 @@ handle_remove_accessible (DBusConnection *bus, DBusMessage *message, void *user_ if (strcmp (signature, "(so)") != 0) { - g_warning (_("AT-SPI: Unknown signature %s for RemoveAccessible"), signature); + g_warning ("AT-SPI: Unknown signature %s for RemoveAccessible", signature); return DBUS_HANDLER_RESULT_HANDLED; } @@ -327,7 +327,7 @@ add_app_to_desktop (AtspiAccessible *a, const char *bus_name) } else { - g_warning (_("AT-SPI: Error calling getRoot for %s: %s"), bus_name, error.message); + g_warning ("AT-SPI: Error calling getRoot for %s: %s", bus_name, error.message); } return FALSE; } @@ -485,7 +485,7 @@ handle_get_items (DBusPendingCall *pending, void *user_data) const char *error = NULL; dbus_message_get_args (reply, NULL, DBUS_TYPE_STRING, &error, DBUS_TYPE_INVALID); - g_warning (_("AT-SPI: Error in GetItems, sender=%s, error=%s"), sender, error); + g_warning ("AT-SPI: Error in GetItems, sender=%s, error=%s", sender, error); dbus_message_unref (reply); dbus_pending_call_unref (pending); return; @@ -587,7 +587,7 @@ _atspi_dbus_return_accessible_from_message (DBusMessage *message) } else { - g_warning (_("AT-SPI: Called _atspi_dbus_return_accessible_from_message with strange signature %s"), signature); + g_warning ("AT-SPI: Called _atspi_dbus_return_accessible_from_message with strange signature %s", signature); } dbus_message_unref (message); return retval; @@ -616,7 +616,7 @@ _atspi_dbus_return_hyperlink_from_message (DBusMessage *message) } else { - g_warning (_("AT-SPI: Called _atspi_dbus_return_hyperlink_from_message with strange signature %s"), signature); + g_warning ("AT-SPI: Called _atspi_dbus_return_hyperlink_from_message with strange signature %s", signature); } dbus_message_unref (message); return retval; @@ -641,7 +641,7 @@ handle_add_accessible (DBusConnection *bus, DBusMessage *message, void *user_dat if (strcmp (dbus_message_get_signature (message), cache_signal_type) != 0) { - g_warning (_("AT-SPI: AddAccessible with unknown signature %s\n"), + g_warning ("AT-SPI: AddAccessible with unknown signature %s\n", dbus_message_get_signature (message)); return DBUS_HANDLER_RESULT_HANDLED; } @@ -1062,13 +1062,13 @@ _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 ("AT-SPI: 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); if (dbus_message_iter_get_arg_type (&iter_variant) != type[0]) { - g_warning (_("atspi_dbus_get_property: Wrong type: expected %s, got %c\n"), type, dbus_message_iter_get_arg_type (&iter_variant)); + g_warning ("atspi_dbus_get_property: Wrong type: expected %s, got %c\n", type, dbus_message_iter_get_arg_type (&iter_variant)); goto done; } if (!strcmp (type, "(so)")) @@ -1211,7 +1211,7 @@ _atspi_dbus_set_interfaces (AtspiAccessible *accessible, DBusMessageIter *iter) n = _atspi_get_iface_num (iface); if (n == -1) { - g_warning (_("AT-SPI: Unknown interface %s"), iface); + g_warning ("AT-SPI: Unknown interface %s", iface); } else accessible->interfaces |= (1 << n); @@ -1231,7 +1231,7 @@ _atspi_dbus_set_state (AtspiAccessible *accessible, DBusMessageIter *iter) dbus_message_iter_get_fixed_array (&iter_array, &states, &count); if (count != 2) { - g_warning (_("AT-SPI: expected 2 values in states array; got %d\n"), count); + g_warning ("AT-SPI: expected 2 values in states array; got %d\n", count); if (!accessible->states) accessible->states = _atspi_state_set_new_internal (accessible, 0); }