update comments & documentation to reflect that we've replaced consolekit and login1

8 files changed, 10 insertions, 17 deletions

diff --git a/INSTALL b/INSTALL
index 2920993..772eae0 100644
--- a/INSTALL
+++ b/INSTALL
@@ -29,11 +29,10 @@ Runtime DBus dependencies
  - com.canonical.indicators.webcredentials
  - org.freedesktop.Accounts
  - org.freedesktop.Accounts.User
- - org.freedesktop.ConsoleKit.Manager
- - org.freedesktop.ConsoleKit.Seat
- - org.freedesktop.ConsoleKit.Session
  - org.freedesktop.DisplayManager.Seat
- - org.freedesktop.UPower
+ - org.freedesktop.login1.Manager
+ - org.freedesktop.login1.Seat
+ - org.freedesktop.login1.User
  - org.gnome.ScreenSaver
  - org.gnome.SessionManager
  - org.gnome.SessionManager.EndSessionDialog
diff --git a/src/backend-dbus/actions.h b/src/backend-dbus/actions.h
index 0c8bed2..d3d722d 100644
--- a/src/backend-dbus/actions.h
+++ b/src/backend-dbus/actions.h
@@ -42,7 +42,7 @@ typedef struct _IndicatorSessionActionsDbusClass   IndicatorSessionActionsDbusCl
 
 /**
  * An implementation of IndicatorSessionActions that gets its user information
- * from org.freedesktop.ConsoleKit and org.freedesktop.Accounts over DBus.
+ * from org.freedesktop.login1 org.freedesktop.DisplayManager over DBus.
  */
 struct _IndicatorSessionActionsDbus
 {
diff --git a/src/backend-dbus/guest.h b/src/backend-dbus/guest.h
index aca5588..73bb3ca 100644
--- a/src/backend-dbus/guest.h
+++ b/src/backend-dbus/guest.h
@@ -42,7 +42,7 @@ typedef struct _IndicatorSessionGuestDbusClass   IndicatorSessionGuestDbusClass;
 
 /**
  * An implementation of IndicatorSessionGuest that gets its user information
- * from org.freedesktop.ConsoleKit and org.freedesktop.Accounts over DBus.
+ * from org.freedesktop.login1 and org.freedesktop.Accounts over DBus.
  */
 struct _IndicatorSessionGuestDbus
 {
diff --git a/src/backend-dbus/users.h b/src/backend-dbus/users.h
index a9aaecf..d6c17df 100644
--- a/src/backend-dbus/users.h
+++ b/src/backend-dbus/users.h
@@ -42,7 +42,7 @@ typedef struct _IndicatorSessionUsersDbusClass   IndicatorSessionUsersDbusClass;
 
 /**
  * An implementation of IndicatorSessionUsers that gets its user information
- * from org.freedesktop.ConsoleKit and org.freedesktop.Accounts over DBus.
+ * from org.freedesktop.login1 and org.freedesktop.Accounts over DBus.
  */
 struct _IndicatorSessionUsersDbus
 {
diff --git a/tests/backend-dbus/test-actions.cc b/tests/backend-dbus/test-actions.cc
index 410a02a..20e2521 100644
--- a/tests/backend-dbus/test-actions.cc
+++ b/tests/backend-dbus/test-actions.cc
@@ -319,12 +319,9 @@ TEST_F (Actions, SwitchToGuest)
 {
   // allow guests
   dm_seat->set_guest_allowed (true);
-  MockUser * guest_user;
-  //int guest_session_tag;
-//  MockConsoleKitSession * guest_ck_session;
 
   // set up a guest
-  guest_user = new MockUser (loop, conn, "guest-zzbEVV", "Guest", 10);
+  MockUser * guest_user = new MockUser (loop, conn, "guest-zzbEVV", "Guest", 10);
   guest_user->set_system_account (true);
   accounts->add_user (guest_user);
   int guest_session_tag = login1_manager->add_session (login1_seat, guest_user);
diff --git a/tests/backend-mock-actions.h b/tests/backend-mock-actions.h
index bd9ed47..96c51be 100644
--- a/tests/backend-mock-actions.h
+++ b/tests/backend-mock-actions.h
@@ -37,8 +37,7 @@ typedef struct _IndicatorSessionActionsMockPriv    IndicatorSessionActionsMockPr
 typedef struct _IndicatorSessionActionsMockClass   IndicatorSessionActionsMockClass;
 
 /**
- * An implementation of IndicatorSessionActions that gets its user information
- * from org.freedesktop.ConsoleKit and org.freedesktop.Accounts over DBus.
+ * An implementation of IndicatorSessionActions that lies about everything.
  */
 struct _IndicatorSessionActionsMock
 {
diff --git a/tests/backend-mock-guest.h b/tests/backend-mock-guest.h
index db6ce86..4a15c70 100644
--- a/tests/backend-mock-guest.h
+++ b/tests/backend-mock-guest.h
@@ -37,8 +37,7 @@ typedef struct _IndicatorSessionGuestMockPriv    IndicatorSessionGuestMockPriv;
 typedef struct _IndicatorSessionGuestMockClass   IndicatorSessionGuestMockClass;
 
 /**
- * An implementation of IndicatorSessionGuest that gets its user information
- * from org.freedesktop.ConsoleKit and org.freedesktop.Accounts over DBus.
+ * An implementation of IndicatorSessionGuest that lies about everything.
  */
 struct _IndicatorSessionGuestMock
 {
diff --git a/tests/backend-mock-users.h b/tests/backend-mock-users.h
index 7470ec9..513e799 100644
--- a/tests/backend-mock-users.h
+++ b/tests/backend-mock-users.h
@@ -37,8 +37,7 @@ typedef struct _IndicatorSessionUsersMockPriv    IndicatorSessionUsersMockPriv;
 typedef struct _IndicatorSessionUsersMockClass   IndicatorSessionUsersMockClass;
 
 /**
- * An implementation of IndicatorSessionUsers that gets its user information
- * from org.freedesktop.ConsoleKit and org.freedesktop.Accounts over DBus.
+ * An implementation of IndicatorSessionUsers that lies about everything.
  */
 struct _IndicatorSessionUsersMock
 {