diff -Nru unity-firefox-extension-3.0.0+14.04.20140411/debian/changelog unity-firefox-extension-3.0.0+14.04.20140416/debian/changelog
--- unity-firefox-extension-3.0.0+14.04.20140411/debian/changelog	2014-04-16 16:29:13.000000000 +0000
+++ unity-firefox-extension-3.0.0+14.04.20140416/debian/changelog	2014-04-16 16:29:14.000000000 +0000
@@ -1,3 +1,14 @@
+unity-firefox-extension (3.0.0+14.04.20140416-0ubuntu1) trusty; urgency=low
+
+  [ CI bot ]
+  * Resync trunk
+
+  [ Alexandre Abreu ]
+  * fix webapp launcher icon being pinned againg on reload (LP:
+    #1308625)
+
+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com>  Wed, 16 Apr 2014 16:22:43 +0000
+
 unity-firefox-extension (3.0.0+14.04.20140411-0ubuntu1) trusty; urgency=low
 
   [ CI bot ]
diff -Nru unity-firefox-extension-3.0.0+14.04.20140411/po/af.po unity-firefox-extension-3.0.0+14.04.20140416/po/af.po
--- unity-firefox-extension-3.0.0+14.04.20140411/po/af.po	1970-01-01 00:00:00.000000000 +0000
+++ unity-firefox-extension-3.0.0+14.04.20140416/po/af.po	2014-04-16 16:22:27.000000000 +0000
@@ -0,0 +1,83 @@
+# Afrikaans translation for unity-firefox-extension
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the unity-firefox-extension package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: unity-firefox-extension\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2007-10-18 14:00+0100\n"
+"PO-Revision-Date: 2014-04-12 22:03+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Afrikaans <af@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2014-04-15 07:41+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
+
+#: unity_webapps.properties:0
+msgid ""
+"Would you like to install %S (%S), for extra features and quicker access?"
+msgstr ""
+
+#: unity_webapps.properties:1
+msgid "Yes"
+msgstr ""
+
+#: unity_webapps.properties:2
+msgid "Y"
+msgstr ""
+
+#: unity_webapps.properties:3
+msgid "No"
+msgstr ""
+
+#: unity_webapps.properties:4
+msgid "N"
+msgstr ""
+
+#: unity_webapps.properties:5
+msgid "Don't ask again"
+msgstr ""
+
+#: unity_webapps.properties:6
+msgid "D"
+msgstr ""
+
+#: unity_webapps.properties:7
+msgid "Desktop Integration"
+msgstr ""
+
+#: unity_webapps.properties:8
+msgid "Exceptions..."
+msgstr ""
+
+#: unity_webapps.properties:9
+msgid "Prompt integration options for any website"
+msgstr ""
+
+#: unity_webapps.properties:10
+msgid "These websites won't prompt any integration options"
+msgstr ""
+
+#: unity_webapps.properties:11
+msgid "Exceptions - Integrated websites"
+msgstr ""
+
+#: unity_webapps.properties:12
+msgid "Site"
+msgstr ""
+
+#: unity_webapps.properties:13
+msgid "Close"
+msgstr ""
+
+#: unity_webapps.properties:14
+msgid "Would you like to install %S, for extra features and quicker access?"
+msgstr ""
+
+#: unity_webapps.properties:15
+msgid "Install"
+msgstr ""
diff -Nru unity-firefox-extension-3.0.0+14.04.20140411/unity-firefox-extension/content/unity-global-property-initializer.js unity-firefox-extension-3.0.0+14.04.20140416/unity-firefox-extension/content/unity-global-property-initializer.js
--- unity-firefox-extension-3.0.0+14.04.20140411/unity-firefox-extension/content/unity-global-property-initializer.js	2014-04-11 16:20:08.000000000 +0000
+++ unity-firefox-extension-3.0.0+14.04.20140416/unity-firefox-extension/content/unity-global-property-initializer.js	2014-04-16 16:22:35.000000000 +0000
@@ -93,19 +93,10 @@
 	uwa.permissions_dontask_domain(domain);
     }
 
-    if (uwa.permissions_get_domain_dontask(domain)) {
+    if (uwa.permissions_get_domain_dontask(domain) || uwa.permissions_get_domain_allowed(domain)) {
 	return;
     }
 
-    if (domain == "" || uwa.permissions_get_domain_allowed(domain)) {
-	try {
-	    realInit(name, iconUrl);
-	}
-	catch (e) {
-	    consoleService.logStringMessage("Unity Extension: Error calling realInit: " + e.toString() + e.line + e);
-	}
-	return;
-    }
     var mainWindow = aWindow.QueryInterface(Components.interfaces.nsIInterfaceRequestor)
 	.getInterface(Components.interfaces.nsIWebNavigation)
 	.QueryInterface(Components.interfaces.nsIDocShellTreeItem)
diff -Nru unity-firefox-extension-3.0.0+14.04.20140411/unity-firefox-extension/install.rdf unity-firefox-extension-3.0.0+14.04.20140416/unity-firefox-extension/install.rdf
--- unity-firefox-extension-3.0.0+14.04.20140411/unity-firefox-extension/install.rdf	2014-04-11 16:20:08.000000000 +0000
+++ unity-firefox-extension-3.0.0+14.04.20140416/unity-firefox-extension/install.rdf	2014-04-16 16:22:35.000000000 +0000
@@ -4,7 +4,7 @@
   <Description about="urn:mozilla:install-manifest">
     <em:id>webapps-team@lists.launchpad.net</em:id>
     <em:name>Unity Desktop Integration</em:name>
-    <em:version>3.0.1</em:version>
+    <em:version>3.0.2</em:version>
     <em:description>Provides Unity Integration features to sites in Firefox</em:description>
     <em:creator>Web Infrastructure Team at Canonical</em:creator>
     <em:homepageURL>http://launchpad.net/webapps</em:homepageURL>