From 426ec6fb36c9e9405eef92a6c76277d1f89d6092 Mon Sep 17 00:00:00 2001
From: Neil Rashbrook <neil@parkwaycc.co.uk>
Date: Sun, 31 Aug 2014 19:54:44 +0100
Subject: [PATCH] Bug 1051862 Fix fallout from bug 983920 r=IanN

---
 suite/common/public/moz.build           | 2 +-
 suite/common/public/nsISidebarPanel.idl | 8 ++++++--
 suite/common/src/nsSidebar.js           | 6 ++----
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/suite/common/public/moz.build b/suite/common/public/moz.build
index c866b811e6..c45ae145ec 100644
--- a/suite/common/public/moz.build
+++ b/suite/common/public/moz.build
@@ -6,7 +6,7 @@
 XPIDL_SOURCES += [
     'nsISessionStartup.idl',
     'nsISessionStore.idl',
-    'nsISidebarPanel.idl',
+    'nsISidebar.idl',
     'nsISuiteDownloadManagerUI.idl',
     'nsISuiteGlue.idl',
 ]
diff --git a/suite/common/public/nsISidebarPanel.idl b/suite/common/public/nsISidebarPanel.idl
index fc3949730c..3795334c03 100644
--- a/suite/common/public/nsISidebarPanel.idl
+++ b/suite/common/public/nsISidebarPanel.idl
@@ -12,11 +12,15 @@
 
 #include "nsISupports.idl"
 
-[scriptable, uuid(e0f4c5ee-2b35-4e99-81d2-ab956c4de0d1)]
-interface nsISidebarPanel : nsISupports
+[scriptable, uuid(97bfa970-8222-4c3f-bbe8-42141e4c7982)]
+interface nsISidebar : nsISupports
 {
     void addPanel(in DOMString aTitle, in DOMString aContentURL,
                   in DOMString aCustomizeURL);
     void addPersistentPanel(in DOMString aTitle, in DOMString aContentURL,
                             in DOMString aCustomizeURL);
+    void addSearchEngine(in DOMString engineURL, in DOMString iconURL,
+                         in DOMString suggestedTitle, in DOMString suggestedCategory);
+    void AddSearchProvider(in DOMString aDescriptionURL);
+    unsigned long IsSearchProviderInstalled(in DOMString aSearchURL);
 };
diff --git a/suite/common/src/nsSidebar.js b/suite/common/src/nsSidebar.js
index ae397a179f..eca3a9359b 100644
--- a/suite/common/src/nsSidebar.js
+++ b/suite/common/src/nsSidebar.js
@@ -26,8 +26,6 @@ const CONTAINER_CONTRACTID = "@mozilla.org/rdf/container;1";
 const NETSEARCH_CONTRACTID = "@mozilla.org/rdf/datasource;1?name=internetsearch"
 const nsISupports      = Components.interfaces.nsISupports;
 const nsISidebar       = Components.interfaces.nsISidebar;
-const nsISidebarPanel  = Components.interfaces.nsISidebarPanel;
-const nsISidebarExternal = Components.interfaces.nsISidebarExternal;
 const nsIRDFContainer  = Components.interfaces.nsIRDFContainer;
 const nsIProperties    = Components.interfaces.nsIProperties;
 const nsIFileURL       = Components.interfaces.nsIFileURL;
@@ -304,11 +302,11 @@ nsSidebar.prototype.classInfo = XPCOMUtils.generateCI({
     classID: SIDEBAR_CID,
     contractID: SIDEBAR_CONTRACTID,
     classDescription: "Sidebar",
-    interfaces: [nsISidebar, nsISidebarPanel, nsISidebarExternal],
+    interfaces: [nsISidebar],
     flags: nsIClassInfo.DOM_OBJECT});
 
 nsSidebar.prototype.QueryInterface =
-    XPCOMUtils.generateQI([nsISidebar, nsISidebarPanel, nsISidebarExternal]);
+    XPCOMUtils.generateQI([nsISidebar]);
 
 nsSidebar.prototype.classID = SIDEBAR_CID;