projects
/
platform
/
upstream
/
glib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gio: Fix regression encoding an array of doubles
[platform/upstream/glib.git]
/
gio
/
gdbusaddress.c
diff --git
a/gio/gdbusaddress.c
b/gio/gdbusaddress.c
index
cc9703c
..
6d17b7c
100644
(file)
--- a/
gio/gdbusaddress.c
+++ b/
gio/gdbusaddress.c
@@
-13,9
+13,7
@@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Public License along with this library; if not, see <http://www.gnu.org/licenses/>.
*
* Author: David Zeuthen <davidz@redhat.com>
*/
*
* Author: David Zeuthen <davidz@redhat.com>
*/
@@
-62,7
+60,7
@@
*
* Routines for working with D-Bus addresses. A D-Bus address is a string
* like "unix:tmpdir=/tmp/my-app-name". The exact format of addresses
*
* Routines for working with D-Bus addresses. A D-Bus address is a string
* like "unix:tmpdir=/tmp/my-app-name". The exact format of addresses
- * is explained in detail in the
<link linkend="http://dbus.freedesktop.org/doc/dbus-specification.html#addresses">D-Bus specification</link>
.
+ * is explained in detail in the
[D-Bus specification](http://dbus.freedesktop.org/doc/dbus-specification.html\#addresses)
.
*/
static gchar *get_session_address_platform_specific (GError **error);
*/
static gchar *get_session_address_platform_specific (GError **error);
@@
-147,7
+145,7
@@
is_valid_unix (const gchar *address_entry,
g_set_error (error,
G_IO_ERROR,
G_IO_ERROR_INVALID_ARGUMENT,
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;
key,
address_entry);
goto out;
@@
-174,7
+172,7
@@
is_valid_unix (const gchar *address_entry,
g_set_error (error,
G_IO_ERROR,
G_IO_ERROR_INVALID_ARGUMENT,
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;
}
address_entry);
goto out;
}
@@
-187,7
+185,7
@@
is_valid_unix (const gchar *address_entry,
g_set_error (error,
G_IO_ERROR,
G_IO_ERROR_INVALID_ARGUMENT,
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:
address_entry);
out:
@@
-235,7
+233,7
@@
is_valid_nonce_tcp (const gchar *address_entry,
g_set_error (error,
G_IO_ERROR,
G_IO_ERROR_INVALID_ARGUMENT,
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;
key,
address_entry);
goto out;
@@
-250,7
+248,7
@@
is_valid_nonce_tcp (const gchar *address_entry,
g_set_error (error,
G_IO_ERROR,
G_IO_ERROR_INVALID_ARGUMENT,
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;
}
address_entry);
goto out;
}
@@
-261,7
+259,7
@@
is_valid_nonce_tcp (const gchar *address_entry,
g_set_error (error,
G_IO_ERROR,
G_IO_ERROR_INVALID_ARGUMENT,
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;
}
address_entry);
goto out;
}
@@
-316,7
+314,7
@@
is_valid_tcp (const gchar *address_entry,
g_set_error (error,
G_IO_ERROR,
G_IO_ERROR_INVALID_ARGUMENT,
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;
key,
address_entry);
goto out;
@@
-331,7
+329,7
@@
is_valid_tcp (const gchar *address_entry,
g_set_error (error,
G_IO_ERROR,
G_IO_ERROR_INVALID_ARGUMENT,
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;
}
address_entry);
goto out;
}
@@
-342,7
+340,7
@@
is_valid_tcp (const gchar *address_entry,
g_set_error (error,
G_IO_ERROR,
G_IO_ERROR_INVALID_ARGUMENT,
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;
}
address_entry);
goto out;
}
@@
-451,7
+449,7
@@
_g_dbus_address_parse_entry (const gchar *address_entry,
g_set_error (error,
G_IO_ERROR,
G_IO_ERROR_INVALID_ARGUMENT,
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;
}
address_entry);
goto out;
}
@@
-472,7
+470,7
@@
_g_dbus_address_parse_entry (const gchar *address_entry,
g_set_error (error,
G_IO_ERROR,
G_IO_ERROR_INVALID_ARGUMENT,
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);
n,
kv_pair,
address_entry);
@@
-486,7
+484,7
@@
_g_dbus_address_parse_entry (const gchar *address_entry,
g_set_error (error,
G_IO_ERROR,
G_IO_ERROR_INVALID_ARGUMENT,
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);
n,
kv_pair,
address_entry);
@@
-564,8
+562,8
@@
g_dbus_address_connect (const gchar *address_entry,
g_set_error (error,
G_IO_ERROR,
G_IO_ERROR_INVALID_ARGUMENT,
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)
address_entry);
}
else if (path != NULL)
@@
-600,7
+598,7
@@
g_dbus_address_connect (const gchar *address_entry,
g_set_error (error,
G_IO_ERROR,
G_IO_ERROR_INVALID_ARGUMENT,
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;
}
address_entry);
goto out;
}
@@
-614,7
+612,7
@@
g_dbus_address_connect (const gchar *address_entry,
g_set_error (error,
G_IO_ERROR,
G_IO_ERROR_INVALID_ARGUMENT,
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;
}
address_entry);
goto out;
}
@@
-628,7
+626,7
@@
g_dbus_address_connect (const gchar *address_entry,
g_set_error (error,
G_IO_ERROR,
G_IO_ERROR_INVALID_ARGUMENT,
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;
}
address_entry);
goto out;
}
@@
-657,7
+655,7
@@
g_dbus_address_connect (const gchar *address_entry,
g_set_error (error,
G_IO_ERROR,
G_IO_ERROR_INVALID_ARGUMENT,
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);
}
transport_name,
address_entry);
}
@@
-693,7
+691,7
@@
g_dbus_address_connect (const gchar *address_entry,
g_set_error (error,
G_IO_ERROR,
G_IO_ERROR_INVALID_ARGUMENT,
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);
nonce_file,
g_strerror (errno));
g_object_unref (ret);
@@
-711,7
+709,7
@@
g_dbus_address_connect (const gchar *address_entry,
g_set_error (error,
G_IO_ERROR,
G_IO_ERROR_INVALID_ARGUMENT,
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));
}
nonce_file,
g_strerror (errno));
}
@@
-720,7
+718,7
@@
g_dbus_address_connect (const gchar *address_entry,
g_set_error (error,
G_IO_ERROR,
G_IO_ERROR_INVALID_ARGUMENT,
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);
}
nonce_file,
(gint) num_bytes_read);
}
@@
-738,7
+736,7
@@
g_dbus_address_connect (const gchar *address_entry,
cancellable,
error))
{
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;
g_object_unref (ret);
ret = NULL;
goto out;
@@
-1058,7
+1056,7
@@
get_session_address_dbus_launch (GError **error)
if (G_UNLIKELY (_g_dbus_debug_address ()))
{
_g_dbus_debug_print_lock ();
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);
old_dbus_verbose = g_strdup (g_getenv ("DBUS_VERBOSE"));
restore_dbus_verbose = TRUE;
g_setenv ("DBUS_VERBOSE", "1", TRUE);
@@
-1076,7
+1074,7
@@
get_session_address_dbus_launch (GError **error)
if (!g_spawn_check_exit_status (exit_status, 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;
}
goto out;
}
@@
-1400,7
+1398,13
@@
get_session_address_dbus_launch (GError **error)
wcscat (args, rundll_path);
wcscat (args, L"\" ");
wcscat (args, gio_path_short);
wcscat (args, rundll_path);
wcscat (args, L"\" ");
wcscat (args, gio_path_short);
+#if defined(_WIN64) || defined(_M_X64) || defined(_M_AMD64)
+ wcscat (args, L",g_win32_run_session_bus");
+#elif defined (_MSC_VER)
+ wcscat (args, L",_g_win32_run_session_bus@16");
+#else
wcscat (args, L",g_win32_run_session_bus@16");
wcscat (args, L",g_win32_run_session_bus@16");
+#endif
res = CreateProcessW (rundll_path, args,
0, 0, FALSE,
res = CreateProcessW (rundll_path, args,
0, 0, FALSE,
@@
-1431,7
+1435,7
@@
get_session_address_platform_specific (GError **error)
{
gchar *ret;
#if defined (G_OS_UNIX) || defined(G_OS_WIN32)
{
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 */
ret = get_session_address_dbus_launch (error);
#else
/* TODO: implement for OS X */
@@
-1448,15
+1452,16
@@
get_session_address_platform_specific (GError **error)
/**
* g_dbus_address_get_for_bus_sync:
/**
* g_dbus_address_get_for_bus_sync:
- * @bus_type:
A #GBusType.
- * @cancellable: (allow-none):
A #GCancellable or %NULL.
- * @error:
Return location for error or %NULL.
+ * @bus_type:
a #GBusType
+ * @cancellable: (allow-none):
a #GCancellable or %NULL
+ * @error:
return location for error or %NULL
*
* Synchronously looks up the D-Bus address for the well-known message
* bus instance specified by @bus_type. This may involve using various
* platform specific mechanisms.
*
*
* Synchronously looks up the D-Bus address for the well-known message
* bus instance specified by @bus_type. This may involve using various
* platform specific mechanisms.
*
- * Returns: A valid D-Bus address string for @bus_type or %NULL if @error is set.
+ * Returns: a valid D-Bus address string for @bus_type or %NULL if
+ * @error is set
*
* Since: 2.26
*/
*
* Since: 2.26
*/
@@
-1478,7
+1483,7
@@
g_dbus_address_get_for_bus_sync (GBusType bus_type,
{
guint n;
_g_dbus_debug_print_lock ();
{
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++)
{
_g_dbus_enum_to_string (G_TYPE_BUS_TYPE, bus_type));
for (n = 0; n < 3; n++)
{
@@
-1494,7
+1499,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)
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");
}
else
g_print (" is not set\n");
}
@@
-1539,7
+1544,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"
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
starter_bus);
}
else
@@
-1568,13
+1573,13
@@
g_dbus_address_get_for_bus_sync (GBusType bus_type,
_g_dbus_debug_print_lock ();
if (ret != NULL)
{
_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
{
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 : "");
}
_g_dbus_enum_to_string (G_TYPE_BUS_TYPE, bus_type),
local_error ? local_error->message : "");
}
@@
-1590,18
+1595,18
@@
g_dbus_address_get_for_bus_sync (GBusType bus_type,
/**
* g_dbus_address_escape_value:
* @string: an unescaped string to be included in a D-Bus address
/**
* g_dbus_address_escape_value:
* @string: an unescaped string to be included in a D-Bus address
- * as the value in a key-value pair
+ *
as the value in a key-value pair
*
* Escape @string so it can appear in a D-Bus address as the value
* part of a key-value pair.
*
*
* Escape @string so it can appear in a D-Bus address as the value
* part of a key-value pair.
*
- * For instance, if @string is
<code>/run/bus-for-:0</code>
,
- * this function would return
<code>/run/bus-for-%3A0</code>
,
+ * For instance, if @string is
"/run/bus-for-:0"
,
+ * this function would return
"/run/bus-for-%3A0"
,
* which could be used in a D-Bus address like
* which could be used in a D-Bus address like
- *
<code>unix:nonce-tcp:host=127.0.0.1,port=42,noncefile=/run/bus-for-%3A0</code>
.
+ *
"unix:nonce-tcp:host=127.0.0.1,port=42,noncefile=/run/bus-for-%3A0"
.
*
* Returns: (transfer full): a copy of @string with all
*
* Returns: (transfer full): a copy of @string with all
- * non-optionally-escaped bytes escaped
+ *
non-optionally-escaped bytes escaped
*
* Since: 2.36
*/
*
* Since: 2.36
*/