summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Koegel <eric.koegel@gmail.com>2014-10-19 09:29:10 +0300
committerEric Koegel <eric.koegel@gmail.com>2014-10-19 09:29:10 +0300
commitcdcdc333edf2c78cafc93b488615a6e22daa9a63 (patch)
tree355810b1e99791439e14fd863656bb4b6800aa69
parentf447a453760cbdd016b5bae079af0cf2a6ac6273 (diff)
downloadConsoleKit2-cdcdc333edf2c78cafc93b488615a6e22daa9a63.tar.gz
Fix hibernate on FreeBSD
And g_assert_nonnull requires glib 2.40 so we'll do without it.
-rw-r--r--src/ck-sysdeps-freebsd.c2
-rw-r--r--src/test-inhibit.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/ck-sysdeps-freebsd.c b/src/ck-sysdeps-freebsd.c
index 07d0b36..caa9869 100644
--- a/src/ck-sysdeps-freebsd.c
+++ b/src/ck-sysdeps-freebsd.c
@@ -587,7 +587,7 @@ ck_system_can_suspend (void)
}
gboolean
-ck_system_can_suspend (void)
+ck_system_can_hibernate (void)
{
return freebsd_supports_sleep_state ("S4");
}
diff --git a/src/test-inhibit.c b/src/test-inhibit.c
index 4287831..e2495f6 100644
--- a/src/test-inhibit.c
+++ b/src/test-inhibit.c
@@ -61,7 +61,7 @@ test_create_inhibit (void)
inhibit = ck_inhibit_new ();
/* Verify we got a valid inhibit object */
- g_assert_nonnull (inhibit);
+ g_assert (inhibit != NULL);
g_assert (CK_IS_INHIBIT (inhibit));
}
@@ -118,7 +118,7 @@ static void
test_unref_inhibit (void)
{
/* Verify we have an inhibit object */
- g_assert_nonnull (inhibit);
+ g_assert (inhibit != NULL);
g_assert (CK_IS_INHIBIT (inhibit));
g_object_unref (inhibit);