Merge branch 'jb51377_fix' into 'master'

[nemo-systemsettings] Allow UserInfo::type to change. Fixes JB#51377

See merge request mer-core/nemo-qml-plugin-systemsettings!157

src/userinfo.cpp

@@ -464,8 +464,17 @@ void UserInfo::replace(QSharedPointer<UserInfoPrivate> other)
         emit displayNameChanged();
     }
 
-    if (old->m_uid != d_ptr->m_uid)
+    if (old->m_uid != d_ptr->m_uid) {
         emit uidChanged();
+        // Having any of these means that type must have changed
+        if (old->m_uid == DeviceOwnerId || old->m_uid == SAILFISH_USERMANAGER_GUEST_UID
+                || d_ptr->m_uid == DeviceOwnerId || d_ptr->m_uid == SAILFISH_USERMANAGER_GUEST_UID) {
+            emit typeChanged();
+            // Technically this would mean that displayName can change
+            // but then username was almost certainly also changed
+            // and the signal has been already emitted
+        }
+    }
 
     if (old->m_loggedIn != d_ptr->m_loggedIn)
         emit currentChanged();

src/userinfo.h

@@ -49,7 +49,7 @@ class SYSTEMSETTINGS_EXPORT UserInfo: public QObject
     Q_PROPERTY(QString displayName READ displayName NOTIFY displayNameChanged)
     Q_PROPERTY(QString username READ username NOTIFY usernameChanged)
     Q_PROPERTY(QString name READ name NOTIFY nameChanged)
-    Q_PROPERTY(UserType type READ type CONSTANT)
+    Q_PROPERTY(UserType type READ type NOTIFY typeChanged)
     Q_PROPERTY(int uid READ uid WRITE setUid NOTIFY uidChanged)
     Q_PROPERTY(bool current READ current NOTIFY currentChanged)
     Q_PROPERTY(bool alone READ alone NOTIFY aloneChanged)
@@ -94,6 +94,7 @@ class SYSTEMSETTINGS_EXPORT UserInfo: public QObject
     void displayNameChanged();
     void usernameChanged();
     void nameChanged();
+    void typeChanged();
     void uidChanged();
     void currentChanged();
     void aloneChanged();