summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2011-11-28 17:54:46 +0000
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2011-12-05 18:15:19 +0000
commit83d0c8a7396e8c1f70619e01f0b0c06fd22790b7 (patch)
treea93c63907ac1b69a1da1087daec6be3303590fac
parent15437a7e5a89dcb2a812f829bc8e9e1db7ce350b (diff)
GDBusConnection: propagate error correctly if flags are inappropriate
Previously, this would fail the assertion "connection->initialization_error != NULL" after the label "out". Bug: https://bugzilla.gnome.org/show_bug.cgi?id=665067 Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk> Reviewed-by: David Zeuthen <davidz@redhat.com>
-rw-r--r--gio/gdbusconnection.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/gio/gdbusconnection.c b/gio/gdbusconnection.c
index b214fff00..34368e223 100644
--- a/gio/gdbusconnection.c
+++ b/gio/gdbusconnection.c
@@ -2534,7 +2534,7 @@ initable_init (GInitable *initable,
if ((connection->flags & G_DBUS_CONNECTION_FLAGS_AUTHENTICATION_SERVER) ||
(connection->flags & G_DBUS_CONNECTION_FLAGS_AUTHENTICATION_ALLOW_ANONYMOUS))
{
- g_set_error_literal (error,
+ g_set_error_literal (&connection->initialization_error,
G_IO_ERROR,
G_IO_ERROR_INVALID_ARGUMENT,
_("Unsupported flags encountered when constructing a client-side connection"));