Merge lp:~david.edmundson/lightdm/lightdm into lp:lightdm

[David Edmundson]

Exposes extra Q_PROPERTIES in greeter.

Allows selecting the correct default user/session in LightDM

[lp:~david.edmundson/lightdm/lightdm]

1515. By Robert Ancell on 2012-06-20

Releasing 1.3.1

1516. By Robert Ancell on 2012-06-20

Merge in translation changes

1517. By Robert Ancell on 2012-06-21

Handle clearenv() not being defined

1518. By Robert Ancell on 2012-06-21

Fix compilation with GCC 4.7

1519. By Launchpad Translations on behalf of lightdm-team on 2012-06-21

Launchpad automatic translations update.

[Robert Ancell (robert-ancell)]

Looks good to me

review: Approve

[lp:~david.edmundson/lightdm/lightdm]

1520. By David Edmundson on 2012-06-22

Expose remaining properties in QLightDM::Greeter

1521. By Launchpad Translations on behalf of lightdm-team on 2012-06-30

Launchpad automatic translations update.

1522. By Robert Ancell on 2012-07-02

Document seat type in example config

1523. By Robert Ancell on 2012-07-05

Update .bzrignore for liblightdm-qt-2.pc renaming

1524. By Robert Ancell on 2012-07-05

Ignore src/lightdm-guest-session-wrapper

1525. By Launchpad Translations on behalf of lightdm-team on 2012-07-10

Launchpad automatic translations update.

1526. By Robert Ancell on 2012-07-13

Only add utmp entry after child has forked (and have a valid PID)

[Robert Ancell (robert-ancell)]

This appears to be merged?

=== modified file 'liblightdm-qt/QLightDM/greeter.h'
--- liblightdm-qt/QLightDM/greeter.h	2012-03-08 05:13:45 +0000
+++ liblightdm-qt/QLightDM/greeter.h	2012-06-16 09:00:26 +0000
@@ -26,9 +26,17 @@
     Q_OBJECT
     
     Q_PROPERTY(bool authenticated READ isAuthenticated ); //NOTFIY authenticationComplete
-
+    Q_PROPERTY(QString authenticationUser READ authenticationUser );
+    
+    Q_PROPERTY(QString defaultSession READ defaultSessionHint CONSTANT);
+    Q_PROPERTY(QString selectUser READ selectUserHint CONSTANT);
+    Q_PROPERTY(bool selectGuest READ selectGuestHint CONSTANT);
+    
     Q_PROPERTY(QString hostname READ hostname CONSTANT);
+    Q_PROPERTY(bool hasGuestAccount READ hasGuestAccountHint CONSTANT);
+    Q_PROPERTY(bool locked READ lockHint CONSTANT);
 
+    
 public:
     enum PromptType {
         PromptTypeQuestion,
@@ -51,6 +59,7 @@
     bool hasGuestAccountHint() const;
     QString selectUserHint() const;
     bool selectGuestHint() const;
+    
     QString autologinUserHint() const;
     bool autologinGuestHint() const;
     int autologinTimeoutHint() const;