Merge lp:~sergiusens/account-polld/application-names into lp:~ubuntu-push-hackers/account-polld/trunk

[Sergio Schvezov]

Use application names instead of 'Notifications' to enable push messages.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:79
http://jenkins.qa.ubuntu.com/job/account-polld-ci/79/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/account-polld-utopic-amd64-ci/79
    SUCCESS: http://jenkins.qa.ubuntu.com/job/account-polld-utopic-armhf-ci/79
        deb: http://jenkins.qa.ubuntu.com/job/account-polld-utopic-armhf-ci/79/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/account-polld-utopic-i386-ci/79

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/account-polld-ci/79/rebuild

review: Approve (continuous-integration)

[lp:~sergiusens/account-polld/application-names]

80. By Sergio Schvezov on 2014-09-02

Using service names instead of the service type to match applications.
Fixing the facebook icon.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:80
http://jenkins.qa.ubuntu.com/job/account-polld-ci/80/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/account-polld-utopic-amd64-ci/80
    SUCCESS: http://jenkins.qa.ubuntu.com/job/account-polld-utopic-armhf-ci/80
        deb: http://jenkins.qa.ubuntu.com/job/account-polld-utopic-armhf-ci/80/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/account-polld-utopic-i386-ci/80

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/account-polld-ci/80/rebuild

review: Approve (continuous-integration)

[Alberto Mardegan (mardy)]

I'm not sure why do you want to have multiple application files, and not just one. The only reason why you might want to do that, is if you want to have different icons or application name shown under the accounts.
I guess this is more of a UI design question, but to me the proposed change doesn't look like an improvement: you are using the facebook/gmail/twitter icons and "Facebook", "GMail", "Twitter" as names -- but this is not descriptive at all: when the user will open the facebook account settings, he will just see one more line with the facebook icon and the "Facebook" name. In other ideas, he will have no idea what this application is or does. I would vote for having a single .application and .desktop file, with an icon specific to notifications and a name like "Push notifications" or something like that.

Also, we were talking with Ted about having the notification service use the same .service files as the webapps; I'm not sure if a decision has been reached, but in that case account-polld wouldn't need to ship .application or .desktop files at all.

[Alberto Mardegan (mardy)]

review: Needs Information

Unmerged revisions

80. By Sergio Schvezov on 2014-09-02

Using service names instead of the service type to match applications.
Fixing the facebook icon.

79. By Sergio Schvezov on 2014-09-02

Using real app names.

=== added file 'data/account-polld-facebook.application'
--- data/account-polld-facebook.application	1970-01-01 00:00:00 +0000
+++ data/account-polld-facebook.application	2014-09-02 20:51:51 +0000
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<application id="account-polld-facebook">
+  <description>Account Polling</description>
+  <desktop-entry>account-polld-facebook.desktop</desktop-entry>
+  <translations>account-polld</translations>
+
+  <services>
+    <service id="facebook-poll">
+      <description>Receive notifications for this account</description>
+    </service>
+  </services>
+</application>

=== added file 'data/account-polld-facebook.desktop'
--- data/account-polld-facebook.desktop	1970-01-01 00:00:00 +0000
+++ data/account-polld-facebook.desktop	2014-09-02 20:51:51 +0000
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Categories=Office;
+Exec=
+GenericName=account-polld-facebook
+Name=Facebook
+NoDisplay=true
+Terminal=false
+Type=Application
+Icon=facebook
+X-Ubuntu-Gettext-Domain=account-polld

=== added file 'data/account-polld-gmail.application'
--- data/account-polld-gmail.application	1970-01-01 00:00:00 +0000
+++ data/account-polld-gmail.application	2014-09-02 20:51:51 +0000
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<application id="account-polld-gmail">
+  <description>Account Polling</description>
+  <desktop-entry>account-polld-gmail.desktop</desktop-entry>
+  <translations>account-polld</translations>
+
+  <services>
+    <service id="google-gmail-poll">
+      <description>Receive notifications for this account</description>
+    </service>
+  </services>
+</application>

=== added file 'data/account-polld-gmail.desktop'
--- data/account-polld-gmail.desktop	1970-01-01 00:00:00 +0000
+++ data/account-polld-gmail.desktop	2014-09-02 20:51:51 +0000
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Categories=Office;
+Exec=
+GenericName=account-polld
+Name=Gmail
+NoDisplay=true
+Terminal=false
+Type=Application
+Icon=gmail
+X-Ubuntu-Gettext-Domain=account-polld

=== renamed file 'data/account-polld.application' => 'data/account-polld-twitter.application'
--- data/account-polld.application	2014-07-24 05:36:57 +0000
+++ data/account-polld-twitter.application	2014-09-02 20:51:51 +0000
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<application id="account-polld">
+<application id="account-polld-twitter">
   <description>Account Polling</description>
-  <desktop-entry>account-polld.desktop</desktop-entry>
+  <desktop-entry>account-polld-twitter.desktop</desktop-entry>
   <translations>account-polld</translations>
 
-  <service-types>
-    <service-type id="account-polld">
+  <services>
+    <service id="twitter-poll">
       <description>Receive notifications for this account</description>
-    </service-type>
-  </service-types>
+    </service>
+  </services>
 </application>

=== renamed file 'data/account-polld.desktop' => 'data/account-polld-twitter.desktop'
--- data/account-polld.desktop	2014-08-01 04:02:35 +0000
+++ data/account-polld-twitter.desktop	2014-09-02 20:51:51 +0000
@@ -1,10 +1,10 @@
 [Desktop Entry]
 Categories=Office;
 Exec=
-GenericName=account-polld
-Name=Notifications
+GenericName=account-polld-twitter
+Name=Twitter
 NoDisplay=true
 Terminal=false
 Type=Application
-Icon=indicator-messages
+Icon=twitter
 X-Ubuntu-Gettext-Domain=account-polld

=== modified file 'debian/control'
--- debian/control	2014-08-24 00:04:44 +0000
+++ debian/control	2014-09-02 20:51:51 +0000
@@ -20,6 +20,7 @@
 Homepage: https://launchpad.net/account-polld
 Vcs-Browser: http://bazaar.launchpad.net/~phablet-team/account-polld/trunk/files
 Vcs-Bzr: lp:account-polld
+X-Ubuntu-Use-Langpack: yes
 
 Package: account-polld
 Architecture: any
@@ -33,4 +34,3 @@
  communicates with the postal service provided by the ubuntu push client
  to expose notifications for the click webapps for the aforementioned
  services.
-X-Ubuntu-Use-Langpack: yes

=== modified file 'debian/rules'
--- debian/rules	2014-08-28 18:35:13 +0000
+++ debian/rules	2014-09-02 20:51:51 +0000
@@ -25,13 +25,13 @@
 		${CURDIR}/debian/account-polld/usr/share/accounts/services \
 		${CURDIR}/debian/account-polld/usr/share/accounts/service_types \
 		${CURDIR}/debian/account-polld/usr/share/applications
-	cp ${CURDIR}/data/account-polld.application \
+	cp ${CURDIR}/data/account-polld-*.application \
 		${CURDIR}/debian/account-polld/usr/share/accounts/applications/
 	cp ${CURDIR}/data/*.service \
 		${CURDIR}/debian/account-polld/usr/share/accounts/services/
 	cp ${CURDIR}/data/account-polld.service-type \
 		${CURDIR}/debian/account-polld/usr/share/accounts/service_types/
-	cp ${CURDIR}/data/account-polld.desktop \
+	cp ${CURDIR}/data/account-polld-*.desktop \
 		${CURDIR}/debian/account-polld/usr/share/applications/
 	# translations
 	appname=account-polld; \