WebApps: unity-firefox-extension

Merge lp:~abreu-alexandre/unity-firefox-extension/release-2.4.7 into lp:unity-firefox-extension/13.04

  1. release-2.4.7
  2. Merge into 2.4.4
Proposed by Alexandre Abreu
Status: Merged
Approved by: Alexandre Abreu
Approved revision: 372
Merged at revision: 372
Proposed branch: lp:~abreu-alexandre/unity-firefox-extension/release-2.4.7
Merge into: lp:unity-firefox-extension/13.04
Diff against target: 68 lines (+12/-9)
3 files modified
debian/changelog (+6/-2)
unity-firefox-extension/content/unity-global-property-initializer.js (+4/-4)
unity-firefox-extension/install.rdf (+2/-3)
To merge this branch: bzr merge lp:~abreu-alexandre/unity-firefox-extension/release-2.4.7
Reviewer Review Type Date Requested Status
Robert Bruce Park (community) Approve
Review via email: mp+157384@code.launchpad.net

Commit message

Fix #1155238: Fix Firefox 20 integration; release 2.4.7

Description of the change

Fix #1155238: Fix Firefox 20 integration; release 2.4.7

To post a comment you must log in.
Revision history for this message
Robert Bruce Park (robru) wrote :

Looks good, proceeding with SRU.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2012-11-28 05:14:26 +0000
3+++ debian/changelog 2013-04-05 14:36:32 +0000
4@@ -1,8 +1,12 @@
5-unity-firefox-extension (2.4.3-0ubuntu1) UNRELEASED; urgency=low
6+unity-firefox-extension (2.4.7-0ubuntu1) UNRELEASED; urgency=low
7
8+ [ Robert Bruce Park ]
9 * Inline packaging metadata.
10
11- -- Robert Bruce Park <robert.park@canonical.com> Wed, 21 Nov 2012 14:59:52 -0600
12+ [ Alexandre Abreu ]
13+ * Fix Firefox20 integration (LP: #1155238)
14+
15+ -- Alexandre Abreu <alexandre.abreu@canonical.com> Fri, 05 Apr 2013 10:31:36 -0400
16
17 unity-firefox-extension (2.4.2-0ubuntu1) raring; urgency=low
18
19
20=== modified file 'unity-firefox-extension/content/unity-global-property-initializer.js'
21--- unity-firefox-extension/content/unity-global-property-initializer.js 2012-11-22 15:23:27 +0000
22+++ unity-firefox-extension/content/unity-global-property-initializer.js 2013-04-05 14:36:32 +0000
23@@ -496,11 +496,11 @@
24 _get: function(aWindow) {
25 aWindow = FindToplevelContentWindow(aWindow);
26
27- if (!this._windows.has(aWindow.navigator)) {
28- this._windows.set(aWindow.navigator, { unity: new UnityObject(this.uwa, this.service, this.contextManager, aWindow),
29+ if (!this._windows.has(aWindow.document)) {
30+ this._windows.set(aWindow.document, { unity: new UnityObject(this.uwa, this.service, this.contextManager, aWindow),
31 webkitNotifications: new WebkitNotifications(this.uwa, this.libnotify, aWindow) });
32 }
33- return this._windows.get(aWindow.navigator);
34+ return this._windows.get(aWindow.document);
35 },
36
37 getForWindow: function(aWindow) {
38@@ -512,7 +512,7 @@
39 },
40
41 getExistingForWindow: function(aWindow) {
42- if (!this._windows.has(aWindow.navigator))
43+ if (!this._windows.has(aWindow.document))
44 return null;
45 return this._get(aWindow).unity;
46 }
47
48=== modified file 'unity-firefox-extension/install.rdf'
49--- unity-firefox-extension/install.rdf 2013-01-24 19:19:59 +0000
50+++ unity-firefox-extension/install.rdf 2013-04-05 14:36:32 +0000
51@@ -4,7 +4,7 @@
52 <Description about="urn:mozilla:install-manifest">
53 <em:id>webapps-team@lists.launchpad.net</em:id>
54 <em:name>Unity Desktop Integration</em:name>
55- <em:version>2.4.4</em:version>
56+ <em:version>2.4.7</em:version>
57 <em:description>Provides Unity Integration features to sites in Firefox</em:description>
58 <em:creator>Web Infrastructure Team at Canonical</em:creator>
59 <em:homepageURL>http://launchpad.net/webapps</em:homepageURL>
60@@ -17,8 +17,7 @@
61 <Description>
62 <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
63 <em:minVersion>10.0</em:minVersion>
64- <em:maxVersion>17.*</em:maxVersion>
65- <em:maxVersion>18.*</em:maxVersion>
66+ <em:maxVersion>20.*</em:maxVersion>
67 </Description>
68 </em:targetApplication>
69

Subscribers

People subscribed via source and target branches

to all changes: