From 95a370ca925c9c301e4c4acfb7bf24fee5cb4ef8 Mon Sep 17 00:00:00 2001 From: "myk%mozilla.org" Date: Tue, 2 May 2006 05:59:53 +0000 Subject: [PATCH] Bug 315346: unforks nsISidebar interface by moving it from browser/ and xpfe/ to dom/. The fix for this was checked into the trunk months ago. This checkin syncs the change to the branch, since it involves a change to browser/, and browser/ is supposed to be synced between trunk and branch. r=roc sr=jst a=jst for 1.8 branch git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@195792 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/allmakefiles.sh | 5 -- .../browser/components/sidebar/Makefile.in | 2 +- .../components/sidebar/public/Makefile.in | 50 ------------- .../browser/installer/unix/packages-static | 1 + mozilla/dom/public/idl/Makefile.in | 1 + .../public/idl/sidebar}/Makefile.in | 23 +++--- .../public/idl/sidebar}/nsISidebar.idl | 0 mozilla/embedding/config/basebrowser-win | 1 + mozilla/xpfe/components/sidebar/Makefile.in | 2 +- .../components/sidebar/public/nsISidebar.idl | 70 ------------------- mozilla/xpinstall/packager/packages-os2 | 1 + .../xpinstall/packager/packages-static-unix | 1 + mozilla/xpinstall/packager/packages-unix | 1 + 13 files changed, 21 insertions(+), 137 deletions(-) delete mode 100644 mozilla/browser/components/sidebar/public/Makefile.in rename mozilla/{xpfe/components/sidebar/public => dom/public/idl/sidebar}/Makefile.in (78%) rename mozilla/{browser/components/sidebar/public => dom/public/idl/sidebar}/nsISidebar.idl (100%) delete mode 100644 mozilla/xpfe/components/sidebar/public/nsISidebar.idl diff --git a/mozilla/allmakefiles.sh b/mozilla/allmakefiles.sh index ff2d00bf285..8fb9b1464bc 100755 --- a/mozilla/allmakefiles.sh +++ b/mozilla/allmakefiles.sh @@ -716,7 +716,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 @@ -920,7 +919,6 @@ browser/components/migration/src/Makefile browser/components/preferences/Makefile browser/components/search/Makefile browser/components/sidebar/Makefile -browser/components/sidebar/public/Makefile browser/components/sidebar/src/Makefile browser/components/shell/Makefile browser/components/shell/public/Makefile @@ -1929,8 +1927,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 netwerk/build2/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 xpfe/components/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 xpfe/components/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 netwerk/build2/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" @@ -2167,7 +2163,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/mozilla/browser/components/sidebar/Makefile.in b/mozilla/browser/components/sidebar/Makefile.in index cdf48184f5f..a0fd8a176eb 100644 --- a/mozilla/browser/components/sidebar/Makefile.in +++ b/mozilla/browser/components/sidebar/Makefile.in @@ -42,7 +42,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -DIRS = public src +DIRS = src include $(topsrcdir)/config/rules.mk diff --git a/mozilla/browser/components/sidebar/public/Makefile.in b/mozilla/browser/components/sidebar/public/Makefile.in deleted file mode 100644 index 7fca0c230aa..00000000000 --- a/mozilla/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/mozilla/browser/installer/unix/packages-static b/mozilla/browser/installer/unix/packages-static index 8a609a581e4..9c6048e4514 100644 --- a/mozilla/browser/installer/unix/packages-static +++ b/mozilla/browser/installer/unix/packages-static @@ -82,6 +82,7 @@ bin/components/dom_css.xpt bin/components/dom_events.xpt bin/components/dom_html.xpt bin/components/dom_range.xpt +bin/components/dom_sidebar.xpt bin/components/dom_stylesheets.xpt bin/components/dom_traversal.xpt bin/components/dom_views.xpt diff --git a/mozilla/dom/public/idl/Makefile.in b/mozilla/dom/public/idl/Makefile.in index 330daee367e..71becf650cf 100644 --- a/mozilla/dom/public/idl/Makefile.in +++ b/mozilla/dom/public/idl/Makefile.in @@ -51,6 +51,7 @@ DIRS = \ stylesheets \ views \ css \ + sidebar \ traversal \ range \ xbl \ diff --git a/mozilla/xpfe/components/sidebar/public/Makefile.in b/mozilla/dom/public/idl/sidebar/Makefile.in similarity index 78% rename from mozilla/xpfe/components/sidebar/public/Makefile.in rename to mozilla/dom/public/idl/sidebar/Makefile.in index 1ad8bbbd73e..cce20a5bc1d 100644 --- a/mozilla/xpfe/components/sidebar/public/Makefile.in +++ b/mozilla/dom/public/idl/sidebar/Makefile.in @@ -12,11 +12,11 @@ # for the specific language governing rights and limitations under the # License. # -# The Original Code is mozilla.org Code. +# The Original Code is Sidebar IDL Makefile code. # # The Initial Developer of the Original Code is -# Netscape Communications Corporation. -# Portions created by the Initial Developer are Copyright (C) 1998 +# Robert O'Callahan (rocallahan@novell.com) +# Portions created by the Initial Developer are Copyright (C) 2005 # the Initial Developer. All Rights Reserved. # # Contributor(s): @@ -35,16 +35,19 @@ # # ***** END LICENSE BLOCK ***** -DEPTH = ../../../.. -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ +DEPTH = ../../../.. +topsrcdir = @top_srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MODULE = sidebar +MODULE = dom +XPIDL_MODULE = dom_sidebar +GRE_MODULE = 1 -XPIDLSRCS = nsISidebar.idl +XPIDLSRCS = \ + nsISidebar.idl \ + $(NULL) include $(topsrcdir)/config/rules.mk - diff --git a/mozilla/browser/components/sidebar/public/nsISidebar.idl b/mozilla/dom/public/idl/sidebar/nsISidebar.idl similarity index 100% rename from mozilla/browser/components/sidebar/public/nsISidebar.idl rename to mozilla/dom/public/idl/sidebar/nsISidebar.idl diff --git a/mozilla/embedding/config/basebrowser-win b/mozilla/embedding/config/basebrowser-win index 11c4e86c182..23df28793cc 100644 --- a/mozilla/embedding/config/basebrowser-win +++ b/mozilla/embedding/config/basebrowser-win @@ -181,6 +181,7 @@ components\dom_events.xpt components\dom_html.xpt components\dom_loadsave.xpt components\dom_range.xpt +components\dom_sidebar.xpt components\dom_stylesheets.xpt components\dom_traversal.xpt components\dom_views.xpt diff --git a/mozilla/xpfe/components/sidebar/Makefile.in b/mozilla/xpfe/components/sidebar/Makefile.in index 963772f5e36..9f544a41109 100644 --- a/mozilla/xpfe/components/sidebar/Makefile.in +++ b/mozilla/xpfe/components/sidebar/Makefile.in @@ -42,7 +42,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -DIRS = public src +DIRS = src include $(topsrcdir)/config/rules.mk diff --git a/mozilla/xpfe/components/sidebar/public/nsISidebar.idl b/mozilla/xpfe/components/sidebar/public/nsISidebar.idl deleted file mode 100644 index 8abef6beb7b..00000000000 --- a/mozilla/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); -*/ diff --git a/mozilla/xpinstall/packager/packages-os2 b/mozilla/xpinstall/packager/packages-os2 index 6129afb9d52..f92051b7b94 100644 --- a/mozilla/xpinstall/packager/packages-os2 +++ b/mozilla/xpinstall/packager/packages-os2 @@ -132,6 +132,7 @@ bin/components/dom_events.xpt bin/components/dom_html.xpt bin/components/dom_loadsave.xpt bin/components/dom_range.xpt +bin/components/dom_sidebar.xpt bin/components/dom_stylesheets.xpt bin/components/dom_traversal.xpt bin/components/dom_views.xpt diff --git a/mozilla/xpinstall/packager/packages-static-unix b/mozilla/xpinstall/packager/packages-static-unix index 0444e567355..6f2269db96f 100644 --- a/mozilla/xpinstall/packager/packages-static-unix +++ b/mozilla/xpinstall/packager/packages-static-unix @@ -98,6 +98,7 @@ bin/components/dom_events.xpt bin/components/dom_loadsave.xpt bin/components/dom_html.xpt bin/components/dom_range.xpt +bin/components/dom_sidebar.xpt bin/components/dom_stylesheets.xpt bin/components/dom_traversal.xpt bin/components/dom_views.xpt diff --git a/mozilla/xpinstall/packager/packages-unix b/mozilla/xpinstall/packager/packages-unix index 34eeb3c9ddb..295cfd4a595 100644 --- a/mozilla/xpinstall/packager/packages-unix +++ b/mozilla/xpinstall/packager/packages-unix @@ -114,6 +114,7 @@ bin/components/dom_events.xpt bin/components/dom_html.xpt bin/components/dom_loadsave.xpt bin/components/dom_range.xpt +bin/components/dom_sidebar.xpt bin/components/dom_stylesheets.xpt bin/components/dom_traversal.xpt bin/components/dom_views.xpt