LightDM Qt Greeter

Merge lp:~agateau/lightdm-qt-greeter/use-greeter-hostname into lp:lightdm-qt-greeter

  1. use-greeter-hostname
  2. Merge into trunk
Proposed by Aurélien Gâteau
Status: Merged
Approved by: Robert Ancell
Approved revision: 3
Merged at revision: 3
Proposed branch: lp:~agateau/lightdm-qt-greeter/use-greeter-hostname
Merge into: lp:lightdm-qt-greeter
Diff against target: 19 lines (+1/-2)
1 file modified
src/loginprompt.cpp (+1/-2)
To merge this branch: bzr merge lp:~agateau/lightdm-qt-greeter/use-greeter-hostname
Reviewer Review Type Date Requested Status
David Edmundson Approve
Review via email: mp+87947@code.launchpad.net

Description of the change

Use Greeter::hostname() instead of System::hostname(). When this is in we can remove System::hostname() from liblightdm-qt.

To post a comment you must log in.
Revision history for this message
David Edmundson (david.edmundson) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/loginprompt.cpp'
2--- src/loginprompt.cpp 2011-11-30 02:26:44 +0000
3+++ src/loginprompt.cpp 2012-01-09 15:59:23 +0000
4@@ -13,7 +13,6 @@
5 #include "ui_loginprompt.h"
6
7 #include <QLightDM/UsersModel>
8-#include <QLightDM/System>
9
10 #include <QtCore/QDebug>
11 #include <QtGui/QListWidgetItem>
12@@ -26,7 +25,7 @@
13 ui->setupUi(this);
14 ui->feedbackLabel->setText(QString());
15
16- ui->hostnameLabel->setText(QLightDM::System::hostname());
17+ ui->hostnameLabel->setText(greeter->hostname());
18
19 ui->userListView->setModel(new QLightDM::UsersModel(this));
20

Subscribers

People subscribed via source and target branches