From 2d0f4d4732f72ee32e9676236eea1ca3bd36bb08 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Tue, 31 May 2011 14:46:33 +0100 Subject: [PATCH 7/7] Remove support for i18n completely As far as I can tell, dbus-glib has never actually been translated into another language, or even had the necessary infrastructure so people could do that. The translated strings are all low-level errors in "programmer English" anyway, and most of them only make sense to D-Bus experts. --- configure.ac | 25 +----------------- dbus/dbus-binding-tool-glib.c | 8 +++--- dbus/dbus-glib-tool.c | 35 +++++++++---------------- dbus/dbus-gparser.c | 56 +++++++++++++++++++---------------------- dbus/dbus-gproxy.c | 8 +++--- dbus/dbus-gvalue.c | 41 ++++++++++++++--------------- 6 files changed, 68 insertions(+), 105 deletions(-) diff --git a/configure.ac b/configure.ac index eb7c4f6..944cde1 100644 --- a/configure.ac +++ b/configure.ac @@ -13,10 +13,6 @@ AM_CONFIG_HEADER(config.h) ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS" AC_CONFIG_MACRO_DIR(m4) -GETTEXT_PACKAGE=dbus-glib-1 -AC_SUBST(GETTEXT_PACKAGE) -AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[The name of the gettext domain]) - ## must come before we use the $USE_MAINTAINER_MODE variable later AM_MAINTAINER_MODE @@ -318,24 +314,6 @@ fi # unix:path=/foo or unix:abstract=/foo AC_SUBST(DBUS_PATH_OR_ABSTRACT) -#### Sort out gettext - -# this makes us require GLib to run autoconf, but not at runtime -ALL_LINGUAS="" -AM_GLIB_GNU_GETTEXT - -# INTLLIBS is now set - -# (if someone wants to go through and make internationalization -# conditional with #ifdef ENABLE_NLS then go crazy and send us a patch, -# but right now we won't build without gettext) -if test "$gt_cv_have_gettext" != "yes" ; then - AC_MSG_ERROR([ -*** You must have either have gettext support in your C library, or use the -*** GNU gettext library. (http://www.gnu.org/software/gettext/gettext.html -]) -fi - #### Sort out XML library # see what we have @@ -372,7 +350,7 @@ AC_SUBST(DBUS_GLIB_LIBS) AC_SUBST(DBUS_GLIB_THREADS_LIBS) DBUS_GLIB_TOOL_CFLAGS=$XML_CFLAGS -DBUS_GLIB_TOOL_LIBS="$XML_LIBS $INTLLIBS" +DBUS_GLIB_TOOL_LIBS="$XML_LIBS" AC_SUBST(DBUS_GLIB_TOOL_CFLAGS) AC_SUBST(DBUS_GLIB_TOOL_LIBS) @@ -535,7 +513,6 @@ echo " Building Doxygen docs: ${enable_doxygen_docs} Building Gtk-doc docs: ${enable_gtk_doc} Bash Completion: ${enable_bash_completion} - Gettext libs (empty OK): ${INTLLIBS} Using XML parser: ${with_xml} 'make check' socket dir: ${TEST_SOCKET_DIR} " diff --git a/dbus/dbus-binding-tool-glib.c b/dbus/dbus-binding-tool-glib.c index 8f1a0e5..a66c944 100644 --- a/dbus/dbus-binding-tool-glib.c +++ b/dbus/dbus-binding-tool-glib.c @@ -250,7 +250,7 @@ compute_gsignature (MethodInfo *method, GType *rettype, GArray **params, GError g_set_error (error, DBUS_BINDING_TOOL_ERROR, DBUS_BINDING_TOOL_ERROR_UNSUPPORTED_CONVERSION, - _("Unsupported conversion from D-BUS type %s to glib-genmarshal type"), + "Unsupported conversion from D-BUS type %s to glib-genmarshal type", arg_type); return FALSE; } @@ -983,7 +983,7 @@ write_formal_parameters (InterfaceInfo *iface, MethodInfo *method, GIOChannel *c g_set_error (error, DBUS_BINDING_TOOL_ERROR, DBUS_BINDING_TOOL_ERROR_UNSUPPORTED_CONVERSION, - _("Unsupported conversion from D-BUS type signature \"%s\" to glib C type in method \"%s\" of interface \"%s\""), + "Unsupported conversion from D-BUS type signature \"%s\" to glib C type in method \"%s\" of interface \"%s\"", arg_info_get_type (arg), method_info_get_name (method), interface_info_get_name (iface)); @@ -1247,7 +1247,7 @@ write_formal_declarations_for_direction (InterfaceInfo *iface, MethodInfo *metho g_set_error (error, DBUS_BINDING_TOOL_ERROR, DBUS_BINDING_TOOL_ERROR_UNSUPPORTED_CONVERSION, - _("Unsupported conversion from D-BUS type signature \"%s\" to glib C type in method \"%s\" of interface \"%s\""), + "Unsupported conversion from D-BUS type signature \"%s\" to glib C type in method \"%s\" of interface \"%s\"", arg_info_get_type (arg), method_info_get_name (method), interface_info_get_name (iface)); @@ -1341,7 +1341,7 @@ write_formal_parameters_for_direction (InterfaceInfo *iface, MethodInfo *method, g_set_error (error, DBUS_BINDING_TOOL_ERROR, DBUS_BINDING_TOOL_ERROR_UNSUPPORTED_CONVERSION, - _("Unsupported conversion from D-BUS type signature \"%s\" to glib C type in method \"%s\" of interface \"%s\""), + "Unsupported conversion from D-BUS type signature \"%s\" to glib C type in method \"%s\" of interface \"%s\"", arg_info_get_type (arg), method_info_get_name (method), interface_info_get_name (iface)); diff --git a/dbus/dbus-glib-tool.c b/dbus/dbus-glib-tool.c index 8f2019f..6235f13 100644 --- a/dbus/dbus-glib-tool.c +++ b/dbus/dbus-glib-tool.c @@ -27,10 +27,6 @@ #include "dbus-gutils.h" #include "dbus-glib-tool.h" #include "dbus-binding-tool-glib.h" -#include -#include -#define _(x) dgettext (GETTEXT_PACKAGE, x) -#define N_(x) x #include #include #include @@ -97,9 +93,9 @@ pretty_print (BaseInfo *base, NodeInfo *n = (NodeInfo*) base; if (name == NULL) - printf (_(" {\n")); + printf (" {\n"); else - printf (_("node \"%s\" {\n"), name); + printf ("node \"%s\" {\n", name); pretty_print_list (node_info_get_interfaces (n), depth + 1); pretty_print_list (node_info_get_nodes (n), depth + 1); @@ -115,7 +111,7 @@ pretty_print (BaseInfo *base, g_assert (name != NULL); - printf (_("interface \"%s\" {\n"), name); + printf ("interface \"%s\" {\n", name); annotations = interface_info_get_annotations (i); for (elt = annotations; elt; elt = elt->next) @@ -123,7 +119,7 @@ pretty_print (BaseInfo *base, const char *name = elt->data; const char *value = interface_info_get_annotation (i, name); - printf (_(" (binding \"%s\": \"%s\") "), + printf (" (binding \"%s\": \"%s\") ", name, value); } g_slist_free (annotations); @@ -144,13 +140,13 @@ pretty_print (BaseInfo *base, g_assert (name != NULL); annotations = method_info_get_annotations (m); - printf (_("method \"%s\""), name); + printf ("method \"%s\"", name); for (elt = annotations; elt; elt = elt->next) { const char *name = elt->data; const char *value = method_info_get_annotation (m, name); - printf (_(" (annotation \"%s\": \"%s\") "), + printf (" (annotation \"%s\": \"%s\") ", name, value); } g_slist_free (annotations); @@ -167,7 +163,7 @@ pretty_print (BaseInfo *base, g_assert (name != NULL); - printf (_("signal \"%s\" (\n"), name); + printf ("signal \"%s\" (\n", name); pretty_print_list (signal_info_get_args (s), depth + 1); @@ -283,11 +279,6 @@ main (int argc, char **argv) gboolean ignore_unsupported; gboolean has_prefix = FALSE; - setlocale (LC_ALL, ""); - bindtextdomain (GETTEXT_PACKAGE, DBUS_LOCALEDIR); - bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); - textdomain (GETTEXT_PACKAGE); - g_type_init (); outputmode = DBUS_BINDING_OUTPUT_NONE; @@ -390,7 +381,7 @@ main (int argc, char **argv) output_file_tmp = g_strconcat (output_file, ".tmp", NULL); if (!(channel = g_io_channel_new_file (output_file_tmp, "w", &error))) - lose_gerror (_("Couldn't open temporary file"), error); + lose_gerror ("Couldn't open temporary file", error); } else { @@ -398,7 +389,7 @@ main (int argc, char **argv) output_file_tmp = NULL; /* silence gcc */ } if (!g_io_channel_set_encoding (channel, NULL, &error)) - lose_gerror (_("Couldn't set channel encoding to NULL"), error); + lose_gerror ("Couldn't set channel encoding to NULL", error); for (tmp = files; tmp != NULL; tmp = tmp->next) @@ -414,7 +405,7 @@ main (int argc, char **argv) &error); if (node == NULL) { - lose (_("Unable to load \"%s\": %s"), filename, error->message); + lose ("Unable to load \"%s\": %s", filename, error->message); } else { @@ -425,11 +416,11 @@ main (int argc, char **argv) break; case DBUS_BINDING_OUTPUT_GLIB_SERVER: if (!dbus_binding_tool_output_glib_server ((BaseInfo *) node, channel, prefix, &error)) - lose_gerror (_("Compilation failed"), error); + lose_gerror ("Compilation failed", error); break; case DBUS_BINDING_OUTPUT_GLIB_CLIENT: if (!dbus_binding_tool_output_glib_client ((BaseInfo *) node, channel, ignore_unsupported, &error)) - lose_gerror (_("Compilation failed"), error); + lose_gerror ("Compilation failed", error); break; case DBUS_BINDING_OUTPUT_NONE: break; @@ -441,7 +432,7 @@ main (int argc, char **argv) } if (g_io_channel_shutdown (channel, TRUE, &error) != G_IO_STATUS_NORMAL) - lose_gerror (_("Failed to shutdown IO channel"), error); + lose_gerror ("Failed to shutdown IO channel", error); g_io_channel_unref (channel); if (output_file) diff --git a/dbus/dbus-gparser.c b/dbus/dbus-gparser.c index d9f8349..3b0aa52 100644 --- a/dbus/dbus-gparser.c +++ b/dbus/dbus-gparser.c @@ -30,10 +30,6 @@ #include "dbus/dbus-signature.h" #include -#include -#define _(x) gettext ((x)) -#define N_(x) x - #ifndef DOXYGEN_SHOULD_SKIP_THIS #define ELEMENT_IS(name) (strcmp (element_name, (name)) == 0) @@ -120,7 +116,7 @@ locate_attributes (const char *element_name, g_set_error (error, G_MARKUP_ERROR, G_MARKUP_ERROR_PARSE, - _("Attribute \"%s\" repeated twice on the same <%s> element"), + "Attribute \"%s\" repeated twice on the same <%s> element", attrs[j].name, element_name); retval = FALSE; goto out; @@ -141,7 +137,7 @@ locate_attributes (const char *element_name, g_set_error (error, G_MARKUP_ERROR, G_MARKUP_ERROR_PARSE, - _("Attribute \"%s\" is invalid on <%s> element in this context"), + "Attribute \"%s\" is invalid on <%s> element in this context", attribute_names[i], element_name); retval = FALSE; goto out; @@ -167,7 +163,7 @@ check_no_attributes (const char *element_name, g_set_error (error, G_MARKUP_ERROR, G_MARKUP_ERROR_PARSE, - _("Attribute \"%s\" is invalid on <%s> element in this context"), + "Attribute \"%s\" is invalid on <%s> element in this context", attribute_names[0], element_name); return FALSE; } @@ -263,7 +259,7 @@ parse_node (Parser *parser, { g_set_error (error, G_MARKUP_ERROR, G_MARKUP_ERROR_PARSE, - _("Can't put <%s> element here"), + "Can't put <%s> element here", element_name); return FALSE; } @@ -280,7 +276,7 @@ parse_node (Parser *parser, { g_set_error (error, G_MARKUP_ERROR, G_MARKUP_ERROR_PARSE, - _("\"%s\" attribute required on <%s> element "), + "\"%s\" attribute required on <%s> element ", "name", element_name); return FALSE; } @@ -290,7 +286,7 @@ parse_node (Parser *parser, { g_set_error (error, G_MARKUP_ERROR, G_MARKUP_ERROR_PARSE, - _("\"%s\" attribute on <%s> element must be an absolute object path, \"%s\" not OK"), + "\"%s\" attribute on <%s> element must be an absolute object path, \"%s\" not OK", "name", element_name, name); return FALSE; } @@ -300,7 +296,7 @@ parse_node (Parser *parser, { g_set_error (error, G_MARKUP_ERROR, G_MARKUP_ERROR_PARSE, - _("\"%s\" attribute on <%s> element must not be an absolute object path, \"%s\" starts with /"), + "\"%s\" attribute on <%s> element must not be an absolute object path, \"%s\" starts with /", "name", element_name, name); return FALSE; } @@ -340,7 +336,7 @@ parse_interface (Parser *parser, { g_set_error (error, G_MARKUP_ERROR, G_MARKUP_ERROR_PARSE, - _("Can't put <%s> element here"), + "Can't put <%s> element here", element_name); return FALSE; } @@ -356,7 +352,7 @@ parse_interface (Parser *parser, { g_set_error (error, G_MARKUP_ERROR, G_MARKUP_ERROR_PARSE, - _("\"%s\" attribute required on <%s> element "), + "\"%s\" attribute required on <%s> element ", "name", element_name); return FALSE; } @@ -392,7 +388,7 @@ parse_method (Parser *parser, { g_set_error (error, G_MARKUP_ERROR, G_MARKUP_ERROR_PARSE, - _("Can't put <%s> element here"), + "Can't put <%s> element here", element_name); return FALSE; } @@ -408,7 +404,7 @@ parse_method (Parser *parser, { g_set_error (error, G_MARKUP_ERROR, G_MARKUP_ERROR_PARSE, - _("\"%s\" attribute required on <%s> element "), + "\"%s\" attribute required on <%s> element ", "name", element_name); return FALSE; } @@ -442,7 +438,7 @@ parse_signal (Parser *parser, { g_set_error (error, G_MARKUP_ERROR, G_MARKUP_ERROR_PARSE, - _("Can't put <%s> element here"), + "Can't put <%s> element here", element_name); return FALSE; } @@ -458,7 +454,7 @@ parse_signal (Parser *parser, { g_set_error (error, G_MARKUP_ERROR, G_MARKUP_ERROR_PARSE, - _("\"%s\" attribute required on <%s> element "), + "\"%s\" attribute required on <%s> element ", "name", element_name); return FALSE; } @@ -512,7 +508,7 @@ parse_property (Parser *parser, { g_set_error (error, G_MARKUP_ERROR, G_MARKUP_ERROR_PARSE, - _("Can't put <%s> element here"), + "Can't put <%s> element here", element_name); return FALSE; } @@ -530,7 +526,7 @@ parse_property (Parser *parser, { g_set_error (error, G_MARKUP_ERROR, G_MARKUP_ERROR_PARSE, - _("\"%s\" attribute required on <%s> element "), + "\"%s\" attribute required on <%s> element ", "name", element_name); return FALSE; } @@ -539,7 +535,7 @@ parse_property (Parser *parser, { g_set_error (error, G_MARKUP_ERROR, G_MARKUP_ERROR_PARSE, - _("\"%s\" attribute required on <%s> element "), + "\"%s\" attribute required on <%s> element ", "access", element_name); return FALSE; } @@ -548,7 +544,7 @@ parse_property (Parser *parser, { g_set_error (error, G_MARKUP_ERROR, G_MARKUP_ERROR_PARSE, - _("\"%s\" attribute required on <%s> element "), + "\"%s\" attribute required on <%s> element ", "type", element_name); return FALSE; } @@ -567,7 +563,7 @@ parse_property (Parser *parser, { g_set_error (error, G_MARKUP_ERROR, G_MARKUP_ERROR_PARSE, - _("access=\"%s\" must have value readwrite, read, or write on %s\n"), + "access=\"%s\" must have value readwrite, read, or write on %s\n", access, element_name); return FALSE; } @@ -603,7 +599,7 @@ parse_arg (Parser *parser, { g_set_error (error, G_MARKUP_ERROR, G_MARKUP_ERROR_PARSE, - _("Can't put <%s> element here"), + "Can't put <%s> element here", element_name); return FALSE; } @@ -623,7 +619,7 @@ parse_arg (Parser *parser, { g_set_error (error, G_MARKUP_ERROR, G_MARKUP_ERROR_PARSE, - _("\"%s\" attribute required on <%s> element "), + "\"%s\" attribute required on <%s> element ", "type", element_name); return FALSE; } @@ -652,11 +648,11 @@ parse_arg (Parser *parser, if (parser->signal) g_set_error (error, G_MARKUP_ERROR, G_MARKUP_ERROR_PARSE, - _("Signals must have direction=\"out\" (just omit the direction attribute)")); + "Signals must have direction=\"out\" (just omit the direction attribute)"); else g_set_error (error, G_MARKUP_ERROR, G_MARKUP_ERROR_PARSE, - _("\"%s\" attribute on <%s> has value \"in\" or \"out\""), + "\"%s\" attribute on <%s> has value \"in\" or \"out\"", "direction", element_name); return FALSE; } @@ -705,7 +701,7 @@ parse_annotation (Parser *parser, { g_set_error (error, G_MARKUP_ERROR, G_MARKUP_ERROR_PARSE, - _("Can't put <%s> element here"), + "Can't put <%s> element here", element_name); return FALSE; } @@ -722,7 +718,7 @@ parse_annotation (Parser *parser, { g_set_error (error, G_MARKUP_ERROR, G_MARKUP_ERROR_PARSE, - _("\"%s\" attribute required on <%s> element "), + "\"%s\" attribute required on <%s> element ", "name", element_name); return FALSE; } @@ -730,7 +726,7 @@ parse_annotation (Parser *parser, { g_set_error (error, G_MARKUP_ERROR, G_MARKUP_ERROR_PARSE, - _("\"%s\" attribute required on <%s> element "), + "\"%s\" attribute required on <%s> element ", "value", element_name); return FALSE; } @@ -809,7 +805,7 @@ parser_start_element (Parser *parser, { g_set_error (error, G_MARKUP_ERROR, G_MARKUP_ERROR_PARSE, - _("Element <%s> not recognized"), + "Element <%s> not recognized", element_name); return FALSE; } diff --git a/dbus/dbus-gproxy.c b/dbus/dbus-gproxy.c index 11c427d..3013fd2 100644 --- a/dbus/dbus-gproxy.c +++ b/dbus/dbus-gproxy.c @@ -2390,7 +2390,7 @@ dbus_g_proxy_end_call_internal (DBusGProxy *proxy, { g_set_error (error, DBUS_GERROR, DBUS_GERROR_INVALID_ARGS, - _("Too few arguments in reply")); + "Too few arguments in reply"); goto out; } @@ -2409,7 +2409,7 @@ dbus_g_proxy_end_call_internal (DBusGProxy *proxy, g_set_error (error, DBUS_GERROR, DBUS_GERROR_INVALID_ARGS, - _("Couldn't convert argument, expected \"%s\""), + "Couldn't convert argument, expected \"%s\"", g_type_name (valtype)); goto out; } @@ -2443,7 +2443,7 @@ dbus_g_proxy_end_call_internal (DBusGProxy *proxy, { g_set_error (error, DBUS_GERROR, DBUS_GERROR_INVALID_ARGS, - _("Too many arguments in reply; expected %d, got %d"), + "Too many arguments in reply; expected %d, got %d", n_retvals_processed, over); goto out; } @@ -2711,7 +2711,7 @@ dbus_g_proxy_call (DBusGProxy *proxy, { g_set_error (error, DBUS_GERROR, DBUS_GERROR_FAILED, - _("Disconnection or out-of-memory")); + "Disconnection or out-of-memory"); ret = FALSE; } diff --git a/dbus/dbus-gvalue.c b/dbus/dbus-gvalue.c index e154da4..e3e6587 100644 --- a/dbus/dbus-gvalue.c +++ b/dbus/dbus-gvalue.c @@ -31,7 +31,6 @@ #include "dbus/dbus-glib.h" #include #include -#include #include "dbus/dbus-signature.h" /* Seems reasonable, but this should probably be part of the standard protocol */ @@ -628,7 +627,7 @@ demarshal_basic (DBusGValueMarshalCtx *context, g_set_error (error, DBUS_GERROR, DBUS_GERROR_INVALID_ARGS, - _("Expected type %s, got type code \'%c\'"), + "Expected type %s, got type code \'%c\'", g_type_name (G_VALUE_TYPE (value)), (guchar) current_type); return FALSE; @@ -695,7 +694,7 @@ demarshal_proxy (DBusGValueMarshalCtx *context, g_set_error (error, DBUS_GERROR, DBUS_GERROR_INVALID_ARGS, - _("Expected D-BUS object path, got type code \'%c\'"), (guchar) current_type); + "Expected D-BUS object path, got type code \'%c\'", (guchar) current_type); return FALSE; } @@ -724,7 +723,7 @@ demarshal_object_path (DBusGValueMarshalCtx *context, g_set_error (error, DBUS_GERROR, DBUS_GERROR_INVALID_ARGS, - _("Expected D-BUS object path, got type code \'%c\'"), (guchar) current_type); + "Expected D-BUS object path, got type code \'%c\'", (guchar) current_type); return FALSE; } @@ -751,7 +750,7 @@ demarshal_object (DBusGValueMarshalCtx *context, g_set_error (error, DBUS_GERROR, DBUS_GERROR_INVALID_ARGS, - _("Expected D-BUS object path, got type code \'%c\'"), (guchar) current_type); + "Expected D-BUS object path, got type code \'%c\'", (guchar) current_type); return FALSE; } g_assert (context->proxy == NULL); @@ -764,7 +763,7 @@ demarshal_object (DBusGValueMarshalCtx *context, g_set_error (error, DBUS_GERROR, DBUS_GERROR_INVALID_ARGS, - _("Unregistered object at path '%s'"), + "Unregistered object at path '%s'", objpath); return FALSE; } @@ -788,7 +787,7 @@ demarshal_signature (DBusGValueMarshalCtx *context, g_set_error (error, DBUS_GERROR, DBUS_GERROR_INVALID_ARGS, - _("Expected D-BUS signature, got type code \'%c\'"), (guchar) current_type); + "Expected D-BUS signature, got type code \'%c\'", (guchar) current_type); return FALSE; } @@ -815,7 +814,7 @@ demarshal_strv (DBusGValueMarshalCtx *context, g_set_error (error, DBUS_GERROR, DBUS_GERROR_INVALID_ARGS, - _("Expected D-BUS array, got type code \'%c\'"), (guchar) current_type); + "Expected D-BUS array, got type code \'%c\'", (guchar) current_type); return FALSE; } @@ -828,7 +827,7 @@ demarshal_strv (DBusGValueMarshalCtx *context, g_set_error (error, DBUS_GERROR, DBUS_GERROR_INVALID_ARGS, - _("Expected D-BUS string, got type code \'%c\'"), (guchar) current_type); + "Expected D-BUS string, got type code \'%c\'", (guchar) current_type); return FALSE; } @@ -869,7 +868,7 @@ demarshal_valuearray (DBusGValueMarshalCtx *context, g_set_error (error, DBUS_GERROR, DBUS_GERROR_INVALID_ARGS, - _("Expected D-BUS struct, got type code \'%c\'"), (guchar) current_type); + "Expected D-BUS struct, got type code \'%c\'", (guchar) current_type); return FALSE; } @@ -895,7 +894,7 @@ demarshal_valuearray (DBusGValueMarshalCtx *context, g_set_error (error, DBUS_GERROR, DBUS_GERROR_INVALID_ARGS, - _("Couldn't demarshal argument with signature \"%s\""), current_sig); + "Couldn't demarshal argument with signature \"%s\"", current_sig); dbus_free (current_sig); return FALSE; } @@ -937,7 +936,7 @@ demarshal_map (DBusGValueMarshalCtx *context, g_set_error (error, DBUS_GERROR, DBUS_GERROR_INVALID_ARGS, - _("Expected D-BUS array, got type code \'%c\'"), (guchar) current_type); + "Expected D-BUS array, got type code \'%c\'", (guchar) current_type); return FALSE; } @@ -952,7 +951,7 @@ demarshal_map (DBusGValueMarshalCtx *context, g_set_error (error, DBUS_GERROR, DBUS_GERROR_INVALID_ARGS, - _("Expected D-BUS dict entry, got type code \'%c\'"), (guchar) current_type); + "Expected D-BUS dict entry, got type code \'%c\'", (guchar) current_type); return FALSE; } @@ -1018,7 +1017,7 @@ demarshal_struct (DBusGValueMarshalCtx *context, g_set_error (error, DBUS_GERROR, DBUS_GERROR_INVALID_ARGS, - _("Expected D-BUS struct, got type code \'%c\'"), (guchar) current_type); + "Expected D-BUS struct, got type code \'%c\'", (guchar) current_type); return FALSE; } @@ -1039,8 +1038,8 @@ demarshal_struct (DBusGValueMarshalCtx *context, g_set_error (error, DBUS_GERROR, DBUS_GERROR_INVALID_ARGS, - _("Couldn't demarshal argument, " - "struct type %s has no member %d"), + "Couldn't demarshal argument, " + "struct type %s has no member %d", g_type_name (G_VALUE_TYPE(value)), i); return FALSE; } @@ -1133,7 +1132,7 @@ demarshal_collection_ptrarray (DBusGValueMarshalCtx *context, g_set_error (error, DBUS_GERROR, DBUS_GERROR_INVALID_ARGS, - _("Expected D-BUS array, got type code \'%c\'"), (guchar) current_type); + "Expected D-BUS array, got type code \'%c\'", (guchar) current_type); return FALSE; } @@ -1149,7 +1148,7 @@ demarshal_collection_ptrarray (DBusGValueMarshalCtx *context, g_set_error (error, DBUS_GERROR, DBUS_GERROR_INVALID_ARGS, - _("No demarshaller registered for type \"%s\" of collection \"%s\""), + "No demarshaller registered for type \"%s\" of collection \"%s\"", g_type_name (coltype), g_type_name (subtype)); return FALSE; @@ -1246,7 +1245,7 @@ _dbus_gvalue_demarshal (DBusGValueMarshalCtx *context, g_set_error (error, DBUS_GERROR, DBUS_GERROR_INVALID_ARGS, - _("No demarshaller registered for type \"%s\""), + "No demarshaller registered for type \"%s\"", g_type_name (gtype)); goto out; @@ -1292,7 +1291,7 @@ _dbus_gvalue_demarshal_message (DBusGValueMarshalCtx *context, { g_set_error (error, DBUS_GERROR, DBUS_GERROR_INVALID_ARGS, - _("Too many arguments in message")); + "Too many arguments in message"); goto lose; } @@ -1311,7 +1310,7 @@ _dbus_gvalue_demarshal_message (DBusGValueMarshalCtx *context, { g_set_error (error, DBUS_GERROR, DBUS_GERROR_INVALID_ARGS, - _("Too few arguments in message")); + "Too few arguments in message"); goto lose; } -- 1.7.5.3