Merge lp:~verzegnassi-stefano/ubuntu-terminal-app/fix-1559892 into lp:~ubuntu-terminal-dev/ubuntu-terminal-app/reboot

Proposed by Stefano Verzegnassi
Status: Merged
Approved by: Stefano Verzegnassi
Approved revision: 192
Merged at revision: 192
Proposed branch: lp:~verzegnassi-stefano/ubuntu-terminal-app/fix-1559892
Merge into: lp:~ubuntu-terminal-dev/ubuntu-terminal-app/reboot
Diff against target: 34 lines (+30/-0)
1 file modified
src/app/qml/NotifyDialog.qml (+30/-0)
To merge this branch: bzr merge lp:~verzegnassi-stefano/ubuntu-terminal-app/fix-1559892
Reviewer Review Type Date Requested Status
Jenkins Bot continuous-integration Approve
Ubuntu Terminal Developers Pending
Review via email: mp+290129@code.launchpad.net

Commit message

Added missing 'NotifyDialog.qml' file, so that app can properly notify whether a wrong password has been typed during PAM auth

Description of the change

Added missing 'NotifyDialog.qml' file, so that app can properly notify whether a wrong password has been typed during PAM auth

To post a comment you must log in.
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'src/app/qml/NotifyDialog.qml'
2--- src/app/qml/NotifyDialog.qml 1970-01-01 00:00:00 +0000
3+++ src/app/qml/NotifyDialog.qml 2016-03-25 17:34:25 +0000
4@@ -0,0 +1,30 @@
5+/*
6+ * Copyright (C) 2013 Canonical Ltd
7+ *
8+ * This program is free software: you can redistribute it and/or modify
9+ * it under the terms of the GNU General Public License version 3 as
10+ * published by the Free Software Foundation.
11+ *
12+ * This program is distributed in the hope that it will be useful,
13+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
14+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15+ * GNU General Public License for more details.
16+ *
17+ * You should have received a copy of the GNU General Public License
18+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
19+ *
20+ * Authored by: Arto Jalkanen <ajalkane@gmail.com>
21+ */
22+import QtQuick 2.4
23+import Ubuntu.Components 1.3
24+import Ubuntu.Components.Popups 1.3
25+
26+Dialog {
27+ id: root
28+ Button {
29+ text: i18n.tr("Ok")
30+ onClicked: {
31+ PopupUtils.close(root)
32+ }
33+ }
34+}

Subscribers

People subscribed via source and target branches