Rename CK function to match the CK names

3 files changed, 10 insertions, 9 deletions

diff --git a/src/console-kit.c b/src/console-kit.c
index eb07ee0f..0a772ab1 100644
--- a/src/console-kit.c
+++ b/src/console-kit.c
@@ -38,7 +38,7 @@ load_ck_proxy (void)
 }
 
 gchar *
-ck_start_session (GVariantBuilder *parameters)
+ck_open_session (GVariantBuilder *parameters)
 {
     GVariant *result;
     gchar *cookie = NULL;
@@ -231,7 +231,7 @@ ck_unlock_session (const gchar *cookie)
 }
 
 void
-ck_end_session (const gchar *cookie)
+ck_close_session (const gchar *cookie)
 {
     GVariant *result;
     GError *error = NULL;
diff --git a/src/console-kit.h b/src/console-kit.h
index 1a631bbd..bc8a0893 100644
--- a/src/console-kit.h
+++ b/src/console-kit.h
@@ -16,11 +16,11 @@
 
 G_BEGIN_DECLS
 
-gchar *ck_start_session (GVariantBuilder *parameters);
+gchar *ck_open_session (GVariantBuilder *parameters);
 
 void ck_unlock_session (const gchar *cookie);
 
-void ck_end_session (const gchar *cookie);
+void ck_close_session (const gchar *cookie);
 
 G_END_DECLS
 
diff --git a/src/display.c b/src/display.c
index 9b89a8a5..fd1f4d93 100644
--- a/src/display.c
+++ b/src/display.c
@@ -345,7 +345,7 @@ cleanup_after_session (Display *display)
     /* Close ConsoleKit session */
     cookie = session_get_cookie (display->priv->session);
     if (getuid () == 0 && cookie)
-        ck_end_session (cookie);
+        ck_close_session (cookie);
 
     g_signal_handlers_disconnect_matched (display->priv->session, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, display);
     g_object_unref (display->priv->session);
@@ -509,10 +509,11 @@ create_session (Display *display, PAMSession *authentication, const gchar *sessi
         g_variant_builder_add (&parameters, "(sv)", "is-local", g_variant_new_boolean (TRUE));
 
         if (getuid () == 0)
-            cookie = ck_start_session (&parameters);
-
-        session_set_cookie (session, cookie);
-        g_free (cookie);
+        {
+            cookie = ck_open_session (&parameters);
+            session_set_cookie (session, cookie);
+            g_free (cookie);
+        }
     }
     else
         session_set_cookie (session, g_getenv ("XDG_SESSION_COOKIE"));