Comment 4 for bug 1028381

Revision history for this message
david.barbion (david-barbion) wrote :

Here is a little patch that make it works (at least with firefox).

--- /usr/share/unity-webapps/userscripts/GMail.user.js.orig 2012-08-21 23:34:43.400132158 +0200
+++ /usr/share/unity-webapps/userscripts/GMail.user.js 2012-08-22 00:17:35.657984099 +0200
@@ -106,11 +106,17 @@
             setTimeout(wait, 1000);
             return;
         }
- var login = doc.evaluate('//div[@role="navigation"]/div/div[1]/div[3]/div/ol/li[4]/div/div/div/div[2]/span[2]', doc, null, XPathResult.ANY_UNORDERED_NODE_TYPE, null).singleNodeValue.textContent;
- if (login.indexOf("@") === -1) {
- login = "";
+ try {
+ var gmaillogin = doc.evaluate('//div[@role="navigation"]/div/div[1]/div[3]/div/ol/li[4]/div/div/div/div[2]/span[2]', doc, null, XPathResult.ANY_UNORDERED_NODE_TYPE, null).singleNodeValue.textContent;
+ }catch(err) {
+ var gmaillogin="";
         }
-
+ try {
+ var gappslogin = doc.evaluate('//div[@role="navigation"]/div/div[1]/div[3]/div/ol/li[4]/div/div/div/div[3]/span[2]', doc, null, XPathResult.ANY_UNORDERED_NODE_TYPE, null).singleNodeValue.textContent;
+ }catch(err) {
+ var gappslogin="";
+ }
+ login = gmaillogin.indexOf("@") != -1 ? gmaillogin : gappslogin.indexOf("@") != -1 ? gappslogin : "";
         Unity.init({ name: "GMail",
                      login: login,
        iconUrl: "icon://gmail",