[Pkg-mozext-commits] [greasemonkey] 02/15: Delay importing the actual sync service.

[David Prévot]

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

taffit pushed a commit to branch master
in repository greasemonkey.

commit 011ab32f7e22d80426cef0a852d899da8f6758b1
Author: Ventero <ventero at ventero.de>
Date:   Fri Feb 7 17:36:31 2014 +0100

    Delay importing the actual sync service.
    
    This should prevent conflicts with the master password dialog
    showing up during browser startup.
    
    (Hopefully) fixes #1852.
---
 modules/sync.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/sync.js b/modules/sync.js
index 45c0df7..b4594da 100644
--- a/modules/sync.js
+++ b/modules/sync.js
@@ -18,7 +18,6 @@ var gSyncInitialized = false;
 var gWeave = {};
 Cu.import('resource://services-sync/engines.js', gWeave);
 Cu.import('resource://services-sync/record.js', gWeave);
-Cu.import('resource://services-sync/service.js', gWeave);
 Cu.import('resource://services-sync/status.js', gWeave);
 Cu.import('resource://services-sync/util.js', gWeave);
 
@@ -38,7 +37,9 @@ var SyncServiceObserver = {
 
     // This must be delayed until after the Greasemonkey service is set up.
     Cu.import('resource://greasemonkey/remoteScript.js');
-
+    // Also delay importing the actual Sync service to prevent conflicts with
+    // the master password dialog during browser startup. See #1852.
+    Cu.import('resource://services-sync/service.js', gWeave);
     gWeave.Service.engineManager.register(ScriptEngine);
   },
 

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