Bug 346356: Replace deprecated calls to preventBubble() on trunk, patch by Adam Guthrie <ispiked@gmail.com>, r=mano

browser/components/feeds/content/options.xul

@@ -1,65 +0,0 @@
-<?xml version="1.0"?>
-
-<?xml-stylesheet href="chrome://mozapps/content/preferences/preferences.css"?>
-<?xml-stylesheet href="chrome://browser/skin/preferences/preferences.css"?>
-<?xml-stylesheet href="chrome://global/skin/"?>
-<?xml-stylesheet href="chrome://browser/skin/feeds/subscribe.css"?>
-
-<!DOCTYPE dialog SYSTEM "chrome://browser/locale/feeds/options.dtd">
-
-<dialog id="subscribeOptions"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        title="&options.title;" style="width: 30em;"
-        onload="SubscriptionOptions.init();"
-        ondialogaccept="SubscriptionOptions.accept();">
-        
-  <stringbundle id="bundle"
-                src="chrome://browser/locale/feeds/subscribe.properties"/>
-                
-  <script type="application/x-javascript"
-          src="chrome://browser/content/feeds/options.js"/>
-
-  <groupbox id="readerGroup">
-    <caption label="&readers.title;"/>
-
-    <filefield class="indent" id="clientApp" disabled="true" collapsed="true"/>
-    
-    <radiogroup id="reader" onselect="SubscriptionOptions.readerTypeChanged()">
-      <hbox>
-        <radio id="useBookmarks" value="bookmarks"
-               label="&useBookmarks.label;" accesskey="&useBookmarks.accesskey;"/>
-        <separator flex="1"/>
-        <button class="plain link" url="&liveBookmarksInfo.url;"
-                label="&liveBookmarksInfo.label;" accesskey="&liveBookmarksInfo.accesskey;"
-                oncommand="SubscriptionOptions.whatAreLiveBookmarks(this);"/>
-      </hbox>
-      <radio id="useReader" value="reader"
-             label="&useReader.label;" accesskey="&useReader.accesskey;"/>
-      <hbox id="readerContainer" class="indent" flex="1">
-        <listbox id="readers" onselect="event.preventBubble();" rows="5" flex="1">
-          <listcols>
-            <listcol flex="1"/>
-            <listcol/>
-          </listcols>
-          <listitem id="application" value="application" allowevents="true">
-            <listcell id="applicationName" class="listcell-iconic"/>
-            <listcell>
-              <button id="chooseClientApp"
-                      label="&chooseClientApp.label;" accesskey="&chooseClientApp.accesskey;"
-                      oncommand="SubscriptionOptions.chooseClientApp();"/>
-            </listcell>
-          </listitem>
-        </listbox>
-      </hbox>
-    </radiogroup>      
-    <separator class="thin"/>
-  </groupbox>
-  <separator class="thin"/>
-  <hbox>
-    <checkbox id="useAsDefault"
-              label="&useAsDefault.label;" accesskey="&useAsDefault.accesskey;"/>
-  </hbox>
-  <separator class="thin"/> 
-        
-</dialog>
-

toolkit/mozapps/extensions/content/extensions.xml

@@ -522,7 +522,7 @@
       <xul:spacer class="addonsmessage-spacer"/>
       <xul:hbox hidden="true" anonid="messageClose" align="center" pack="end"
                 class="addonsmessage-closebutton-box">
-        <xul:toolbarbutton ondblclick="event.preventBubble();"
+        <xul:toolbarbutton ondblclick="event.stopProgagation();"
                            anonid="closeButton"
                            class="addonsmessage-close-button close-button"
                            tooltiptext="&closeMessage.tooltip;"/>