Changeset 573656

Timestamp:

Aug 17, 2012, 7:02:31 PM (10 years ago)

Author:

rene <rene@…>

Branches:

ng_0.9

Children:

0dcd77

Parents:

03d29f

Message:

adaptions for missing 3pane window (if called by mailto:)

File:

• modules/vI_rdfDatasource.js (modified) (3 diffs)

modules/vI_rdfDatasource.js

@@ -32 +32 @@
 Components.utils.import("resource://gre/modules/Services.jsm");
 
+// if no 3pane-window found, return current window
 function get3PaneWindow() {
-  return Components.classes['@mozilla.org/appshell/window-mediator;1']
-    .getService(Components.interfaces.nsIWindowMediator)
-    .getMostRecentWindow("mail:3pane");
+  var windowMediator = Components.classes['@mozilla.org/appshell/window-mediator;1']
+    .getService(Components.interfaces.nsIWindowMediator);
+  var mail3paneWindow = windowMediator.getMostRecentWindow("mail:3pane");
+  if (!mail3paneWindow) return windowMediator.getMostRecentWindow(null);
+  return mail3paneWindow;
 };
 
@@ -42 +45 @@
     if (this._rdfFileName) this.init();
     if (!dontRegisterObserver) this.AccountManagerObserver.register();
-    this._extVersion = get3PaneWindow().virtualIdentityExtension.extensionVersion;
+    try {
+      this._extVersion = get3PaneWindow().virtualIdentityExtension.extensionVersion;
+    } catch (e) { }
 }
 
@@ -165 +170 @@
     // **************    RDF UPGRADE CODE    ****************************************************
     extUpgradeRequired: function() {
+        if (!this._extVersion) return false;
         var oldExtVersion = this.getCurrentExtFileVersion()
         var versionChecker = Components.classes["@mozilla.org/xpcom/version-comparator;1"]