Issue 3835 - Update dependency on adblockpluscore to revision 2d4888611240

chrome/content/ui/filters.xul

Index: chrome/content/ui/filters.xul
===================================================================
--- a/chrome/content/ui/filters.xul
+++ b/chrome/content/ui/filters.xul
@@ -182,17 +182,17 @@
             <hbox align="center">
               <checkbox label="&subscription.enabled.label;" class="enabledCheckbox tabable" tabindex="-1"
                 checked="{subscription.disabled ? 'false' : 'true'}" oncommand="SubscriptionActions.setDisabled(this, !this.checked);"/>
 
               <vbox flex="1">
                 <hbox align="center">
                   <deck class="titleBox" flex="1" selectedIndex="0" onselect="event.stopPropagation();">
                     <description ondblclick="if (event.button == 0) TitleEditor.start(this, true);">
-                      <description class="title" value="{subscription.title}" flex="1" crop="end"/>
+                      <description class="title" value="{getSubscriptionTitle(subscription)}" flex="1" crop="end"/>
                       (<if condition="{isExternal}">
                         <description value="&subscription.external.label;"/>
                       <else/>
                         <if condition="{subscription.homepage}">
                           <description class="link" value="&subscription.homepage.label;"
                             _url="{subscription.homepage}" tooltiptext="{subscription.homepage}"
                             onclick="if (event.button == 0) { event.stopPropagation();UI.loadInBrowser(this.getAttribute('_url')); }"/>,&#160;
                         </if>
@@ -241,17 +241,17 @@
                   <menuitem label="&subscription.delete.label;…" key="delete-key" command="subscription-delete-command"/>
                   <menuseparator/>
                   <menuitem label="&subscription.moveUp.label;" key="moveUp-key" command="subscription-moveUp-command"/>
                   <menuitem label="&subscription.moveDown.label;" key="moveDown-key" command="subscription-moveDown-command"/>
                 </menupopup>
               </button>
             </hbox>
 
-            <description class="warning" hidden="{!subscription.upgradeRequired}">&subscription.minVersion.warning;</description>
+            <description class="warning" hidden="{!upgradeRequired}">&subscription.minVersion.warning;</description>
             <description class="warning" hidden="{!disabledFilters}">
               &subscription.disabledFilters.warning;
               <description class="link" value="&subscription.disabledFilters.enable;" onclick="SubscriptionActions.enableFilters(this);"/>
             </description>
           </vbox>
         </richlistitem>
 
         <deck id="noSubscriptionsDeck" flex="1">
@@ -282,17 +282,17 @@
             ondragover="SubscriptionActions.dragOver(event);"
             ondrop="SubscriptionActions.drop(event, this);"
             oncontextmenu="SubscriptionActions.openMenu(event, this);">
           <hbox class="{subscription.disabled ? 'disabled' : ''}" align="center">
             <checkbox label="&subscription.enabled.label;" class="enabledCheckbox tabable" tabindex="-1"
               checked="{subscription.disabled ? 'false' : 'true'}" oncommand="SubscriptionActions.setDisabled(this, !this.checked);"/>
             <hbox align="center" flex="1">
               <deck class="titleBox" flex="1" selectedIndex="0" onselect="event.stopPropagation();">
-                <description class="title" value="{subscription.title}" crop="end" ondblclick="if (event.button == 0) TitleEditor.start(this, true);"/>
+                <description class="title" value="{getSubscriptionTitle(subscription)}" crop="end" ondblclick="if (event.button == 0) TitleEditor.start(this, true);"/>
                 <textbox oncontextmenu="event.stopPropagation();" class="titleEditor" onkeypress="TitleEditor.keyPress(event);" onblur="TitleEditor.end(true);"/>
               </deck>
             </hbox>
             <button class="actionButton tabable" type="menu" label="&subscription.actions.label;" tabindex="-1">
               <menupopup class="actionMenu">
                 <menuitem label="&subscription.editTitle.label;" key="edit-key" command="subscription-editTitle-command"/>
                 <menuitem label="&subscription.showHideFilters.label;" key="subscription-showHideFilters-key" command="subscription-showHideFilters-command"/>
                 <menuitem label="&subscription.delete.label;…" key="delete-key" command="subscription-delete-command"/>