diff options
author | Robert Ancell <robert.ancell@canonical.com> | 2013-07-09 17:32:31 +1200 |
---|---|---|
committer | Robert Ancell <robert.ancell@canonical.com> | 2013-07-09 17:32:31 +1200 |
commit | c679404406cf4e073058e8a1964cde4b7e5054d6 (patch) | |
tree | 0328833634743b27a45f3172f48119425c0fd24e /liblightdm-qt | |
parent | 65b9a34fc9a614071b1fec3a7802e19467f80a90 (diff) | |
download | lightdm-c679404406cf4e073058e8a1964cde4b7e5054d6.tar.gz |
Use a session type for different types of sessions
Diffstat (limited to 'liblightdm-qt')
-rw-r--r-- | liblightdm-qt/QLightDM/sessionsmodel.h | 6 | ||||
-rw-r--r-- | liblightdm-qt/sessionsmodel.cpp | 7 |
2 files changed, 7 insertions, 6 deletions
diff --git a/liblightdm-qt/QLightDM/sessionsmodel.h b/liblightdm-qt/QLightDM/sessionsmodel.h index 33a67655..dd200990 100644 --- a/liblightdm-qt/QLightDM/sessionsmodel.h +++ b/liblightdm-qt/QLightDM/sessionsmodel.h @@ -27,13 +27,13 @@ namespace QLightDM { //name is exposed as Qt::DisplayRole //comment is exposed as Qt::TooltipRole KeyRole = Qt::UserRole, - IdRole = KeyRole /** Deprecated */ + IdRole = KeyRole, /** Deprecated */ + TypeRole }; enum SessionType { LocalSessions, - RemoteSessions, - MirSessions + RemoteSessions }; explicit SessionsModel(QObject *parent = 0); /** Deprecated. Loads local sessions*/ diff --git a/liblightdm-qt/sessionsmodel.cpp b/liblightdm-qt/sessionsmodel.cpp index 93295f38..8771c799 100644 --- a/liblightdm-qt/sessionsmodel.cpp +++ b/liblightdm-qt/sessionsmodel.cpp @@ -21,6 +21,7 @@ class SessionItem { public: QString key; + QString type; QString name; QString comment; }; @@ -58,9 +59,6 @@ void SessionsModelPrivate::loadSessions(SessionsModel::SessionType sessionType) case SessionsModel::RemoteSessions: ldmSessions = lightdm_get_remote_sessions(); break; - case SessionsModel::MirSessions: - ldmSessions = lightdm_get_mir_sessions(); - break; case SessionsModel::LocalSessions: /* Fall through*/ default: @@ -74,6 +72,7 @@ void SessionsModelPrivate::loadSessions(SessionsModel::SessionType sessionType) SessionItem session; session.key = QString::fromUtf8(lightdm_session_get_key(ldmSession)); + session.type = QString::fromUtf8(lightdm_session_get_session_type(ldmSession)); session.name = QString::fromUtf8(lightdm_session_get_name(ldmSession)); session.comment = QString::fromUtf8(lightdm_session_get_comment(ldmSession)); @@ -140,6 +139,8 @@ QVariant SessionsModel::data(const QModelIndex &index, int role) const switch (role) { case SessionsModel::KeyRole: return d->items[row].key; + case SessionsModel::TypeRole: + return d->items[row].type; case Qt::DisplayRole: return d->items[row].name; case Qt::ToolTipRole: |