From 517a317e2be6778991c0da3859c1831798964ee9 Mon Sep 17 00:00:00 2001 From: "gavin%gavinsharp.com" Date: Sun, 8 Jan 2006 23:03:45 +0000 Subject: [PATCH] Bug 315346 followup: remove old nsISidebars, r=bsmedberg, sr=roc --- allmakefiles.sh | 5 -- browser/components/sidebar/public/Makefile.in | 50 ------------- .../components/sidebar/public/nsISidebar.idl | 70 ------------------- xpfe/components/sidebar/public/.cvsignore | 1 - xpfe/components/sidebar/public/Makefile.in | 50 ------------- xpfe/components/sidebar/public/nsISidebar.idl | 70 ------------------- 6 files changed, 246 deletions(-) delete mode 100644 browser/components/sidebar/public/Makefile.in delete mode 100644 browser/components/sidebar/public/nsISidebar.idl delete mode 100644 xpfe/components/sidebar/public/.cvsignore delete mode 100644 xpfe/components/sidebar/public/Makefile.in delete mode 100644 xpfe/components/sidebar/public/nsISidebar.idl diff --git a/allmakefiles.sh b/allmakefiles.sh index 65eb6b1cd903..52eee044511b 100755 --- a/allmakefiles.sh +++ b/allmakefiles.sh @@ -738,7 +738,6 @@ xpfe/components/search/datasets/Makefile xpfe/components/search/public/Makefile xpfe/components/search/src/Makefile xpfe/components/sidebar/Makefile -xpfe/components/sidebar/public/Makefile xpfe/components/sidebar/src/Makefile xpfe/components/startup/Makefile xpfe/components/startup/public/Makefile @@ -922,7 +921,6 @@ browser/components/migration/public/Makefile browser/components/migration/src/Makefile browser/components/preferences/Makefile browser/components/sidebar/Makefile -browser/components/sidebar/public/Makefile browser/components/sidebar/src/Makefile browser/components/shell/Makefile browser/components/shell/public/Makefile @@ -1934,8 +1932,6 @@ MAKEFILES_rdfutil="modules/libimg/png/Makefile xpcom/Makefile xpcom/string/Makef MAKEFILES_shistory="xpcom/Makefile xpcom/string/Makefile webshell/public/Makefile modules/libimg/png/Makefile js/src/fdlibm/Makefile js/src/Makefile js/src/xpconnect/Makefile ipc/ipcd/Makefile xpcom/obsolete/Makefile embedding/components/profilesharingsetup/Makefile modules/libpref/Makefile netwerk/cache/Makefile intl/uconv/native/Makefile widget/src/gtkxtbin/Makefile netwerk/mime/Makefile uriloader/base/Makefile embedding/components/windowwatcher/public/Makefile rdf/util/Makefile intl/unicharutil/Makefile parser/expat/Makefile modules/libutil/Makefile parser/htmlparser/Makefile rdf/Makefile profile/dirserviceprovider/Makefile embedding/components/webbrowserpersist/Makefile db/mdb/public/Makefile db/mork/src/Makefile db/mork/build/Makefile xpfe/browser/public/Makefile xpfe/Makefile embedding/components/ui/progressDlg/Makefile xpfe/components/download-manager/Makefile directory/xpcom/base/Makefile editor/txmgr/Makefile xpfe/components/directory/Makefile xpfe/components/find/public/Makefile xpfe/components/find/src/Makefile xpfe/components/search/datasets/Makefile xpfe/components/search/public/Makefile xpfe/components/search/src/Makefile xpfe/components/related/public/Makefile xpfe/components/related/src/Makefile xpfe/components/intl/Makefile xpfe/components/windowds/Makefile xpfe/components/autocomplete/public/Makefile xpfe/components/autocomplete/src/Makefile xpfe/components/bookmarks/public/Makefile xpfe/components/bookmarks/src/Makefile xpfe/components/urlbarhistory/public/Makefile xpfe/components/urlbarhistory/src/Makefile xpfe/components/build/Makefile xpfe/components/history/public/Makefile xpfe/components/history/Makefile embedding/browser/webBrowser/Makefile embedding/browser/build/Makefile profile/pref-migrator/Makefile profile/Makefile xpfe/appshell/Makefile xpfe/components/xremote/public/Makefile xpfe/components/xremote/Makefile widget/public/Makefile widget/src/Makefile view/Makefile editor/composer/public/Makefile intl/lwbrk/Makefile content/xul/content/Makefile content/xul/templates/Makefile content/xul/document/Makefile embedding/components/ui/helperAppDlg/Makefile embedding/components/find/Makefile embedding/components/commandhandler/Makefile editor/txtsvc/Makefile editor/Makefile uriloader/prefetch/Makefile docshell/Makefile embedding/components/jsconsole/public/Makefile embedding/base/Makefile embedding/components/windowwatcher/src/Makefile embedding/components/appstartup/src/Makefile embedding/components/jsconsole/src/Makefile embedding/components/printingui/src/unixshared/Makefile embedding/components/build/Makefile intl/chardet/public/Makefile intl/chardet/src/Makefile intl/uconv/Makefile intl/locale/Makefile accessible/Makefile netwerk/protocol/viewsource/Makefile netwerk/protocol/gopher/Makefile sun-java/Makefile modules/libjar/Makefile js/src/liveconnect/Makefile modules/oji/Makefile other-licenses/libart_lgpl/Makefile layout/Makefile rdf/chrome/src/Makefile rdf/chrome/build/Makefile content/Makefile gfx/src/xprintutil/Makefile gfx/src/xlibrgb/Makefile gfx/Makefile jpeg/Makefile modules/libpr0n/Makefile netwerk/Makefile intl/strres/Makefile uriloader/exthandler/Makefile modules/plugin/Makefile caps/Makefile dom/Makefile docshell/shistory/Makefile" -MAKEFILES_sidebar="xpfe/components/sidebar/public/Makefile" - MAKEFILES_spellchecker="xpcom/Makefile xpcom/string/Makefile webshell/public/Makefile modules/libimg/png/Makefile js/src/fdlibm/Makefile js/src/Makefile js/src/xpconnect/Makefile ipc/ipcd/Makefile xpcom/obsolete/Makefile embedding/components/profilesharingsetup/Makefile modules/libpref/Makefile netwerk/cache/Makefile intl/uconv/native/Makefile widget/src/gtkxtbin/Makefile netwerk/mime/Makefile uriloader/base/Makefile embedding/components/windowwatcher/public/Makefile rdf/util/Makefile intl/unicharutil/Makefile parser/expat/Makefile modules/libutil/Makefile parser/htmlparser/Makefile rdf/Makefile profile/dirserviceprovider/Makefile docshell/shistory/Makefile embedding/components/webbrowserpersist/Makefile db/mdb/public/Makefile db/mork/src/Makefile db/mork/build/Makefile xpfe/browser/public/Makefile xpfe/Makefile embedding/components/ui/progressDlg/Makefile xpfe/components/download-manager/Makefile directory/xpcom/base/Makefile editor/txmgr/Makefile xpfe/components/directory/Makefile xpfe/components/find/public/Makefile xpfe/components/find/src/Makefile xpfe/components/search/datasets/Makefile xpfe/components/search/public/Makefile xpfe/components/search/src/Makefile xpfe/components/related/public/Makefile xpfe/components/related/src/Makefile xpfe/components/intl/Makefile xpfe/components/windowds/Makefile xpfe/components/autocomplete/public/Makefile xpfe/components/autocomplete/src/Makefile xpfe/components/bookmarks/public/Makefile xpfe/components/bookmarks/src/Makefile xpfe/components/urlbarhistory/public/Makefile xpfe/components/urlbarhistory/src/Makefile xpfe/components/build/Makefile xpfe/components/history/public/Makefile xpfe/components/history/Makefile embedding/browser/webBrowser/Makefile embedding/browser/build/Makefile profile/pref-migrator/Makefile profile/Makefile xpfe/appshell/Makefile xpfe/components/xremote/public/Makefile xpfe/components/xremote/Makefile widget/public/Makefile widget/src/Makefile view/Makefile editor/composer/public/Makefile intl/lwbrk/Makefile content/xul/content/Makefile content/xul/templates/Makefile content/xul/document/Makefile embedding/components/ui/helperAppDlg/Makefile embedding/components/find/Makefile embedding/components/commandhandler/Makefile editor/txtsvc/Makefile editor/Makefile uriloader/prefetch/Makefile docshell/Makefile embedding/components/jsconsole/public/Makefile embedding/base/Makefile embedding/components/windowwatcher/src/Makefile embedding/components/appstartup/src/Makefile embedding/components/jsconsole/src/Makefile embedding/components/printingui/src/unixshared/Makefile embedding/components/build/Makefile intl/chardet/public/Makefile intl/chardet/src/Makefile intl/uconv/Makefile intl/locale/Makefile accessible/Makefile netwerk/protocol/viewsource/Makefile netwerk/protocol/gopher/Makefile sun-java/Makefile modules/libjar/Makefile js/src/liveconnect/Makefile modules/oji/Makefile other-licenses/libart_lgpl/Makefile layout/Makefile rdf/chrome/src/Makefile rdf/chrome/build/Makefile content/Makefile gfx/src/xprintutil/Makefile gfx/src/xlibrgb/Makefile gfx/Makefile jpeg/Makefile modules/libpr0n/Makefile netwerk/Makefile intl/strres/Makefile uriloader/exthandler/Makefile modules/plugin/Makefile caps/Makefile dom/Makefile extensions/spellcheck/Makefile" MAKEFILES_storage="xpcom/Makefile xpcom/string/Makefile db/sqlite3/src/Makefile storage/public/Makefile storage/src/Makefile storage/build/Makefile" @@ -2171,7 +2167,6 @@ MAKEFILES_zlib="modules/zlib/standalone/Makefile" rdf) add_makefiles "$MAKEFILES_rdf" ;; rdfutil) add_makefiles "$MAKEFILES_rdfutil" ;; shistory) add_makefiles "$MAKEFILES_shistory" ;; - sidebar) add_makefiles "$MAKEFILES_sidebar" ;; spellchecker) add_makefiles "$MAKEFILES_spellchecker" ;; storage) add_makefiles "$MAKEFILES_storage" ;; string) add_makefiles "$MAKEFILES_string" ;; diff --git a/browser/components/sidebar/public/Makefile.in b/browser/components/sidebar/public/Makefile.in deleted file mode 100644 index 7fca0c230aaa..000000000000 --- a/browser/components/sidebar/public/Makefile.in +++ /dev/null @@ -1,50 +0,0 @@ -# -# ***** BEGIN LICENSE BLOCK ***** -# Version: MPL 1.1/GPL 2.0/LGPL 2.1 -# -# The contents of this file are subject to the Mozilla Public License Version -# 1.1 (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS IS" basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -# for the specific language governing rights and limitations under the -# License. -# -# The Original Code is mozilla.org Code. -# -# The Initial Developer of the Original Code is -# Netscape Communications Corporation. -# Portions created by the Initial Developer are Copyright (C) 1998 -# the Initial Developer. All Rights Reserved. -# -# Contributor(s): -# -# Alternatively, the contents of this file may be used under the terms of -# either the GNU General Public License Version 2 or later (the "GPL"), or -# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -# in which case the provisions of the GPL or the LGPL are applicable instead -# of those above. If you wish to allow use of your version of this file only -# under the terms of either the GPL or the LGPL, and not to allow others to -# use your version of this file under the terms of the MPL, indicate your -# decision by deleting the provisions above and replace them with the notice -# and other provisions required by the GPL or the LGPL. If you do not delete -# the provisions above, a recipient may use your version of this file under -# the terms of any one of the MPL, the GPL or the LGPL. -# -# ***** END LICENSE BLOCK ***** - -DEPTH = ../../../.. -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - -MODULE = sidebar - -XPIDLSRCS = nsISidebar.idl - -include $(topsrcdir)/config/rules.mk - diff --git a/browser/components/sidebar/public/nsISidebar.idl b/browser/components/sidebar/public/nsISidebar.idl deleted file mode 100644 index fab57de2b828..000000000000 --- a/browser/components/sidebar/public/nsISidebar.idl +++ /dev/null @@ -1,70 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- - * - * ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 - * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is mozilla.org Code. - * - * The Initial Developer of the Original Code is - * Netscape Communications Corporation. - * Portions created by the Initial Developer are Copyright (C) 1998 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. - * - * ***** END LICENSE BLOCK ***** */ - -/* - - The Sidebar API for 3rd parties - -*/ - -#include "nsISupports.idl" - -[scriptable, uuid(577CB745-8CAF-11d3-AAEF-00805F8A4905)] -interface nsISidebar : nsISupports -{ - void addPanel(in wstring aTitle, in string aContentURL, - in string aCustomizeURL); - void addPersistentPanel(in wstring aTitle, in string aContentURL, - in string aCustomizeURL); - void addSearchEngine(in string engineURL, in string iconURL, - in wstring suggestedTitle, in wstring suggestedCategory); -}; - -%{ C++ -// {577CB744-8CAF-11d3-AAEF-00805F8A4905} -#define NS_SIDEBAR_CID \ -{ 0x577cb744, 0x8caf, 0x11d3, { 0xaa, 0xef, 0x0, 0x80, 0x5f, 0x8a, 0x49, 0x5 } } - -#define NS_SIDEBAR_CONTRACTID "@mozilla.org/sidebar;1" -%} - -/* - var isidebar = Components.interfaces.nsISidebar; - var csidebar = Components.classes['@mozilla.org/sidebar;1']; - var sidebar = csidebar.createInstance(isidebar); -*/ diff --git a/xpfe/components/sidebar/public/.cvsignore b/xpfe/components/sidebar/public/.cvsignore deleted file mode 100644 index f3c7a7c5da68..000000000000 --- a/xpfe/components/sidebar/public/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -Makefile diff --git a/xpfe/components/sidebar/public/Makefile.in b/xpfe/components/sidebar/public/Makefile.in deleted file mode 100644 index 1ad8bbbd73ef..000000000000 --- a/xpfe/components/sidebar/public/Makefile.in +++ /dev/null @@ -1,50 +0,0 @@ -# -# ***** BEGIN LICENSE BLOCK ***** -# Version: MPL 1.1/GPL 2.0/LGPL 2.1 -# -# The contents of this file are subject to the Mozilla Public License Version -# 1.1 (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS IS" basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -# for the specific language governing rights and limitations under the -# License. -# -# The Original Code is mozilla.org Code. -# -# The Initial Developer of the Original Code is -# Netscape Communications Corporation. -# Portions created by the Initial Developer are Copyright (C) 1998 -# the Initial Developer. All Rights Reserved. -# -# Contributor(s): -# -# Alternatively, the contents of this file may be used under the terms of -# either of the GNU General Public License Version 2 or later (the "GPL"), -# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -# in which case the provisions of the GPL or the LGPL are applicable instead -# of those above. If you wish to allow use of your version of this file only -# under the terms of either the GPL or the LGPL, and not to allow others to -# use your version of this file under the terms of the MPL, indicate your -# decision by deleting the provisions above and replace them with the notice -# and other provisions required by the GPL or the LGPL. If you do not delete -# the provisions above, a recipient may use your version of this file under -# the terms of any one of the MPL, the GPL or the LGPL. -# -# ***** END LICENSE BLOCK ***** - -DEPTH = ../../../.. -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - -MODULE = sidebar - -XPIDLSRCS = nsISidebar.idl - -include $(topsrcdir)/config/rules.mk - diff --git a/xpfe/components/sidebar/public/nsISidebar.idl b/xpfe/components/sidebar/public/nsISidebar.idl deleted file mode 100644 index 8abef6beb7b6..000000000000 --- a/xpfe/components/sidebar/public/nsISidebar.idl +++ /dev/null @@ -1,70 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- - * - * ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 - * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is mozilla.org Code. - * - * The Initial Developer of the Original Code is - * Netscape Communications Corporation. - * Portions created by the Initial Developer are Copyright (C) 1998 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * - * Alternatively, the contents of this file may be used under the terms of - * either of the GNU General Public License Version 2 or later (the "GPL"), - * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. - * - * ***** END LICENSE BLOCK ***** */ - -/* - - The Sidebar API for 3rd parties - -*/ - -#include "nsISupports.idl" - -[scriptable, uuid(577CB745-8CAF-11d3-AAEF-00805F8A4905)] -interface nsISidebar : nsISupports -{ - void addPanel(in wstring aTitle, in string aContentURL, - in string aCustomizeURL); - void addPersistentPanel(in wstring aTitle, in string aContentURL, - in string aCustomizeURL); - void addSearchEngine(in string engineURL, in string iconURL, - in wstring suggestedTitle, in wstring suggestedCategory); -}; - -%{ C++ -// {577CB744-8CAF-11d3-AAEF-00805F8A4905} -#define NS_SIDEBAR_CID \ -{ 0x577cb744, 0x8caf, 0x11d3, { 0xaa, 0xef, 0x0, 0x80, 0x5f, 0x8a, 0x49, 0x5 } } - -#define NS_SIDEBAR_CONTRACTID "@mozilla.org/sidebar;1" -%} - -/* - var isidebar = Components.interfaces.nsISidebar; - var csidebar = Components.classes['@mozilla.org/sidebar;1']; - var sidebar = csidebar.createInstance(isidebar); -*/