[Pkg-mozext-commits] [tabmixplus] 41/47: Unloaded tabs don't have an icon

[David Prévot]

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

taffit pushed a commit to branch upstream
in repository tabmixplus.

commit 7d9325d2b0f2e7bc0940c74df15ec8c8fca4e355
Author: onemen <tabmix.onemen at gmail.com>
Date:   Tue Sep 23 20:59:58 2014 +0300

    Unloaded tabs don't have an icon
---
 chrome/content/session/session.js      | 2 +-
 chrome/content/session/sessionStore.js | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/chrome/content/session/session.js b/chrome/content/session/session.js
index 8361b18..3e00ca6 100644
--- a/chrome/content/session/session.js
+++ b/chrome/content/session/session.js
@@ -2844,7 +2844,7 @@ try{
    saveTabData: function SM_saveTabData(aNode, aData) {
       this.setIntLiteral(aNode, "index",      aData.index);
       this.setIntLiteral(aNode, "tabPos",     aData.pos);
-      this.setLiteral   (aNode, "image",      aData.image || ""); // for use in closed tab list
+      this.setLiteral   (aNode, "image",      aData.image || "");
       this.setLiteral   (aNode, "properties", aData.properties);
       this.setLiteral   (aNode, "history",    aData.history);
       this.setLiteral   (aNode, "scroll",     aData.scroll);
diff --git a/chrome/content/session/sessionStore.js b/chrome/content/session/sessionStore.js
index 9f09a70..356621f 100644
--- a/chrome/content/session/sessionStore.js
+++ b/chrome/content/session/sessionStore.js
@@ -791,7 +791,7 @@ var TabmixConvertSession = {
             let closedTab = {};
             closedTab.state = state;
             closedTab.title = closedTab.state.entries[closedTab.state.index - 1].title;
-            closedTab.image = TabmixSessionManager.getLiteralValue(rdfNodeTab, "image");
+            closedTab.image = state.image;
             closedTab.pos = TabmixSessionManager.getIntValue(rdfNodeTab, "tabPos");
             // we use revers order in the RDF format
             _tabs.unshift(closedTab);
@@ -805,6 +805,7 @@ var TabmixConvertSession = {
       tabData.entries = this.getHistoryState(rdfNodeTab);
       if (!tabData.entries.length)
         return null;
+      tabData.image = TabmixSessionManager.getLiteralValue(rdfNodeTab, "image", null);
       let index = TabmixSessionManager.getIntValue(rdfNodeTab, "index");
       tabData.index = Math.min(index + 1, tabData.entries.length);
       var properties = TabmixSessionManager.getLiteralValue(rdfNodeTab, "properties");

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