Merge lp:~mardy/signon-ui/lp1237496 into lp:signon-ui

[Alberto Mardegan]

Invoke signon-ui with the desktop-file-hint

Also, fix the anchoring in DefaultPage.qml

Invoke signon-ui with the desktop-file-hint

Also, fix the anchoring in DefaultPage.qml

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:116
http://jenkins.qa.ubuntu.com/job/signon-ui-ci/38/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/signon-ui-saucy-amd64-ci/18

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/signon-ui-ci/38/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:118
http://jenkins.qa.ubuntu.com/job/signon-ui-ci/39/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/signon-ui-saucy-amd64-ci/19

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/signon-ui-ci/39/rebuild

review: Approve (continuous-integration)

[Ken VanDine (ken-vandine)]

Disapproving for now, it does fix the crash but I don't think it really works. It adds an extra entry to the running apps, which has no UI for a user to switch to. And when browser-process takes focus, signon-ui suspends.

review: Disapprove

Unmerged revisions

118. By Alberto Mardegan on 2013-10-10

Update bzrignore

117. By Alberto Mardegan on 2013-10-10

Fix DefaultPage.qml

116. By Alberto Mardegan on 2013-10-10

Start signon-ui with desktop-file-hint

=== modified file '.bzrignore'
--- .bzrignore	2013-06-17 11:21:13 +0000
+++ .bzrignore	2013-10-10 14:04:40 +0000
@@ -26,6 +26,7 @@
 src/com.nokia.singlesignonui.service
 src/signon-ui
 src/signon_ui_adaptor.*
+src/signon-ui.desktop
 src/webcredentials_adaptor.*
 tests/unit/signon-ui-unittest
 tests/unit/tst_inactivity_timer

=== modified file 'src/browser-process/DefaultPage.qml'
--- src/browser-process/DefaultPage.qml	2013-10-08 14:49:13 +0000
+++ src/browser-process/DefaultPage.qml	2013-10-10 14:04:40 +0000
@@ -5,10 +5,8 @@
     Loader {
         id: loader
         anchors {
-            top: parent.top
-            left: parent.left
-            right: parent.right
-            bottom: osk.top
+            fill: parent
+            bottomMargin: osk.height
         }
         focus: true
         sourceComponent: browserComponent

=== modified file 'src/com.nokia.singlesignonui.service.in'
--- src/com.nokia.singlesignonui.service.in	2013-06-10 11:04:32 +0000
+++ src/com.nokia.singlesignonui.service.in	2013-10-10 14:04:40 +0000
@@ -1,3 +1,3 @@
 [D-BUS Service]
 Name=com.nokia.singlesignonui
-Exec=$${INSTALL_PREFIX}/bin/signon-ui
+Exec=$${INSTALL_PREFIX}/bin/signon-ui --desktop_file_hint=$${INSTALL_PREFIX}/share/applications/signon-ui.desktop

=== added file 'src/signon-ui.desktop.in'
--- src/signon-ui.desktop.in	1970-01-01 00:00:00 +0000
+++ src/signon-ui.desktop.in	2013-10-10 14:04:40 +0000
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Encoding=UTF-8
+Version=1.0
+Name=Account authentication
+Comment=Login to online accounts
+Exec=$${target.path}/$$TARGET
+Icon=
+Type=Application
+Terminal=false
+NoDisplay=true
+X-Ubuntu-Gettext-Domain=signon-ui

=== modified file 'src/signon-ui.pro'
--- src/signon-ui.pro	2013-10-04 17:15:49 +0000
+++ src/signon-ui.pro	2013-10-10 14:04:40 +0000
@@ -116,7 +116,8 @@
 
 QMAKE_SUBSTITUTES += \
     com.canonical.indicators.webcredentials.service.in \
-    com.nokia.singlesignonui.service.in
+    com.nokia.singlesignonui.service.in \
+    signon-ui.desktop.in
 
 service.path = $${INSTALL_PREFIX}/share/dbus-1/services
 service.files = \
@@ -124,6 +125,10 @@
     com.nokia.singlesignonui.service
 INSTALLS += service
 
+desktop.path = $${INSTALL_PREFIX}/share/applications
+desktop.files += signon-ui.desktop
+INSTALLS += desktop
+
 # Help file for HTTP authentication warning
 !isEmpty(HTTP_WARNING_HELP) {
     DEFINES += HTTP_WARNING_HELP=\\\"$${HTTP_WARNING_HELP}\\\"