[glib/glib-2-30] GDBusConnection: propagate error correctly if flags are inappropriate



commit 44a1663aa97b9823243851c102ebedd5e24e638a
Author: Simon McVittie <simon mcvittie collabora co uk>
Date:   Mon Nov 28 17:54:46 2011 +0000

    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>

 gio/gdbusconnection.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/gio/gdbusconnection.c b/gio/gdbusconnection.c
index dcba472..73db7b5 100644
--- a/gio/gdbusconnection.c
+++ b/gio/gdbusconnection.c
@@ -2478,7 +2478,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"));



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]