GDBusConnection: propagate error correctly if flags are inappropriate
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Mon, 28 Nov 2011 17:54:46 +0000 (17:54 +0000)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Mon, 5 Dec 2011 18:15:19 +0000 (18:15 +0000)
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>
gio/gdbusconnection.c

index b214fff..34368e2 100644 (file)
@@ -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"));