luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-02 07:23:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use 'dumb quotes' rather than `really dumb quotes'

Browse Source 
Back in the far-off twentieth century, it was normal on unix
workstations for U+0060 GRAVE ACCENT to be drawn as "‛" and for U+0027
APOSTROPHE to be drawn as "’". This led to the convention of using
them as poor-man's ‛smart quotes’ in ASCII-only text.

However, "'" is now universally drawn as a vertical line, and "`" at a
45-degree angle, making them an `odd couple' when used together.

Unfortunately, there are lots of very old strings in glib, and also
lots of new strings in which people have kept up the old tradition,
perhaps entirely unaware that it used to not look stupid.

Fix this by just using 'dumb quotes' everywhere.

https://bugzilla.gnome.org/show_bug.cgi?id=700746
This commit is contained in:
Dan Winship
2013-05-20 17:54:48 -03:00
parent 52f6a7d162
commit 4b94c0831e
57 changed files with 488 additions and 488 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gio/gapplicationimpl-dbus.c
View File

@@ -476,7 +476,7 @@ g_application_impl_register (GApplication *application,
if (flags & G_APPLICATION_IS_SERVICE)
{
g_set_error (error, G_DBUS_ERROR, G_DBUS_ERROR_FAILED,
"Unable to acquire bus name `%s'", appid);
"Unable to acquire bus name '%s'", appid);
g_application_impl_destroy (impl);
return NULL;

2
gio/gdbus-2.0/codegen/codegen.py
View File

@@ -1626,7 +1626,7 @@ class CodeGenerator:
' error = NULL;\n'
' if (!g_dbus_proxy_call_finish (proxy, res, &error))\n'
' {\n'
' g_warning ("Error setting property `%%s\' on interface %s: %%s (%%s, %%d)",\n'
' g_warning ("Error setting property \'%%s\' on interface %s: %%s (%%s, %%d)",\n'
' info->parent_struct.name, \n'
' error->message, g_quark_to_string (error->domain), error->code);\n'
' g_error_free (error);\n'

24
gio/gdbus-tool.c
View File

@@ -225,7 +225,7 @@ print_paths (GDBusConnection *c,
}
g_variant_get (result, "(&s)", &xml_data);
//g_printerr ("xml=`%s'", xml_data);
//g_printerr ("xml='%s'", xml_data);
error = NULL;
node = g_dbus_node_info_new_for_xml (xml_data, &error);
@@ -237,7 +237,7 @@ print_paths (GDBusConnection *c,
goto out;
}
//g_printerr ("bar `%s'\n", path);
//g_printerr ("bar '%s'\n", path);
if (node->interfaces != NULL)
g_print ("%s \n", path);
@@ -246,7 +246,7 @@ print_paths (GDBusConnection *c,
{
gchar *s;
//g_printerr ("foo `%s'\n", node->nodes[n].path);
//g_printerr ("foo '%s'\n", node->nodes[n].path);
if (g_strcmp0 (path, "/") == 0)
s = g_strdup_printf ("/%s", node->nodes[n]->path);
@@ -464,7 +464,7 @@ call_helper_get_method_in_signature (GDBusConnection *c,
if (interface_info == NULL)
{
g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
_("Warning: According to introspection data, interface `%s' does not exist\n"),
_("Warning: According to introspection data, interface '%s' does not exist\n"),
interface_name);
goto out;
}
@@ -473,7 +473,7 @@ call_helper_get_method_in_signature (GDBusConnection *c,
if (method_info == NULL)
{
g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
_("Warning: According to introspection data, method `%s' does not exist on interface `%s'\n"),
_("Warning: According to introspection data, method '%s' does not exist on interface '%s'\n"),
method_name,
interface_name);
goto out;
@@ -916,7 +916,7 @@ handle_call (gint *argc,
s = strrchr (opt_call_method, '.');
if (!request_completion && s == NULL)
{
g_printerr (_("Error: Method name `%s' is invalid\n"), opt_call_method);
g_printerr (_("Error: Method name '%s' is invalid\n"), opt_call_method);
goto out;
}
method_name = g_strdup (s + 1);
@@ -981,7 +981,7 @@ handle_call (gint *argc,
if (type != NULL)
{
s = g_variant_type_dup_string (type);
g_printerr (_("Error parsing parameter %d of type `%s': %s\n"),
g_printerr (_("Error parsing parameter %d of type '%s': %s\n"),
n,
s,
error->message);
@@ -1030,7 +1030,7 @@ handle_call (gint *argc,
g_variant_type_peek_string (type),
g_variant_type_get_string_length (type));
}
g_printerr ("(According to introspection data, you need to pass `%s')\n", s->str);
g_printerr ("(According to introspection data, you need to pass '%s')\n", s->str);
g_string_free (s, TRUE);
}
goto out;
@@ -2039,7 +2039,7 @@ main (gint argc, gchar *argv[])
completion_debug ("completion_point=%d", completion_point);
completion_debug ("----");
completion_debug (" 0123456789012345678901234567890123456789012345678901234567890123456789");
completion_debug ("`%s'", completion_line);
completion_debug ("'%s'", completion_line);
completion_debug (" %*s^",
completion_point, "");
completion_debug ("----");
@@ -2073,8 +2073,8 @@ main (gint argc, gchar *argv[])
}
}
#if 0
completion_debug (" cur=`%s'", completion_cur);
completion_debug ("prev=`%s'", completion_prev);
completion_debug (" cur='%s'", completion_cur);
completion_debug ("prev='%s'", completion_prev);
#endif
argc = completion_argc;
@@ -2094,7 +2094,7 @@ main (gint argc, gchar *argv[])
}
else
{
g_printerr ("Unknown command `%s'\n", command);
g_printerr ("Unknown command '%s'\n", command);
usage (&argc, &argv, FALSE);
goto out;
}

60
gio/gdbusaddress.c
View File

@@ -147,7 +147,7 @@ is_valid_unix (const gchar *address_entry,
g_set_error (error,
G_IO_ERROR,
G_IO_ERROR_INVALID_ARGUMENT,
_("Unsupported key `%s' in address entry `%s'"),
_("Unsupported key '%s' in address entry '%s'"),
key,
address_entry);
goto out;
@@ -174,7 +174,7 @@ is_valid_unix (const gchar *address_entry,
g_set_error (error,
G_IO_ERROR,
G_IO_ERROR_INVALID_ARGUMENT,
_("Address `%s' is invalid (need exactly one of path, tmpdir or abstract keys)"),
_("Address '%s' is invalid (need exactly one of path, tmpdir or abstract keys)"),
address_entry);
goto out;
}
@@ -187,7 +187,7 @@ is_valid_unix (const gchar *address_entry,
g_set_error (error,
G_IO_ERROR,
G_IO_ERROR_INVALID_ARGUMENT,
_("Meaningless key/value pair combination in address entry `%s'"),
_("Meaningless key/value pair combination in address entry '%s'"),
address_entry);
out:
@@ -235,7 +235,7 @@ is_valid_nonce_tcp (const gchar *address_entry,
g_set_error (error,
G_IO_ERROR,
G_IO_ERROR_INVALID_ARGUMENT,
_("Unsupported key `%s' in address entry `%s'"),
_("Unsupported key '%s' in address entry '%s'"),
key,
address_entry);
goto out;
@@ -250,7 +250,7 @@ is_valid_nonce_tcp (const gchar *address_entry,
g_set_error (error,
G_IO_ERROR,
G_IO_ERROR_INVALID_ARGUMENT,
_("Error in address `%s' - the port attribute is malformed"),
_("Error in address '%s' - the port attribute is malformed"),
address_entry);
goto out;
}
@@ -261,7 +261,7 @@ is_valid_nonce_tcp (const gchar *address_entry,
g_set_error (error,
G_IO_ERROR,
G_IO_ERROR_INVALID_ARGUMENT,
_("Error in address `%s' - the family attribute is malformed"),
_("Error in address '%s' - the family attribute is malformed"),
address_entry);
goto out;
}
@@ -316,7 +316,7 @@ is_valid_tcp (const gchar *address_entry,
g_set_error (error,
G_IO_ERROR,
G_IO_ERROR_INVALID_ARGUMENT,
_("Unsupported key `%s' in address entry `%s'"),
_("Unsupported key '%s' in address entry '%s'"),
key,
address_entry);
goto out;
@@ -331,7 +331,7 @@ is_valid_tcp (const gchar *address_entry,
g_set_error (error,
G_IO_ERROR,
G_IO_ERROR_INVALID_ARGUMENT,
_("Error in address `%s' - the port attribute is malformed"),
_("Error in address '%s' - the port attribute is malformed"),
address_entry);
goto out;
}
@@ -342,7 +342,7 @@ is_valid_tcp (const gchar *address_entry,
g_set_error (error,
G_IO_ERROR,
G_IO_ERROR_INVALID_ARGUMENT,
_("Error in address `%s' - the family attribute is malformed"),
_("Error in address '%s' - the family attribute is malformed"),
address_entry);
goto out;
}
@@ -451,7 +451,7 @@ _g_dbus_address_parse_entry (const gchar *address_entry,
g_set_error (error,
G_IO_ERROR,
G_IO_ERROR_INVALID_ARGUMENT,
_("Address element `%s' does not contain a colon (:)"),
_("Address element '%s' does not contain a colon (:)"),
address_entry);
goto out;
}
@@ -472,7 +472,7 @@ _g_dbus_address_parse_entry (const gchar *address_entry,
g_set_error (error,
G_IO_ERROR,
G_IO_ERROR_INVALID_ARGUMENT,
_("Key/Value pair %d, `%s', in address element `%s' does not contain an equal sign"),
_("Key/Value pair %d, '%s', in address element '%s' does not contain an equal sign"),
n,
kv_pair,
address_entry);
@@ -486,7 +486,7 @@ _g_dbus_address_parse_entry (const gchar *address_entry,
g_set_error (error,
G_IO_ERROR,
G_IO_ERROR_INVALID_ARGUMENT,
_("Error unescaping key or value in Key/Value pair %d, `%s', in address element `%s'"),
_("Error unescaping key or value in Key/Value pair %d, '%s', in address element '%s'"),
n,
kv_pair,
address_entry);
@@ -564,8 +564,8 @@ g_dbus_address_connect (const gchar *address_entry,
g_set_error (error,
G_IO_ERROR,
G_IO_ERROR_INVALID_ARGUMENT,
_("Error in address `%s' - the unix transport requires exactly one of the "
"keys `path' or `abstract' to be set"),
_("Error in address '%s' - the unix transport requires exactly one of the "
"keys 'path' or 'abstract' to be set"),
address_entry);
}
else if (path != NULL)
@@ -600,7 +600,7 @@ g_dbus_address_connect (const gchar *address_entry,
g_set_error (error,
G_IO_ERROR,
G_IO_ERROR_INVALID_ARGUMENT,
_("Error in address `%s' - the host attribute is missing or malformed"),
_("Error in address '%s' - the host attribute is missing or malformed"),
address_entry);
goto out;
}
@@ -614,7 +614,7 @@ g_dbus_address_connect (const gchar *address_entry,
g_set_error (error,
G_IO_ERROR,
G_IO_ERROR_INVALID_ARGUMENT,
_("Error in address `%s' - the port attribute is missing or malformed"),
_("Error in address '%s' - the port attribute is missing or malformed"),
address_entry);
goto out;
}
@@ -628,7 +628,7 @@ g_dbus_address_connect (const gchar *address_entry,
g_set_error (error,
G_IO_ERROR,
G_IO_ERROR_INVALID_ARGUMENT,
_("Error in address `%s' - the noncefile attribute is missing or malformed"),
_("Error in address '%s' - the noncefile attribute is missing or malformed"),
address_entry);
goto out;
}
@@ -657,7 +657,7 @@ g_dbus_address_connect (const gchar *address_entry,
g_set_error (error,
G_IO_ERROR,
G_IO_ERROR_INVALID_ARGUMENT,
_("Unknown or unsupported transport `%s' for address `%s'"),
_("Unknown or unsupported transport '%s' for address '%s'"),
transport_name,
address_entry);
}
@@ -693,7 +693,7 @@ g_dbus_address_connect (const gchar *address_entry,
g_set_error (error,
G_IO_ERROR,
G_IO_ERROR_INVALID_ARGUMENT,
_("Error opening nonce file `%s': %s"),
_("Error opening nonce file '%s': %s"),
nonce_file,
g_strerror (errno));
g_object_unref (ret);
@@ -711,7 +711,7 @@ g_dbus_address_connect (const gchar *address_entry,
g_set_error (error,
G_IO_ERROR,
G_IO_ERROR_INVALID_ARGUMENT,
_("Error reading from nonce file `%s': %s"),
_("Error reading from nonce file '%s': %s"),
nonce_file,
g_strerror (errno));
}
@@ -720,7 +720,7 @@ g_dbus_address_connect (const gchar *address_entry,
g_set_error (error,
G_IO_ERROR,
G_IO_ERROR_INVALID_ARGUMENT,
_("Error reading from nonce file `%s', expected 16 bytes, got %d"),
_("Error reading from nonce file '%s', expected 16 bytes, got %d"),
nonce_file,
(gint) num_bytes_read);
}
@@ -738,7 +738,7 @@ g_dbus_address_connect (const gchar *address_entry,
cancellable,
error))
{
g_prefix_error (error, _("Error writing contents of nonce file `%s' to stream:"), nonce_file);
g_prefix_error (error, _("Error writing contents of nonce file '%s' to stream:"), nonce_file);
g_object_unref (ret);
ret = NULL;
goto out;
@@ -1058,7 +1058,7 @@ get_session_address_dbus_launch (GError **error)
if (G_UNLIKELY (_g_dbus_debug_address ()))
{
_g_dbus_debug_print_lock ();
g_print ("GDBus-debug:Address: Running `%s' to get bus address (possibly autolaunching)\n", command_line);
g_print ("GDBus-debug:Address: Running '%s' to get bus address (possibly autolaunching)\n", command_line);
old_dbus_verbose = g_strdup (g_getenv ("DBUS_VERBOSE"));
restore_dbus_verbose = TRUE;
g_setenv ("DBUS_VERBOSE", "1", TRUE);
@@ -1076,7 +1076,7 @@ get_session_address_dbus_launch (GError **error)
if (!g_spawn_check_exit_status (exit_status, error))
{
g_prefix_error (error, _("Error spawning command line `%s': "), command_line);
g_prefix_error (error, _("Error spawning command line '%s': "), command_line);
goto out;
}
@@ -1431,7 +1431,7 @@ get_session_address_platform_specific (GError **error)
{
gchar *ret;
#if defined (G_OS_UNIX) || defined(G_OS_WIN32)
/* need to handle OS X in a different way since `dbus-launch --autolaunch' probably won't work there */
/* need to handle OS X in a different way since 'dbus-launch --autolaunch' probably won't work there */
ret = get_session_address_dbus_launch (error);
#else
/* TODO: implement for OS X */
@@ -1478,7 +1478,7 @@ g_dbus_address_get_for_bus_sync (GBusType bus_type,
{
guint n;
_g_dbus_debug_print_lock ();
g_print ("GDBus-debug:Address: In g_dbus_address_get_for_bus_sync() for bus type `%s'\n",
g_print ("GDBus-debug:Address: In g_dbus_address_get_for_bus_sync() for bus type '%s'\n",
_g_dbus_enum_to_string (G_TYPE_BUS_TYPE, bus_type));
for (n = 0; n < 3; n++)
{
@@ -1494,7 +1494,7 @@ g_dbus_address_get_for_bus_sync (GBusType bus_type,
v = g_getenv (k);
g_print ("GDBus-debug:Address: env var %s", k);
if (v != NULL)
g_print ("=`%s'\n", v);
g_print ("='%s'\n", v);
else
g_print (" is not set\n");
}
@@ -1539,7 +1539,7 @@ g_dbus_address_get_for_bus_sync (GBusType bus_type,
G_IO_ERROR,
G_IO_ERROR_FAILED,
_("Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment variable"
" - unknown value `%s'"),
" - unknown value '%s'"),
starter_bus);
}
else
@@ -1568,13 +1568,13 @@ g_dbus_address_get_for_bus_sync (GBusType bus_type,
_g_dbus_debug_print_lock ();
if (ret != NULL)
{
g_print ("GDBus-debug:Address: Returning address `%s' for bus type `%s'\n",
g_print ("GDBus-debug:Address: Returning address '%s' for bus type '%s'\n",
ret,
_g_dbus_enum_to_string (G_TYPE_BUS_TYPE, bus_type));
}
else
{
g_print ("GDBus-debug:Address: Cannot look-up address bus type `%s': %s\n",
g_print ("GDBus-debug:Address: Cannot look-up address bus type '%s': %s\n",
_g_dbus_enum_to_string (G_TYPE_BUS_TYPE, bus_type),
local_error ? local_error->message : "");
}

82
gio/gdbusauth.c
View File

@@ -401,7 +401,7 @@ hexdecode (const gchar *str,
g_set_error (error,
G_IO_ERROR,
G_IO_ERROR_FAILED,
"Error hexdecoding string `%s' around position %d",
"Error hexdecoding string '%s' around position %d",
str, n);
goto out;
}
@@ -523,7 +523,7 @@ client_choose_mech_and_send_initial_response (GDBusAuth *auth,
"stream", auth->priv->stream,
"credentials", credentials_that_were_sent,
NULL);
debug_print ("CLIENT: Trying mechanism `%s'", _g_dbus_auth_mechanism_get_name (auth_mech_to_use_gtype));
debug_print ("CLIENT: Trying mechanism '%s'", _g_dbus_auth_mechanism_get_name (auth_mech_to_use_gtype));
g_ptr_array_add (attempted_auth_mechs, (gpointer) _g_dbus_auth_mechanism_get_name (auth_mech_to_use_gtype));
/* the auth mechanism may not be supported
@@ -531,7 +531,7 @@ client_choose_mech_and_send_initial_response (GDBusAuth *auth,
*/
if (!_g_dbus_auth_mechanism_is_supported (mech))
{
debug_print ("CLIENT: Mechanism `%s' says it is not supported", _g_dbus_auth_mechanism_get_name (auth_mech_to_use_gtype));
debug_print ("CLIENT: Mechanism '%s' says it is not supported", _g_dbus_auth_mechanism_get_name (auth_mech_to_use_gtype));
g_object_unref (mech);
mech = NULL;
goto again;
@@ -541,14 +541,14 @@ client_choose_mech_and_send_initial_response (GDBusAuth *auth,
initial_response = _g_dbus_auth_mechanism_client_initiate (mech,
&initial_response_len);
#if 0
g_printerr ("using auth mechanism with name `%s' of type `%s' with initial response `%s'\n",
g_printerr ("using auth mechanism with name '%s' of type '%s' with initial response '%s'\n",
_g_dbus_auth_mechanism_get_name (auth_mech_to_use_gtype),
g_type_name (G_TYPE_FROM_INSTANCE (mech)),
initial_response);
#endif
if (initial_response != NULL)
{
//g_printerr ("initial_response = `%s'\n", initial_response);
//g_printerr ("initial_response = '%s'\n", initial_response);
encoded = hexencode (initial_response);
s = g_strdup_printf ("AUTH %s %s\r\n",
_g_dbus_auth_mechanism_get_name (auth_mech_to_use_gtype),
@@ -560,7 +560,7 @@ client_choose_mech_and_send_initial_response (GDBusAuth *auth,
{
s = g_strdup_printf ("AUTH %s\r\n", _g_dbus_auth_mechanism_get_name (auth_mech_to_use_gtype));
}
debug_print ("CLIENT: writing `%s'", s);
debug_print ("CLIENT: writing '%s'", s);
if (!g_data_output_stream_put_string (dos, s, cancellable, error))
{
g_object_unref (mech);
@@ -648,7 +648,7 @@ _g_dbus_auth_run_client (GDBusAuth *auth,
if (G_UNLIKELY (_g_dbus_debug_authentication ()))
{
s = g_credentials_to_string (credentials);
debug_print ("CLIENT: sent credentials `%s'", s);
debug_print ("CLIENT: sent credentials '%s'", s);
g_free (s);
}
}
@@ -661,7 +661,7 @@ _g_dbus_auth_run_client (GDBusAuth *auth,
/* Get list of supported authentication mechanisms */
s = "AUTH\r\n";
debug_print ("CLIENT: writing `%s'", s);
debug_print ("CLIENT: writing '%s'", s);
if (!g_data_output_stream_put_string (dos, s, cancellable, error))
goto out;
state = CLIENT_STATE_WAITING_FOR_REJECT;
@@ -683,7 +683,7 @@ _g_dbus_auth_run_client (GDBusAuth *auth,
g_set_error (error,
G_IO_ERROR,
G_IO_ERROR_FAILED,
"In WaitingForReject: Expected `REJECTED am1 am2 ... amN', got `%s'",
"In WaitingForReject: Expected 'REJECTED am1 am2 ... amN', got '%s'",
line);
g_free (line);
goto out;
@@ -693,7 +693,7 @@ _g_dbus_auth_run_client (GDBusAuth *auth,
supported_auth_mechs = g_strsplit (line + sizeof ("REJECTED ") - 1, " ", 0);
#if 0
for (n = 0; supported_auth_mechs != NULL && supported_auth_mechs[n] != NULL; n++)
g_printerr ("supported_auth_mechs[%d] = `%s'\n", n, supported_auth_mechs[n]);
g_printerr ("supported_auth_mechs[%d] = '%s'\n", n, supported_auth_mechs[n]);
#endif
}
g_free (line);
@@ -717,7 +717,7 @@ _g_dbus_auth_run_client (GDBusAuth *auth,
line = _my_g_data_input_stream_read_line (dis, &line_length, cancellable, error);
if (line == NULL)
goto out;
debug_print ("CLIENT: WaitingForOK, read `%s'", line);
debug_print ("CLIENT: WaitingForOK, read '%s'", line);
if (g_str_has_prefix (line, "OK "))
{
if (!g_dbus_is_guid (line + 3))
@@ -725,7 +725,7 @@ _g_dbus_auth_run_client (GDBusAuth *auth,
g_set_error (error,
G_IO_ERROR,
G_IO_ERROR_FAILED,
"Invalid OK response `%s'",
"Invalid OK response '%s'",
line);
g_free (line);
goto out;
@@ -736,7 +736,7 @@ _g_dbus_auth_run_client (GDBusAuth *auth,
if (offered_capabilities & G_DBUS_CAPABILITY_FLAGS_UNIX_FD_PASSING)
{
s = "NEGOTIATE_UNIX_FD\r\n";
debug_print ("CLIENT: writing `%s'", s);
debug_print ("CLIENT: writing '%s'", s);
if (!g_data_output_stream_put_string (dos, s, cancellable, error))
goto out;
state = CLIENT_STATE_WAITING_FOR_AGREE_UNIX_FD;
@@ -744,7 +744,7 @@ _g_dbus_auth_run_client (GDBusAuth *auth,
else
{
s = "BEGIN\r\n";
debug_print ("CLIENT: writing `%s'", s);
debug_print ("CLIENT: writing '%s'", s);
if (!g_data_output_stream_put_string (dos, s, cancellable, error))
goto out;
/* and we're done! */
@@ -761,7 +761,7 @@ _g_dbus_auth_run_client (GDBusAuth *auth,
g_set_error (error,
G_IO_ERROR,
G_IO_ERROR_FAILED,
"In WaitingForOk: unexpected response `%s'",
"In WaitingForOk: unexpected response '%s'",
line);
g_free (line);
goto out;
@@ -773,13 +773,13 @@ _g_dbus_auth_run_client (GDBusAuth *auth,
line = _my_g_data_input_stream_read_line (dis, &line_length, cancellable, error);
if (line == NULL)
goto out;
debug_print ("CLIENT: WaitingForAgreeUnixFD, read=`%s'", line);
debug_print ("CLIENT: WaitingForAgreeUnixFD, read='%s'", line);
if (g_strcmp0 (line, "AGREE_UNIX_FD") == 0)
{
g_free (line);
negotiated_capabilities |= G_DBUS_CAPABILITY_FLAGS_UNIX_FD_PASSING;
s = "BEGIN\r\n";
debug_print ("CLIENT: writing `%s'", s);
debug_print ("CLIENT: writing '%s'", s);
if (!g_data_output_stream_put_string (dos, s, cancellable, error))
goto out;
/* and we're done! */
@@ -787,10 +787,10 @@ _g_dbus_auth_run_client (GDBusAuth *auth,
}
else if (g_str_has_prefix (line, "ERROR") && (line[5] == 0 || g_ascii_isspace (line[5])))
{
//g_strstrip (line + 5); g_debug ("bah, no unix_fd: `%s'", line + 5);
//g_strstrip (line + 5); g_debug ("bah, no unix_fd: '%s'", line + 5);
g_free (line);
s = "BEGIN\r\n";
debug_print ("CLIENT: writing `%s'", s);
debug_print ("CLIENT: writing '%s'", s);
if (!g_data_output_stream_put_string (dos, s, cancellable, error))
goto out;
/* and we're done! */
@@ -802,7 +802,7 @@ _g_dbus_auth_run_client (GDBusAuth *auth,
g_set_error (error,
G_IO_ERROR,
G_IO_ERROR_FAILED,
"In WaitingForAgreeUnixFd: unexpected response `%s'",
"In WaitingForAgreeUnixFd: unexpected response '%s'",
line);
g_free (line);
goto out;
@@ -814,7 +814,7 @@ _g_dbus_auth_run_client (GDBusAuth *auth,
line = _my_g_data_input_stream_read_line (dis, &line_length, cancellable, error);
if (line == NULL)
goto out;
debug_print ("CLIENT: WaitingForData, read=`%s'", line);
debug_print ("CLIENT: WaitingForData, read='%s'", line);
if (g_str_has_prefix (line, "DATA "))
{
gchar *encoded;
@@ -845,7 +845,7 @@ _g_dbus_auth_run_client (GDBusAuth *auth,
s = g_strdup_printf ("DATA %s\r\n", encoded_data);
g_free (encoded_data);
g_free (data);
debug_print ("CLIENT: writing `%s'", s);
debug_print ("CLIENT: writing '%s'", s);
if (!g_data_output_stream_put_string (dos, s, cancellable, error))
{
g_free (s);
@@ -867,7 +867,7 @@ _g_dbus_auth_run_client (GDBusAuth *auth,
g_set_error (error,
G_IO_ERROR,
G_IO_ERROR_FAILED,
"In WaitingForData: unexpected response `%s'",
"In WaitingForData: unexpected response '%s'",
line);
g_free (line);
goto out;
@@ -990,7 +990,7 @@ _g_dbus_auth_run_server (GDBusAuth *auth,
g_set_error (error,
G_IO_ERROR,
G_IO_ERROR_FAILED,
"The given guid `%s' is not valid",
"The given guid '%s' is not valid",
guid);
goto out;
}
@@ -1042,7 +1042,7 @@ _g_dbus_auth_run_server (GDBusAuth *auth,
if (G_UNLIKELY (_g_dbus_debug_authentication ()))
{
s = g_credentials_to_string (credentials);
debug_print ("SERVER: received credentials `%s'", s);
debug_print ("SERVER: received credentials '%s'", s);
g_free (s);
}
}
@@ -1059,13 +1059,13 @@ _g_dbus_auth_run_server (GDBusAuth *auth,
case SERVER_STATE_WAITING_FOR_AUTH:
debug_print ("SERVER: WaitingForAuth");
line = _my_g_data_input_stream_read_line (dis, &line_length, cancellable, error);
debug_print ("SERVER: WaitingForAuth, read `%s'", line);
debug_print ("SERVER: WaitingForAuth, read '%s'", line);
if (line == NULL)
goto out;
if (g_strcmp0 (line, "AUTH") == 0)
{
s = get_auth_mechanisms (auth, allow_anonymous, "REJECTED ", "\r\n", " ");
debug_print ("SERVER: writing `%s'", s);
debug_print ("SERVER: writing '%s'", s);
if (!g_data_output_stream_put_string (dos, s, cancellable, error))
{
g_free (s);
@@ -1102,14 +1102,14 @@ _g_dbus_auth_run_server (GDBusAuth *auth,
g_set_error (error,
G_IO_ERROR,
G_IO_ERROR_FAILED,
"Unexpected line `%s' while in WaitingForAuth state",
"Unexpected line '%s' while in WaitingForAuth state",
line);
g_strfreev (tokens);
goto out;
}
/* TODO: record that the client has attempted to use this mechanism */
//g_debug ("client is trying `%s'", mech_name);
//g_debug ("client is trying '%s'", mech_name);
auth_mech_to_use_gtype = find_mech_by_name (auth, mech_name);
if ((auth_mech_to_use_gtype == (GType) 0) ||
@@ -1118,7 +1118,7 @@ _g_dbus_auth_run_server (GDBusAuth *auth,
/* We don't support this auth mechanism */
g_strfreev (tokens);
s = get_auth_mechanisms (auth, allow_anonymous, "REJECTED ", "\r\n", " ");
debug_print ("SERVER: writing `%s'", s);
debug_print ("SERVER: writing '%s'", s);
if (!g_data_output_stream_put_string (dos, s, cancellable, error))
{
g_free (s);
@@ -1178,7 +1178,7 @@ _g_dbus_auth_run_server (GDBusAuth *auth,
else
{
s = g_strdup_printf ("OK %s\r\n", guid);
debug_print ("SERVER: writing `%s'", s);
debug_print ("SERVER: writing '%s'", s);
if (!g_data_output_stream_put_string (dos, s, cancellable, error))
{
g_free (s);
@@ -1191,7 +1191,7 @@ _g_dbus_auth_run_server (GDBusAuth *auth,
case G_DBUS_AUTH_MECHANISM_STATE_REJECTED:
s = get_auth_mechanisms (auth, allow_anonymous, "REJECTED ", "\r\n", " ");
debug_print ("SERVER: writing `%s'", s);
debug_print ("SERVER: writing '%s'", s);
if (!g_data_output_stream_put_string (dos, s, cancellable, error))
{
g_free (s);
@@ -1215,7 +1215,7 @@ _g_dbus_auth_run_server (GDBusAuth *auth,
s = g_strdup_printf ("DATA %s\r\n", encoded_data);
g_free (encoded_data);
g_free (data);
debug_print ("SERVER: writing `%s'", s);
debug_print ("SERVER: writing '%s'", s);
if (!g_data_output_stream_put_string (dos, s, cancellable, error))
{
g_free (s);
@@ -1238,7 +1238,7 @@ _g_dbus_auth_run_server (GDBusAuth *auth,
g_set_error (error,
G_IO_ERROR,
G_IO_ERROR_FAILED,
"Unexpected line `%s' while in WaitingForAuth state",
"Unexpected line '%s' while in WaitingForAuth state",
line);
g_free (line);
goto out;
@@ -1248,7 +1248,7 @@ _g_dbus_auth_run_server (GDBusAuth *auth,
case SERVER_STATE_WAITING_FOR_DATA:
debug_print ("SERVER: WaitingForData");
line = _my_g_data_input_stream_read_line (dis, &line_length, cancellable, error);
debug_print ("SERVER: WaitingForData, read `%s'", line);
debug_print ("SERVER: WaitingForData, read '%s'", line);
if (line == NULL)
goto out;
if (g_str_has_prefix (line, "DATA "))
@@ -1278,7 +1278,7 @@ _g_dbus_auth_run_server (GDBusAuth *auth,
g_set_error (error,
G_IO_ERROR,
G_IO_ERROR_FAILED,
"Unexpected line `%s' while in WaitingForData state",
"Unexpected line '%s' while in WaitingForData state",
line);
g_free (line);
}
@@ -1297,7 +1297,7 @@ _g_dbus_auth_run_server (GDBusAuth *auth,
&line_length,
cancellable,
error);
debug_print ("SERVER: WaitingForBegin, read `%s'", line);
debug_print ("SERVER: WaitingForBegin, read '%s'", line);
if (line == NULL)
goto out;
if (g_strcmp0 (line, "BEGIN") == 0)
@@ -1314,24 +1314,24 @@ _g_dbus_auth_run_server (GDBusAuth *auth,
{
negotiated_capabilities |= G_DBUS_CAPABILITY_FLAGS_UNIX_FD_PASSING;
s = "AGREE_UNIX_FD\r\n";
debug_print ("SERVER: writing `%s'", s);
debug_print ("SERVER: writing '%s'", s);
if (!g_data_output_stream_put_string (dos, s, cancellable, error))
goto out;
}
else
{
s = "ERROR \"fd passing not offered\"\r\n";
debug_print ("SERVER: writing `%s'", s);
debug_print ("SERVER: writing '%s'", s);
if (!g_data_output_stream_put_string (dos, s, cancellable, error))
goto out;
}
}
else
{
g_debug ("Unexpected line `%s' while in WaitingForBegin state", line);
g_debug ("Unexpected line '%s' while in WaitingForBegin state", line);
g_free (line);
s = "ERROR \"Unknown Command\"\r\n";
debug_print ("SERVER: writing `%s'", s);
debug_print ("SERVER: writing '%s'", s);
if (!g_data_output_stream_put_string (dos, s, cancellable, error))
goto out;
}

2
gio/gdbusauthmechanismanon.c
View File

@@ -187,7 +187,7 @@ mechanism_server_initiate (GDBusAuthMechanism *mechanism,
g_return_if_fail (G_IS_DBUS_AUTH_MECHANISM_ANON (mechanism));
g_return_if_fail (!m->priv->is_server && !m->priv->is_client);
//g_debug ("ANONYMOUS: initial_response was `%s'", initial_response);
//g_debug ("ANONYMOUS: initial_response was '%s'", initial_response);
m->priv->is_server = TRUE;
m->priv->state = G_DBUS_AUTH_MECHANISM_STATE_ACCEPTED;

42
gio/gdbusauthmechanismsha1.c
View File

@@ -263,7 +263,7 @@ ensure_keyring_directory (GError **error)
g_set_error (error,
G_IO_ERROR,
g_io_error_from_errno (errno),
_("Error when getting information for directory `%s': %s"),
_("Error when getting information for directory '%s': %s"),
path,
strerror (errno));
g_free (path);
@@ -275,7 +275,7 @@ ensure_keyring_directory (GError **error)
g_set_error (error,
G_IO_ERROR,
G_IO_ERROR_FAILED,
_("Permissions on directory `%s' are malformed. Expected mode 0700, got 0%o"),
_("Permissions on directory '%s' are malformed. Expected mode 0700, got 0%o"),
path,
statbuf.st_mode & 0777);
g_free (path);
@@ -296,7 +296,7 @@ ensure_keyring_directory (GError **error)
g_set_error (error,
G_IO_ERROR,
g_io_error_from_errno (errno),
_("Error creating directory `%s': %s"),
_("Error creating directory '%s': %s"),
path,
strerror (errno));
g_free (path);
@@ -379,7 +379,7 @@ keyring_lookup_entry (const gchar *cookie_context,
error))
{
g_prefix_error (error,
_("Error opening keyring `%s' for reading: "),
_("Error opening keyring '%s' for reading: "),
path);
goto out;
}
@@ -403,7 +403,7 @@ keyring_lookup_entry (const gchar *cookie_context,
g_set_error (error,
G_IO_ERROR,
G_IO_ERROR_FAILED,
_("Line %d of the keyring at `%s' with content `%s' is malformed"),
_("Line %d of the keyring at '%s' with content '%s' is malformed"),
n + 1,
path,
line);
@@ -417,7 +417,7 @@ keyring_lookup_entry (const gchar *cookie_context,
g_set_error (error,
G_IO_ERROR,
G_IO_ERROR_FAILED,
_("First token of line %d of the keyring at `%s' with content `%s' is malformed"),
_("First token of line %d of the keyring at '%s' with content '%s' is malformed"),
n + 1,
path,
line);
@@ -432,7 +432,7 @@ keyring_lookup_entry (const gchar *cookie_context,
g_set_error (error,
G_IO_ERROR,
G_IO_ERROR_FAILED,
_("Second token of line %d of the keyring at `%s' with content `%s' is malformed"),
_("Second token of line %d of the keyring at '%s' with content '%s' is malformed"),
n + 1,
path,
line);
@@ -456,7 +456,7 @@ keyring_lookup_entry (const gchar *cookie_context,
g_set_error (error,
G_IO_ERROR,
G_IO_ERROR_FAILED,
_("Didn't find cookie with id %d in the keyring at `%s'"),
_("Didn't find cookie with id %d in the keyring at '%s'"),
cookie_id,
path);
@@ -534,12 +534,12 @@ keyring_acquire_lock (const gchar *path,
g_set_error (error,
G_IO_ERROR,
g_io_error_from_errno (errno),
_("Error deleting stale lock file `%s': %s"),
_("Error deleting stale lock file '%s': %s"),
lock,
strerror (errno));
goto out;
}
_log ("Deleted stale lock file `%s'", lock);
_log ("Deleted stale lock file '%s'", lock);
break;
}
}
@@ -566,7 +566,7 @@ keyring_acquire_lock (const gchar *path,
g_set_error (error,
G_IO_ERROR,
g_io_error_from_errno (errno),
_("Error creating lock file `%s': %s"),
_("Error creating lock file '%s': %s"),
lock,
strerror (errno));
goto out;
@@ -596,7 +596,7 @@ keyring_release_lock (const gchar *path,
g_set_error (error,
G_IO_ERROR,
g_io_error_from_errno (errno),
_("Error closing (unlinked) lock file `%s': %s"),
_("Error closing (unlinked) lock file '%s': %s"),
lock,
strerror (errno));
goto out;
@@ -606,7 +606,7 @@ keyring_release_lock (const gchar *path,
g_set_error (error,
G_IO_ERROR,
g_io_error_from_errno (errno),
_("Error unlinking lock file `%s': %s"),
_("Error unlinking lock file '%s': %s"),
lock,
strerror (errno));
goto out;
@@ -683,7 +683,7 @@ keyring_generate_entry (const gchar *cookie_context,
{
g_propagate_prefixed_error (error,
local_error,
_("Error opening keyring `%s' for writing: "),
_("Error opening keyring '%s' for writing: "),
path);
goto out;
}
@@ -716,7 +716,7 @@ keyring_generate_entry (const gchar *cookie_context,
g_set_error (error,
G_IO_ERROR,
G_IO_ERROR_FAILED,
_("Line %d of the keyring at `%s' with content `%s' is malformed"),
_("Line %d of the keyring at '%s' with content '%s' is malformed"),
n + 1,
path,
line);
@@ -730,7 +730,7 @@ keyring_generate_entry (const gchar *cookie_context,
g_set_error (error,
G_IO_ERROR,
G_IO_ERROR_FAILED,
_("First token of line %d of the keyring at `%s' with content `%s' is malformed"),
_("First token of line %d of the keyring at '%s' with content '%s' is malformed"),
n + 1,
path,
line);
@@ -744,7 +744,7 @@ keyring_generate_entry (const gchar *cookie_context,
g_set_error (error,
G_IO_ERROR,
G_IO_ERROR_FAILED,
_("Second token of line %d of the keyring at `%s' with content `%s' is malformed"),
_("Second token of line %d of the keyring at '%s' with content '%s' is malformed"),
n + 1,
path,
line);
@@ -880,7 +880,7 @@ keyring_generate_entry (const gchar *cookie_context,
else
{
g_prefix_error (error,
_("(Additionally, releasing the lock for `%s' also failed: %s) "),
_("(Additionally, releasing the lock for '%s' also failed: %s) "),
path,
local_error->message);
}
@@ -996,7 +996,7 @@ mechanism_server_data_receive (GDBusAuthMechanism *mechanism,
tokens = g_strsplit (data, " ", 0);
if (g_strv_length (tokens) != 2)
{
g_warning ("Malformed data `%s'", data);
g_warning ("Malformed data '%s'", data);
m->priv->state = G_DBUS_AUTH_MECHANISM_STATE_REJECTED;
goto out;
}
@@ -1157,7 +1157,7 @@ mechanism_client_data_receive (GDBusAuthMechanism *mechanism,
tokens = g_strsplit (data, " ", 0);
if (g_strv_length (tokens) != 3)
{
g_warning ("Malformed data `%s'", data);
g_warning ("Malformed data '%s'", data);
m->priv->state = G_DBUS_AUTH_MECHANISM_STATE_REJECTED;
goto out;
}
@@ -1166,7 +1166,7 @@ mechanism_client_data_receive (GDBusAuthMechanism *mechanism,
cookie_id = g_ascii_strtoll (tokens[1], &endp, 10);
if (*endp != '\0')
{
g_warning ("Malformed cookie_id `%s'", tokens[1]);
g_warning ("Malformed cookie_id '%s'", tokens[1]);
m->priv->state = G_DBUS_AUTH_MECHANISM_STATE_REJECTED;
goto out;
}

44
gio/gdbusconnection.c
View File

@@ -511,7 +511,7 @@ static void purge_all_filters (GDBusConnection *connection);
if (G_UNLIKELY (G_TRYLOCK(name))) \
{ \
g_assertion_message (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, \
"_G_ENSURE_LOCK: Lock `" #name "' is not locked"); \
"_G_ENSURE_LOCK: Lock '" #name "' is not locked"); \
} \
} while (FALSE) \
@@ -2676,7 +2676,7 @@ initable_init (GInitable *initable,
g_variant_get (hello_result, "(s)", &connection->bus_unique_name);
g_variant_unref (hello_result);
//g_debug ("unique name is `%s'", connection->bus_unique_name);
//g_debug ("unique name is '%s'", connection->bus_unique_name);
}
ret = TRUE;
@@ -3811,11 +3811,11 @@ schedule_callbacks (GDBusConnection *connection,
#if 0
g_print ("In schedule_callbacks:\n"
" sender = `%s'\n"
" interface = `%s'\n"
" member = `%s'\n"
" path = `%s'\n"
" arg0 = `%s'\n",
" sender = '%s'\n"
" interface = '%s'\n"
" member = '%s'\n"
" path = '%s'\n"
" arg0 = '%s'\n",
sender,
interface,
member,
@@ -4131,7 +4131,7 @@ invoke_get_property_in_idle_cb (gpointer _data)
{
reply = g_dbus_message_new_method_error (data->message,
"org.freedesktop.DBus.Error.UnknownMethod",
_("No such interface `org.freedesktop.DBus.Properties' on object at path %s"),
_("No such interface 'org.freedesktop.DBus.Properties' on object at path %s"),
g_dbus_message_get_path (data->message));
g_dbus_connection_send_message (data->connection, reply, G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, NULL);
g_object_unref (reply);
@@ -4202,7 +4202,7 @@ invoke_set_property_in_idle_cb (gpointer _data)
{
reply = g_dbus_message_new_method_error (data->message,
"org.freedesktop.DBus.Error.InvalidArgs",
_("Error setting property `%s': Expected type `%s' but got `%s'"),
_("Error setting property '%s': Expected type '%s' but got '%s'"),
data->property_info->name,
data->property_info->signature,
g_variant_get_type_string (value));
@@ -4297,7 +4297,7 @@ validate_and_maybe_schedule_property_getset (GDBusConnection *connect
{
reply = g_dbus_message_new_method_error (message,
"org.freedesktop.DBus.Error.InvalidArgs",
_("No such property `%s'"),
_("No such property '%s'"),
property_name);
g_dbus_connection_send_message_unlocked (connection, reply, G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, NULL);
g_object_unref (reply);
@@ -4309,7 +4309,7 @@ validate_and_maybe_schedule_property_getset (GDBusConnection *connect
{
reply = g_dbus_message_new_method_error (message,
"org.freedesktop.DBus.Error.InvalidArgs",
_("Property `%s' is not readable"),
_("Property '%s' is not readable"),
property_name);
g_dbus_connection_send_message_unlocked (connection, reply, G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, NULL);
g_object_unref (reply);
@@ -4320,7 +4320,7 @@ validate_and_maybe_schedule_property_getset (GDBusConnection *connect
{
reply = g_dbus_message_new_method_error (message,
"org.freedesktop.DBus.Error.InvalidArgs",
_("Property `%s' is not writable"),
_("Property '%s' is not writable"),
property_name);
g_dbus_connection_send_message_unlocked (connection, reply, G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, NULL);
g_object_unref (reply);
@@ -4390,7 +4390,7 @@ handle_getset_property (GDBusConnection *connection,
GDBusMessage *reply;
reply = g_dbus_message_new_method_error (message,
"org.freedesktop.DBus.Error.InvalidArgs",
_("No such interface `%s'"),
_("No such interface '%s'"),
interface_name);
g_dbus_connection_send_message_unlocked (eo->connection, reply, G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, NULL);
g_object_unref (reply);
@@ -4447,7 +4447,7 @@ invoke_get_all_properties_in_idle_cb (gpointer _data)
{
reply = g_dbus_message_new_method_error (data->message,
"org.freedesktop.DBus.Error.UnknownMethod",
_("No such interface `org.freedesktop.DBus.Properties' on object at path %s"),
_("No such interface 'org.freedesktop.DBus.Properties' on object at path %s"),
g_dbus_message_get_path (data->message));
g_dbus_connection_send_message (data->connection, reply, G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, NULL);
g_object_unref (reply);
@@ -4792,7 +4792,7 @@ call_in_idle_cb (gpointer user_data)
GDBusMessage *reply;
reply = g_dbus_message_new_method_error (g_dbus_method_invocation_get_message (invocation),
"org.freedesktop.DBus.Error.UnknownMethod",
_("No such interface `%s' on object at path %s"),
_("No such interface '%s' on object at path %s"),
g_dbus_method_invocation_get_interface_name (invocation),
g_dbus_method_invocation_get_object_path (invocation));
g_dbus_connection_send_message (g_dbus_method_invocation_get_connection (invocation), reply, G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, NULL);
@@ -4847,7 +4847,7 @@ validate_and_maybe_schedule_method_call (GDBusConnection *connection,
{
reply = g_dbus_message_new_method_error (message,
"org.freedesktop.DBus.Error.UnknownMethod",
_("No such method `%s'"),
_("No such method '%s'"),
g_dbus_message_get_member (message));
g_dbus_connection_send_message_unlocked (connection, reply, G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, NULL);
g_object_unref (reply);
@@ -4878,7 +4878,7 @@ validate_and_maybe_schedule_method_call (GDBusConnection *connection,
reply = g_dbus_message_new_method_error (message,
"org.freedesktop.DBus.Error.InvalidArgs",
_("Type of message, `%s', does not match expected type `%s'"),
_("Type of message, '%s', does not match expected type '%s'"),
g_variant_get_type_string (parameters),
type_string);
g_dbus_connection_send_message_unlocked (connection, reply, G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, NULL);
@@ -5296,7 +5296,7 @@ decode_method_reply (GDBusMessage *reply,
g_set_error (error,
G_IO_ERROR,
G_IO_ERROR_INVALID_ARGUMENT,
_("Method `%s' returned type `%s', but expected `%s'"),
_("Method '%s' returned type '%s', but expected '%s'"),
method_name, g_variant_get_type_string (result), type_string);
g_variant_unref (result);
@@ -6266,7 +6266,7 @@ handle_subtree_method_invocation (GDBusConnection *connection,
GDBusMessage *reply;
reply = g_dbus_message_new_method_error (message,
"org.freedesktop.DBus.Error.InvalidArgs",
_("No such interface `%s'"),
_("No such interface '%s'"),
interface_name);
g_dbus_connection_send_message (es->connection, reply, G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, NULL);
g_object_unref (reply);
@@ -6377,7 +6377,7 @@ process_subtree_vtable_message_in_idle_cb (gpointer _data)
GDBusMessage *reply;
reply = g_dbus_message_new_method_error (data->message,
"org.freedesktop.DBus.Error.UnknownMethod",
_("Method `%s' on interface `%s' with signature `%s' does not exist"),
_("Method '%s' on interface '%s' with signature '%s' does not exist"),
g_dbus_message_get_member (data->message),
g_dbus_message_get_interface (data->message),
g_dbus_message_get_signature (data->message));
@@ -6772,7 +6772,7 @@ distribute_method_call (GDBusConnection *connection,
/* if we end up here, the message has not been not handled - so return an error saying this */
reply = g_dbus_message_new_method_error (message,
"org.freedesktop.DBus.Error.UnknownMethod",
_("No such interface `%s' on object at path %s"),
_("No such interface '%s' on object at path %s"),
interface_name,
object_path);
g_dbus_connection_send_message_unlocked (connection, reply, G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, NULL);
@@ -6824,7 +6824,7 @@ message_bus_get_singleton (GBusType bus_type,
G_IO_ERROR,
G_IO_ERROR_INVALID_ARGUMENT,
_("Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment variable"
" - unknown value `%s'"),
" - unknown value '%s'"),
starter_bus);
}
else

26
gio/gdbusmessage.c
View File

@@ -1395,7 +1395,7 @@ read_string (GMemoryBuffer *mbuf,
g_set_error (error,
G_IO_ERROR,
G_IO_ERROR_INVALID_ARGUMENT,
_("Expected NUL byte after the string `%s' but found byte %d"),
_("Expected NUL byte after the string '%s' but found byte %d"),
str, mbuf->data[mbuf->pos + len]);
g_free (str);
mbuf->pos += len + 1;
@@ -1415,7 +1415,7 @@ read_string (GMemoryBuffer *mbuf,
G_IO_ERROR,
G_IO_ERROR_INVALID_ARGUMENT,
_("Expected valid UTF-8 string but found invalid bytes at byte offset %d (length of string is %d). "
"The valid UTF-8 string up until that point was `%s'"),
"The valid UTF-8 string up until that point was '%s'"),
offset,
(gint) len,
valid_str);
@@ -1616,7 +1616,7 @@ parse_value_from_blob (GMemoryBuffer *buf,
g_set_error (&local_error,
G_IO_ERROR,
G_IO_ERROR_INVALID_ARGUMENT,
_("Parsed value `%s' is not a valid D-Bus object path"),
_("Parsed value '%s' is not a valid D-Bus object path"),
v);
goto fail;
}
@@ -1640,7 +1640,7 @@ parse_value_from_blob (GMemoryBuffer *buf,
g_set_error (&local_error,
G_IO_ERROR,
G_IO_ERROR_INVALID_ARGUMENT,
_("Parsed value `%s' is not a valid D-Bus signature"),
_("Parsed value '%s' is not a valid D-Bus signature"),
v);
goto fail;
}
@@ -1848,7 +1848,7 @@ parse_value_from_blob (GMemoryBuffer *buf,
g_set_error (&local_error,
G_IO_ERROR,
G_IO_ERROR_INVALID_ARGUMENT,
_("Parsed value `%s' for variant is not a valid D-Bus signature"),
_("Parsed value '%s' for variant is not a valid D-Bus signature"),
sig);
goto fail;
}
@@ -1872,7 +1872,7 @@ parse_value_from_blob (GMemoryBuffer *buf,
g_set_error (&local_error,
G_IO_ERROR,
G_IO_ERROR_INVALID_ARGUMENT,
_("Error deserializing GVariant with type string `%s' from the D-Bus wire format"),
_("Error deserializing GVariant with type string '%s' from the D-Bus wire format"),
s);
g_free (s);
goto fail;
@@ -2128,7 +2128,7 @@ g_dbus_message_new_from_blob (guchar *blob,
g_set_error (error,
G_IO_ERROR,
G_IO_ERROR_INVALID_ARGUMENT,
_("Signature header with signature `%s' found but message body is empty"),
_("Signature header with signature '%s' found but message body is empty"),
signature_str);
goto out;
}
@@ -2142,7 +2142,7 @@ g_dbus_message_new_from_blob (guchar *blob,
g_set_error (error,
G_IO_ERROR,
G_IO_ERROR_INVALID_ARGUMENT,
_("Parsed value `%s' is not a valid D-Bus signature (for body)"),
_("Parsed value '%s' is not a valid D-Bus signature (for body)"),
signature_str);
goto out;
}
@@ -2503,7 +2503,7 @@ append_value_to_blob (GVariant *value,
g_set_error (error,
G_IO_ERROR,
G_IO_ERROR_INVALID_ARGUMENT,
_("Error serializing GVariant with type string `%s' to the D-Bus wire format"),
_("Error serializing GVariant with type string '%s' to the D-Bus wire format"),
g_variant_get_type_string (value));
goto fail;
}
@@ -2692,7 +2692,7 @@ g_dbus_message_to_blob (GDBusMessage *message,
g_set_error (error,
G_IO_ERROR,
G_IO_ERROR_INVALID_ARGUMENT,
_("Message body has signature `%s' but there is no signature header"),
_("Message body has signature '%s' but there is no signature header"),
signature_str);
g_free (tupled_signature_str);
goto out;
@@ -2702,7 +2702,7 @@ g_dbus_message_to_blob (GDBusMessage *message,
g_set_error (error,
G_IO_ERROR,
G_IO_ERROR_INVALID_ARGUMENT,
_("Message body has type signature `%s' but signature in the header field is `%s'"),
_("Message body has type signature '%s' but signature in the header field is '%s'"),
tupled_signature_str, g_variant_get_type_string (message->body));
g_free (tupled_signature_str);
goto out;
@@ -2718,7 +2718,7 @@ g_dbus_message_to_blob (GDBusMessage *message,
g_set_error (error,
G_IO_ERROR,
G_IO_ERROR_INVALID_ARGUMENT,
_("Message body is empty but signature in the header field is `(%s)'"),
_("Message body is empty but signature in the header field is '(%s)'"),
signature_str);
goto out;
}
@@ -3268,7 +3268,7 @@ g_dbus_message_to_gerror (GDBusMessage *message,
g_dbus_error_set_dbus_error (error,
error_name,
"",
_("Error return with body of type `%s'"),
_("Error return with body of type '%s'"),
g_variant_get_type_string (body));
}
else

4
gio/gdbusmethodinvocation.c
View File

@@ -367,7 +367,7 @@ g_dbus_method_invocation_return_value_internal (GDBusMethodInvocation *invocatio
{
gchar *type_string = g_variant_type_dup_string (type);
g_warning ("Type of return value is incorrect: expected `%s', got `%s''",
g_warning ("Type of return value is incorrect: expected '%s', got '%s''",
type_string, g_variant_get_type_string (parameters));
g_variant_type_free (type);
g_free (type_string);
@@ -651,7 +651,7 @@ g_dbus_method_invocation_return_dbus_error (GDBusMethodInvocation *invocation,
g_print ("========================================================================\n"
"GDBus-debug:Return:\n"
" >>>> METHOD ERROR %s\n"
" message `%s'\n"
" message '%s'\n"
" in response to %s.%s()\n"
" on object %s\n"
" to name %s\n"

6
gio/gdbusproxy.c
View File

@@ -1001,7 +1001,7 @@ invalidated_property_get_cb (GDBusConnection *connection,
if (!g_variant_is_of_type (value, G_VARIANT_TYPE ("(v)")))
{
g_warning ("Expected type `(v)' for Get() reply, got `%s'", g_variant_get_type_string (value));
g_warning ("Expected type '(v)' for Get() reply, got '%s'", g_variant_get_type_string (value));
goto out;
}
@@ -1081,7 +1081,7 @@ on_properties_changed (GDBusConnection *connection,
if (!g_variant_is_of_type (parameters, G_VARIANT_TYPE ("(sa{sv}as)")))
{
g_warning ("Value for PropertiesChanged signal with type `%s' does not match `(sa{sv}as)'",
g_warning ("Value for PropertiesChanged signal with type '%s' does not match '(sa{sv}as)'",
g_variant_get_type_string (parameters));
G_UNLOCK (properties_lock);
goto out;
@@ -1173,7 +1173,7 @@ process_get_all_reply (GDBusProxy *proxy,
if (!g_variant_is_of_type (result, G_VARIANT_TYPE ("(a{sv})")))
{
g_warning ("Value for GetAll reply with type `%s' does not match `(a{sv})'",
g_warning ("Value for GetAll reply with type '%s' does not match '(a{sv})'",
g_variant_get_type_string (result));
goto out;
}

6
gio/gdbusserver.c
View File

@@ -871,7 +871,7 @@ try_tcp (GDBusServer *server,
g_set_error (error,
G_IO_ERROR,
g_io_error_from_errno (errno),
_("Error writing nonce file at `%s': %s"),
_("Error writing nonce file at '%s': %s"),
server->nonce_file,
strerror (errno));
goto out;
@@ -1040,7 +1040,7 @@ initable_init (GInitable *initable,
g_set_error (&last_error,
G_IO_ERROR,
G_IO_ERROR_INVALID_ARGUMENT,
_("The string `%s' is not a valid D-Bus GUID"),
_("The string '%s' is not a valid D-Bus GUID"),
server->guid);
goto out;
}
@@ -1080,7 +1080,7 @@ initable_init (GInitable *initable,
g_set_error (&this_error,
G_IO_ERROR,
G_IO_ERROR_INVALID_ARGUMENT,
_("Cannot listen on unsupported transport `%s'"),
_("Cannot listen on unsupported transport '%s'"),
transport_name);
g_free (transport_name);

6
gio/gicon.c
View File

@@ -664,7 +664,7 @@ g_icon_serialize (GIcon *icon)
if (!iface->serialize)
{
g_critical ("g_icon_serialize() on icon type `%s' is not implemented", G_OBJECT_TYPE_NAME (icon));
g_critical ("g_icon_serialize() on icon type '%s' is not implemented", G_OBJECT_TYPE_NAME (icon));
return NULL;
}
@@ -676,8 +676,8 @@ g_icon_serialize (GIcon *icon)
if (!g_variant_is_of_type (result, G_VARIANT_TYPE ("(sv)")))
{
g_critical ("g_icon_serialize() on icon type `%s' returned GVariant of type `%s' but it must return "
"one with type `(sv)'", G_OBJECT_TYPE_NAME (icon), g_variant_get_type_string (result));
g_critical ("g_icon_serialize() on icon type '%s' returned GVariant of type '%s' but it must return "
"one with type '(sv)'", G_OBJECT_TYPE_NAME (icon), g_variant_get_type_string (result));
g_variant_unref (result);
result = NULL;
}

16
gio/glib-compile-schemas.c
View File

@@ -1861,8 +1861,8 @@ set_overrides (GHashTable *schema_table,
if (state == NULL)
{
fprintf (stderr, _("No such key `%s' in schema `%s' as "
"specified in override file `%s'"),
fprintf (stderr, _("No such key '%s' in schema '%s' as "
"specified in override file '%s'"),
key, group, filename);
if (!strict)
@@ -1887,8 +1887,8 @@ set_overrides (GHashTable *schema_table,
if (value == NULL)
{
fprintf (stderr, _("error parsing key `%s' in schema `%s' "
"as specified in override file `%s': "
fprintf (stderr, _("error parsing key '%s' in schema '%s' "
"as specified in override file '%s': "
"%s."),
key, group, filename, error->message);
@@ -1915,8 +1915,8 @@ set_overrides (GHashTable *schema_table,
g_variant_compare (value, state->maximum) > 0)
{
fprintf (stderr,
_("override for key `%s' in schema `%s' in "
"override file `%s' is outside the range "
_("override for key '%s' in schema '%s' in "
"override file '%s' is outside the range "
"given in the schema"),
key, group, filename);
@@ -1943,8 +1943,8 @@ set_overrides (GHashTable *schema_table,
if (!is_valid_choices (value, state->strinfo))
{
fprintf (stderr,
_("override for key `%s' in schema `%s' in "
"override file `%s' is not in the list "
_("override for key '%s' in schema '%s' in "
"override file '%s' is not in the list "
"of valid choices"),
key, group, filename);

36
gio/gsettings.c
View File

@@ -1127,7 +1127,7 @@ g_settings_get_enum (GSettings *settings,
if (!skey.is_enum)
{
g_critical ("g_settings_get_enum() called on key `%s' which is not "
g_critical ("g_settings_get_enum() called on key '%s' which is not "
"associated with an enumerated type", skey.name);
g_settings_schema_key_clear (&skey);
return -1;
@@ -1183,15 +1183,15 @@ g_settings_set_enum (GSettings *settings,
if (!skey.is_enum)
{
g_critical ("g_settings_set_enum() called on key `%s' which is not "
g_critical ("g_settings_set_enum() called on key '%s' which is not "
"associated with an enumerated type", skey.name);
return FALSE;
}
if (!(variant = g_settings_schema_key_from_enum (&skey, value)))
{
g_critical ("g_settings_set_enum(): invalid enum value %d for key `%s' "
"in schema `%s'. Doing nothing.", value, skey.name,
g_critical ("g_settings_set_enum(): invalid enum value %d for key '%s' "
"in schema '%s'. Doing nothing.", value, skey.name,
g_settings_schema_get_id (skey.schema));
g_settings_schema_key_clear (&skey);
return FALSE;
@@ -1240,7 +1240,7 @@ g_settings_get_flags (GSettings *settings,
if (!skey.is_flags)
{
g_critical ("g_settings_get_flags() called on key `%s' which is not "
g_critical ("g_settings_get_flags() called on key '%s' which is not "
"associated with a flags type", skey.name);
g_settings_schema_key_clear (&skey);
return -1;
@@ -1297,7 +1297,7 @@ g_settings_set_flags (GSettings *settings,
if (!skey.is_flags)
{
g_critical ("g_settings_set_flags() called on key `%s' which is not "
g_critical ("g_settings_set_flags() called on key '%s' which is not "
"associated with a flags type", skey.name);
return FALSE;
}
@@ -1305,7 +1305,7 @@ g_settings_set_flags (GSettings *settings,
if (!(variant = g_settings_schema_key_from_flags (&skey, value)))
{
g_critical ("g_settings_set_flags(): invalid flags value 0x%08x "
"for key `%s' in schema `%s'. Doing nothing.",
"for key '%s' in schema '%s'. Doing nothing.",
value, skey.name, g_settings_schema_get_id (skey.schema));
g_settings_schema_key_clear (&skey);
return FALSE;
@@ -1523,7 +1523,7 @@ g_settings_get_mapped (GSettings *settings,
if (!mapping (NULL, &result, user_data))
g_error ("The mapping function given to g_settings_get_mapped() for key "
"`%s' in schema `%s' returned FALSE when given a NULL value.",
"'%s' in schema '%s' returned FALSE when given a NULL value.",
key, g_settings_schema_get_id (settings->priv->schema));
okay:
@@ -2402,7 +2402,7 @@ g_settings_binding_key_changed (GSettings *settings,
!binding->get_mapping (&value, variant, binding->user_data))
{
/* flag translation errors with a warning */
g_warning ("Translated default `%s' for key `%s' in schema `%s' "
g_warning ("Translated default '%s' for key '%s' in schema '%s' "
"was rejected by the binding mapping function",
binding->key.unparsed, binding->key.name,
g_settings_schema_get_id (binding->key.schema));
@@ -2415,7 +2415,7 @@ g_settings_binding_key_changed (GSettings *settings,
{
variant = g_variant_ref (binding->key.default_value);
if (!binding->get_mapping (&value, variant, binding->user_data))
g_error ("The schema default value for key `%s' in schema `%s' "
g_error ("The schema default value for key '%s' in schema '%s' "
"was rejected by the binding mapping function.",
binding->key.name, g_settings_schema_get_id (binding->key.schema));
}
@@ -2453,8 +2453,8 @@ g_settings_binding_property_changed (GObject *object,
if (!g_settings_schema_key_type_check (&binding->key, variant))
{
g_critical ("binding mapping function for key `%s' returned "
"GVariant of type `%s' when type `%s' was requested",
g_critical ("binding mapping function for key '%s' returned "
"GVariant of type '%s' when type '%s' was requested",
binding->key.name, g_variant_get_type_string (variant),
g_variant_type_dup_string (binding->key.type));
return;
@@ -2462,8 +2462,8 @@ g_settings_binding_property_changed (GObject *object,
if (!g_settings_schema_key_range_check (&binding->key, variant))
{
g_critical ("GObject property `%s' on a `%s' object is out of "
"schema-specified range for key `%s' of `%s': %s",
g_critical ("GObject property '%s' on a '%s' object is out of "
"schema-specified range for key '%s' of '%s': %s",
binding->property->name, g_type_name (binding->property->owner_type),
binding->key.name, g_settings_schema_get_id (binding->key.schema),
g_variant_print (variant, TRUE));
@@ -2647,8 +2647,8 @@ g_settings_bind_with_mapping (GSettings *settings,
if (binding->property->value_type != G_TYPE_BOOLEAN)
{
g_critical ("g_settings_bind: G_SETTINGS_BIND_INVERT_BOOLEAN "
"was specified, but property `%s' on type `%s' has "
"type `%s'", binding->property->name, G_OBJECT_TYPE_NAME (object),
"was specified, but property '%s' on type '%s' has "
"type '%s'", binding->property->name, G_OBJECT_TYPE_NAME (object),
g_type_name ((binding->property->value_type)));
return;
}
@@ -2656,8 +2656,8 @@ g_settings_bind_with_mapping (GSettings *settings,
if (!g_variant_type_equal (binding->key.type, G_VARIANT_TYPE_BOOLEAN))
{
g_critical ("g_settings_bind: G_SETTINGS_BIND_INVERT_BOOLEAN "
"was specified, but key `%s' on schema `%s' has "
"type `%s'", key, g_settings_schema_get_id (settings->priv->schema),
"was specified, but key '%s' on schema '%s' has "
"type '%s'", key, g_settings_schema_get_id (settings->priv->schema),
g_variant_type_dup_string (binding->key.type));
return;
}

6
gio/gsettingsschema.c
View File

@@ -928,8 +928,8 @@ g_settings_schema_key_get_translated_default (GSettingsSchemaKey *key)
if (value == NULL)
{
g_warning ("Failed to parse translated string `%s' for "
"key `%s' in schema `%s': %s", key->unparsed, key->name,
g_warning ("Failed to parse translated string '%s' for "
"key '%s' in schema '%s': %s", key->unparsed, key->name,
g_settings_schema_get_id (key->schema), error->message);
g_warning ("Using untranslated default instead.");
g_error_free (error);
@@ -937,7 +937,7 @@ g_settings_schema_key_get_translated_default (GSettingsSchemaKey *key)
else if (!g_settings_schema_key_range_check (key, value))
{
g_warning ("Translated default `%s' for key `%s' in schema `%s' "
g_warning ("Translated default '%s' for key '%s' in schema '%s' "
"is outside of valid range", key->unparsed, key->name,
g_settings_schema_get_id (key->schema));
g_variant_unref (value);

6
gio/kqueue/dep-list.c
View File

@@ -75,7 +75,7 @@ dep_list* dl_create (char *path, ino_t inode)
* Create a shallow copy of a list.
*
* A shallow copy is a copy of a structure, but not the copy of the
* contents. All data pointers (`path' in our case) of a list and its
* contents. All data pointers ('path' in our case) of a list and its
* shallow copy will point to the same memory.
*
* @param[in] dl A pointer to list to make a copy. May be NULL.
@@ -222,9 +222,9 @@ error:
* will be removed from the both lists. Items are comapred by a filename.
*
* @param[in,out] before A pointer to a pointer to a list. Will contain items
* which were not found in the `after' list.
* which were not found in the 'after' list.
* @param[in,out] after A pointer to a pointer to a list. Will containt items
* which were not found in the `before' list.
* which were not found in the 'before' list.
**/
void
dl_diff (dep_list **before, dep_list **after)

2
gio/kqueue/kqueue-thread.c
View File

@@ -215,7 +215,7 @@ _kqueue_thread_func (void *arg)
for (;;)
{
/* TODO: Provide more items in the `eventlist' to kqueue(2).
/* TODO: Provide more items in the 'eventlist' to kqueue(2).
* Currently the backend takes notifications from the kernel one
* by one, i.e. there will be a lot of system calls and context
* switches when the application will monitor a lot of files with

6
gio/tests/gdbus-example-subtree.c
View File

@@ -57,7 +57,7 @@ manager_method_call (GDBusConnection *connection,
g_variant_get (parameters, "(&s)", &greeting);
response = g_strdup_printf ("Method %s.%s with user_data `%s' on object path %s called with arg '%s'",
response = g_strdup_printf ("Method %s.%s with user_data '%s' on object path %s called with arg '%s'",
interface_name,
method_name,
(const gchar *) user_data,
@@ -96,7 +96,7 @@ block_method_call (GDBusConnection *connection,
g_variant_get (parameters, "(&s)", &greeting);
response = g_strdup_printf ("Method %s.%s with user_data `%s' on object path %s called with arg '%s'",
response = g_strdup_printf ("Method %s.%s with user_data '%s' on object path %s called with arg '%s'",
interface_name,
method_name,
(const gchar *) user_data,
@@ -209,7 +209,7 @@ partition_method_call (GDBusConnection *connection,
g_variant_get (parameters, "(&s)", &greeting);
response = g_strdup_printf ("Method %s.%s with user_data `%s' on object path %s called with arg '%s'",
response = g_strdup_printf ("Method %s.%s with user_data '%s' on object path %s called with arg '%s'",
interface_name,
method_name,
(const gchar *) user_data,

24
gio/tests/gdbus-export.c
View File

@@ -137,7 +137,7 @@ foo_method_call (GDBusConnection *connection,
const gchar *input;
gchar *output;
g_variant_get (parameters, "(&s)", &input);
output = g_strdup_printf ("You passed the string `%s'. Jolly good!", input);
output = g_strdup_printf ("You passed the string '%s'. Jolly good!", input);
g_dbus_method_invocation_return_value (invocation, g_variant_new ("(s)", output));
g_free (output);
}
@@ -160,7 +160,7 @@ foo_get_property (GDBusConnection *connection,
{
GVariant *ret;
gchar *s;
s = g_strdup_printf ("Property `%s' Is What It Is!", property_name);
s = g_strdup_printf ("Property '%s' Is What It Is!", property_name);
ret = g_variant_new_string (s);
g_free (s);
return ret;
@@ -181,7 +181,7 @@ foo_set_property (GDBusConnection *connection,
g_set_error (error,
G_DBUS_ERROR,
G_DBUS_ERROR_SPAWN_FILE_INVALID,
"Returning some error instead of writing the value `%s' to the property `%s'",
"Returning some error instead of writing the value '%s' to the property '%s'",
property_name, s);
g_free (s);
return FALSE;
@@ -774,7 +774,7 @@ test_dispatch_thread_func (gpointer user_data)
g_assert (value != NULL);
g_assert (g_variant_is_of_type (value, G_VARIANT_TYPE ("(s)")));
g_variant_get (value, "(&s)", &value_str);
g_assert_cmpstr (value_str, ==, "You passed the string `winwinwin'. Jolly good!");
g_assert_cmpstr (value_str, ==, "You passed the string 'winwinwin'. Jolly good!");
g_variant_unref (value);
error = NULL;
@@ -799,7 +799,7 @@ test_dispatch_thread_func (gpointer user_data)
NULL,
&error);
g_assert_error (error, G_DBUS_ERROR, G_DBUS_ERROR_INVALID_ARGS);
g_assert_cmpstr (error->message, ==, "GDBus.Error:org.freedesktop.DBus.Error.InvalidArgs: Type of message, `(s)', does not match expected type `()'");
g_assert_cmpstr (error->message, ==, "GDBus.Error:org.freedesktop.DBus.Error.InvalidArgs: Type of message, '(s)', does not match expected type '()'");
g_error_free (error);
g_assert (value == NULL);
@@ -812,7 +812,7 @@ test_dispatch_thread_func (gpointer user_data)
NULL,
&error);
g_assert_error (error, G_DBUS_ERROR, G_DBUS_ERROR_UNKNOWN_METHOD);
g_assert_cmpstr (error->message, ==, "GDBus.Error:org.freedesktop.DBus.Error.UnknownMethod: No such method `NonExistantMethod'");
g_assert_cmpstr (error->message, ==, "GDBus.Error:org.freedesktop.DBus.Error.UnknownMethod: No such method 'NonExistantMethod'");
g_error_free (error);
g_assert (value == NULL);
@@ -844,7 +844,7 @@ test_dispatch_thread_func (gpointer user_data)
g_assert (g_variant_is_of_type (value, G_VARIANT_TYPE ("(v)")));
g_variant_get (value, "(v)", &inner);
g_assert (g_variant_is_of_type (inner, G_VARIANT_TYPE_STRING));
g_assert_cmpstr (g_variant_get_string (inner, NULL), ==, "Property `PropertyUno' Is What It Is!");
g_assert_cmpstr (g_variant_get_string (inner, NULL), ==, "Property 'PropertyUno' Is What It Is!");
g_variant_unref (value);
g_variant_unref (inner);
@@ -860,7 +860,7 @@ test_dispatch_thread_func (gpointer user_data)
&error);
g_assert (value == NULL);
g_assert_error (error, G_DBUS_ERROR, G_DBUS_ERROR_INVALID_ARGS);
g_assert_cmpstr (error->message, ==, "GDBus.Error:org.freedesktop.DBus.Error.InvalidArgs: No such property `ThisDoesntExist'");
g_assert_cmpstr (error->message, ==, "GDBus.Error:org.freedesktop.DBus.Error.InvalidArgs: No such property 'ThisDoesntExist'");
g_error_free (error);
error = NULL;
@@ -875,7 +875,7 @@ test_dispatch_thread_func (gpointer user_data)
&error);
g_assert (value == NULL);
g_assert_error (error, G_DBUS_ERROR, G_DBUS_ERROR_INVALID_ARGS);
g_assert_cmpstr (error->message, ==, "GDBus.Error:org.freedesktop.DBus.Error.InvalidArgs: Property `NotReadable' is not readable");
g_assert_cmpstr (error->message, ==, "GDBus.Error:org.freedesktop.DBus.Error.InvalidArgs: Property 'NotReadable' is not readable");
g_error_free (error);
error = NULL;
@@ -891,7 +891,7 @@ test_dispatch_thread_func (gpointer user_data)
&error);
g_assert (value == NULL);
g_assert_error (error, G_DBUS_ERROR, G_DBUS_ERROR_SPAWN_FILE_INVALID);
g_assert_cmpstr (error->message, ==, "GDBus.Error:org.freedesktop.DBus.Error.Spawn.FileInvalid: Returning some error instead of writing the value `NotReadable' to the property `'But Writable you are!''");
g_assert_cmpstr (error->message, ==, "GDBus.Error:org.freedesktop.DBus.Error.Spawn.FileInvalid: Returning some error instead of writing the value 'NotReadable' to the property ''But Writable you are!''");
g_error_free (error);
error = NULL;
@@ -907,7 +907,7 @@ test_dispatch_thread_func (gpointer user_data)
&error);
g_assert (value == NULL);
g_assert_error (error, G_DBUS_ERROR, G_DBUS_ERROR_INVALID_ARGS);
g_assert_cmpstr (error->message, ==, "GDBus.Error:org.freedesktop.DBus.Error.InvalidArgs: Property `NotWritable' is not writable");
g_assert_cmpstr (error->message, ==, "GDBus.Error:org.freedesktop.DBus.Error.InvalidArgs: Property 'NotWritable' is not writable");
g_error_free (error);
error = NULL;
@@ -923,7 +923,7 @@ test_dispatch_thread_func (gpointer user_data)
g_assert (value != NULL);
g_assert (g_variant_is_of_type (value, G_VARIANT_TYPE ("(a{sv})")));
s = g_variant_print (value, TRUE);
g_assert_cmpstr (s, ==, "({'PropertyUno': <\"Property `PropertyUno' Is What It Is!\">, 'NotWritable': <\"Property `NotWritable' Is What It Is!\">},)");
g_assert_cmpstr (s, ==, "({'PropertyUno': <\"Property 'PropertyUno' Is What It Is!\">, 'NotWritable': <\"Property 'NotWritable' Is What It Is!\">},)");
g_free (s);
g_variant_unref (value);

4
gio/tests/gdbus-non-socket.c
View File

@@ -106,7 +106,7 @@ pokee_method_call (GDBusConnection *connection,
g_assert_cmpstr (method_name, ==, "Poke");
g_variant_get (parameters, "(&s)", &str);
ret = g_strdup_printf ("You poked me with: `%s'", str);
ret = g_strdup_printf ("You poked me with: '%s'", str);
g_dbus_method_invocation_return_value (invocation, g_variant_new ("(s)", ret));
g_free (ret);
}
@@ -269,7 +269,7 @@ test_non_socket (void)
&error);
g_assert_no_error (error);
g_variant_get (ret, "(&s)", &str);
g_assert_cmpstr (str, ==, "You poked me with: `I am the POKER!'");
g_assert_cmpstr (str, ==, "You poked me with: 'I am the POKER!'");
g_variant_unref (ret);
g_object_unref (connection);

32
gio/tests/gdbus-serialization.c
View File

@@ -217,7 +217,7 @@ append_gv_to_dbus_iter (DBusMessageIter *iter,
g_set_error (error,
G_IO_ERROR,
G_IO_ERROR_INVALID_ARGUMENT,
"Error serializing GVariant with type-string `%s' to a D-Bus message",
"Error serializing GVariant with type-string '%s' to a D-Bus message",
g_variant_get_type_string (value));
goto fail;
}
@@ -386,7 +386,7 @@ dbus_1_message_append (GString *s,
{
const gchar *value;
dbus_message_iter_get_basic (iter, &value);
g_string_append_printf (s, "string: `%s'\n", value);
g_string_append_printf (s, "string: '%s'\n", value);
break;
}
@@ -394,7 +394,7 @@ dbus_1_message_append (GString *s,
{
const gchar *value;
dbus_message_iter_get_basic (iter, &value);
g_string_append_printf (s, "object_path: `%s'\n", value);
g_string_append_printf (s, "object_path: '%s'\n", value);
break;
}
@@ -402,7 +402,7 @@ dbus_1_message_append (GString *s,
{
const gchar *value;
dbus_message_iter_get_basic (iter, &value);
g_string_append_printf (s, "signature: `%s'\n", value);
g_string_append_printf (s, "signature: '%s'\n", value);
break;
}
@@ -459,7 +459,7 @@ dbus_1_message_append (GString *s,
break;
default:
g_printerr ("Error serializing D-Bus message to GVariant. Unsupported arg type `%c' (%d)",
g_printerr ("Error serializing D-Bus message to GVariant. Unsupported arg type '%c' (%d)",
arg_type,
arg_type);
g_assert_not_reached ();
@@ -653,9 +653,9 @@ message_serialize_basic (void)
-G_GINT64_CONSTANT(2)<<34,
G_GUINT64_CONSTANT(0xffffffffffffffff),
42.5),
"value 0: string: `this is a string'\n"
"value 1: object_path: `/this/is/a/path'\n"
"value 2: signature: `sad'\n"
"value 0: string: 'this is a string'\n"
"value 1: object_path: '/this/is/a/path'\n"
"value 2: signature: 'sad'\n"
"value 3: byte: 0x2a\n"
"value 4: bool: true\n"
"value 5: int16: -42\n"
@@ -689,11 +689,11 @@ message_serialize_complex (void)
" int32: 3\n"
"value 1: array:\n"
" dict_entry:\n"
" string: `one'\n"
" string: `white'\n"
" string: 'one'\n"
" string: 'white'\n"
" dict_entry:\n"
" string: `two'\n"
" string: `black'\n");
" string: 'two'\n"
" string: 'black'\n");
value = g_variant_parse (G_VARIANT_TYPE ("(sa{sv}as)"),
"('01234567890123456', {}, ['Something'])",
@@ -701,19 +701,19 @@ message_serialize_complex (void)
g_assert_no_error (error);
g_assert (value != NULL);
check_serialization (value,
"value 0: string: `01234567890123456'\n"
"value 0: string: '01234567890123456'\n"
"value 1: array:\n"
"value 2: array:\n"
" string: `Something'\n");
" string: 'Something'\n");
/* https://bugzilla.gnome.org/show_bug.cgi?id=621838 */
check_serialization (g_variant_new_parsed ("(@aay [], {'cwd': <'/home/davidz/Hacking/glib/gio/tests'>})"),
"value 0: array:\n"
"value 1: array:\n"
" dict_entry:\n"
" string: `cwd'\n"
" string: 'cwd'\n"
" variant:\n"
" string: `/home/davidz/Hacking/glib/gio/tests'\n");
" string: '/home/davidz/Hacking/glib/gio/tests'\n");
#ifdef DBUS_TYPE_UNIX_FD
value = g_variant_parse (G_VARIANT_TYPE ("(hah)"),

4
gio/tests/gdbus-test-codegen.c
View File

@@ -93,7 +93,7 @@ on_handle_hello_world (FooiGenBar *object,
gpointer user_data)
{
gchar *response;
response = g_strdup_printf ("Word! You said `%s'. I'm Skeleton, btw!", greeting);
response = g_strdup_printf ("Word! You said '%s'. I'm Skeleton, btw!", greeting);
foo_igen_bar_complete_hello_world (object, invocation, response);
g_free (response);
return TRUE;
@@ -120,7 +120,7 @@ on_handle_test_primitive_types (FooiGenBar *object,
gchar *s1;
gchar *s2;
gchar *s3;
s1 = g_strdup_printf ("Word! You said `%s'. Rock'n'roll!", val_string);
s1 = g_strdup_printf ("Word! You said '%s'. Rock'n'roll!", val_string);
s2 = g_strdup_printf ("/modified%s", val_objpath);
s3 = g_strdup_printf ("assgit%s", val_signature);
foo_igen_bar_complete_test_primitive_types (object,

4
gio/tests/gdbus-tests.h
View File

@@ -90,7 +90,7 @@ G_BEGIN_DECLS
__FILE__, \
__LINE__, \
G_STRFUNC, \
"Signal `" signal_name "' does not " \
"Signal '" signal_name "' does not " \
"exist on object"); \
} \
if (_g_assert_signal_received_run (object, signal_name)) \
@@ -99,7 +99,7 @@ G_BEGIN_DECLS
__FILE__, \
__LINE__, \
G_STRFUNC, \
"Timed out waiting for signal `" \
"Timed out waiting for signal '" \
signal_name "'"); \
} \
} \