aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorConor Curran <conor.curran@canonical.com>2011-09-07 21:30:12 +0100
committerConor Curran <conor.curran@canonical.com>2011-09-07 21:30:12 +0100
commitba69c336b75e608f2fced7d63bd3e8f2722ef82f (patch)
treecfde310d4d0a1e7681f4199df6002a45ccc7caca
parent433512c195ed7faac8d834bd648f32aaff380827 (diff)
parent9da9edc5c66534d80ab211bad95f8c97b72c180c (diff)
downloadayatana-indicator-session-ba69c336b75e608f2fced7d63bd3e8f2722ef82f.tar.gz
ayatana-indicator-session-ba69c336b75e608f2fced7d63bd3e8f2722ef82f.tar.bz2
ayatana-indicator-session-ba69c336b75e608f2fced7d63bd3e8f2722ef82f.zip
merge null protection branch
-rw-r--r--src/users-service-dbus.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/users-service-dbus.c b/src/users-service-dbus.c
index 4b41f4b..0fa751d 100644
--- a/src/users-service-dbus.c
+++ b/src/users-service-dbus.c
@@ -931,9 +931,11 @@ users_service_dbus_can_activate_session (UsersServiceDbus *self)
G_TYPE_BOOLEAN, &can_activate,
G_TYPE_INVALID))
{
- g_warning ("Failed to determine if seat can activate sessions: %s", error->message);
- g_error_free (error);
-
+ if (error != NULL){
+ g_warning ("Failed to determine if seat can activate sessions: %s",
+ error->message);
+ g_error_free (error);
+ }
return FALSE;
}