[gdm/wip/initial-setup2: 29/32] initial-setup: fix simple-slave user creation code



commit 1504ccd52374df11484191cb9374c6123204fc14
Author: Ray Strode <rstrode redhat com>
Date:   Wed Apr 11 11:53:38 2012 -0400

    initial-setup: fix simple-slave user creation code
    
    accountsservice library was ported to gdbus so the errors are
    different now.

 daemon/gdm-simple-slave.c |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/daemon/gdm-simple-slave.c b/daemon/gdm-simple-slave.c
index 82f86df..13b1deb 100644
--- a/daemon/gdm-simple-slave.c
+++ b/daemon/gdm-simple-slave.c
@@ -36,6 +36,7 @@
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <glib/gstdio.h>
+#include <gio/gio.h>
 #include <glib-object.h>
 
 #include <act/act-user-manager.h>
@@ -1395,11 +1396,11 @@ create_initial_setup_user (GdmSimpleSlave *slave)
         user = act_user_manager_create_user (act, username, "", 0, &error);
         if (user == NULL) {
                 const gchar *e;
-                if (error->domain == DBUS_GERROR &&
-                    error->code == DBUS_GERROR_REMOTE_EXCEPTION)
-                        e = dbus_g_error_get_name (error);
-                else
+                if (g_dbus_error_is_remote_error (error)) {
+                        e = g_dbus_error_get_remote_error (error);
+                } else {
                         e = NULL;
+		}
 
                 g_warning ("Creating user '%s' failed: %s / %s", username, e, error->message);
 



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