[Pkg-mozext-commits] [gcontactsync] 19/88: Don't create the new AB unless the user choses to synchronize with it.

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository gcontactsync.

commit 05ccd7d2ed68d24daad985a7e3d3aae1abad390d
Author: Josh Geenen <joshgeenen at gmail.com>
Date:   Sat Dec 28 11:36:37 2013 -0600

    Don't create the new AB unless the user choses to synchronize with it.
---
 src/content/AccountSetupWizard.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/content/AccountSetupWizard.js b/src/content/AccountSetupWizard.js
index 302e605..22518a0 100644
--- a/src/content/AccountSetupWizard.js
+++ b/src/content/AccountSetupWizard.js
@@ -209,6 +209,7 @@ com.gContactSync.AccountSetupWizard = {
       // Skip over address books that are already synchronized
       if (abs.hasOwnProperty(uri) && !abs[uri].mPrefs.Username) {
         abNameElem.appendItem(abs[uri].getName(), uri);
+        alert(abs[uri].getName());
         if (abs[uri].getName().toLowerCase() === aSearch) {
           selectedIndex = i;
         }
@@ -222,7 +223,7 @@ com.gContactSync.AccountSetupWizard = {
       for (var j = 1; true; ++j) {
         var ab = com.gContactSync.GAbManager.getGAbByName(name, true);
         if (!ab || !ab.mPrefs.Username) {break;}
-        name = this.mEmailAddress + " (" + j + ")";
+        name = aSearch + " (" + j + ")";
       }
       abNameElem.insertItemAt(0, name, 0);
       selectedIndex = 0;
@@ -239,8 +240,8 @@ com.gContactSync.AccountSetupWizard = {
     if (!name) {
       return;
     }
-    var ab = com.gContactSync.GAbManager.getGAbByName(name);
-    if (ab.mPrefs.Username) {
+    var ab = com.gContactSync.GAbManager.getGAbByName(name, true);
+    if (ab && ab.mPrefs.Username) {
       com.gContactSync.alertWarning(com.gContactSync.StringBundle.getStr("abAlreadySynchronized"));
       return;
     }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/gcontactsync.git