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

Merge branch 'allow_guid_key_in_dbus_addresses' into 'master'

Browse Source 
Allow guid key in dbus addresses

Closes #1018

See merge request GNOME/glib!995
This commit is contained in:
Simon McVittie
2019-07-23 13:01:09 +00:00
parent c50304fdc6 6a1512ed65
commit 3f1a79a4fa
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gio/gdbusaddress.c
View File

@@ -150,7 +150,7 @@ is_valid_unix (const gchar *address_entry,
tmpdir = g_hash_table_lookup (key_value_pairs, key);
else if (g_strcmp0 (key, "abstract") == 0)
abstract = g_hash_table_lookup (key_value_pairs, key);
else
else if (g_strcmp0 (key, "guid") != 0)
{
g_set_error (error,
G_IO_ERROR,
@@ -224,7 +224,7 @@ is_valid_nonce_tcp (const gchar *address_entry,
family = g_hash_table_lookup (key_value_pairs, key);
else if (g_strcmp0 (key, "noncefile") == 0)
nonce_file = g_hash_table_lookup (key_value_pairs, key);
else
else if (g_strcmp0 (key, "guid") != 0)
{
g_set_error (error,
G_IO_ERROR,
@@ -305,7 +305,7 @@ is_valid_tcp (const gchar *address_entry,
port = g_hash_table_lookup (key_value_pairs, key);
else if (g_strcmp0 (key, "family") == 0)
family = g_hash_table_lookup (key_value_pairs, key);
else
else if (g_strcmp0 (key, "guid") != 0)
{
g_set_error (error,
G_IO_ERROR,