packages: xulrunner/xulrunner.spec, xulrunner/xulrunner-gtkmozembed.patch (...
qboosh
qboosh at pld-linux.org
Thu Aug 18 20:43:33 CEST 2011
Author: qboosh Date: Thu Aug 18 18:43:33 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- added gtkmozembed patch from FC (restore deprecated gtkmozembed API - still used by some packages)
- updated BRs
- use system libevent
- release 2
---- Files affected:
packages/xulrunner:
xulrunner.spec (1.184 -> 1.185) , xulrunner-gtkmozembed.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/xulrunner/xulrunner.spec
diff -u packages/xulrunner/xulrunner.spec:1.184 packages/xulrunner/xulrunner.spec:1.185
--- packages/xulrunner/xulrunner.spec:1.184 Sat Jul 23 14:01:47 2011
+++ packages/xulrunner/xulrunner.spec Thu Aug 18 20:43:27 2011
@@ -20,7 +20,7 @@
Summary(pl.UTF-8): XULRunner - środowisko uruchomieniowe Mozilli dla aplikacji XUL+XPCOM
Name: xulrunner
Version: 5.0.1
-Release: 1
+Release: 2
Epoch: 2
License: MPL v1.1 or GPL v2+ or LGPL v2.1+
Group: X11/Applications
@@ -30,13 +30,14 @@
# Source0-md5: 6d1f43e402cec84459a3d7f950bd5192
Patch0: %{name}-install.patch
Patch1: %{name}-rpath.patch
-Patch3: %{name}-gcc3.patch
-Patch4: %{name}-nss_cflags.patch
-Patch5: %{name}-paths.patch
-Patch6: %{name}-pc.patch
-Patch7: %{name}-prefs.patch
-Patch8: %{name}-ssl_oldapi.patch
-Patch9: %{name}-ppc.patch
+Patch2: %{name}-gcc3.patch
+Patch3: %{name}-nss_cflags.patch
+Patch4: %{name}-paths.patch
+Patch5: %{name}-pc.patch
+Patch6: %{name}-prefs.patch
+Patch7: %{name}-ssl_oldapi.patch
+Patch8: %{name}-ppc.patch
+Patch9: %{name}-gtkmozembed.patch
URL: http://developer.mozilla.org/en/docs/XULRunner
%{!?with_qt:BuildRequires: GConf2-devel >= 1.2.1}
BuildRequires: alsa-lib-devel
@@ -50,14 +51,15 @@
BuildRequires: hunspell-devel >= 1.2.3
BuildRequires: libIDL-devel >= 0.8.0
BuildRequires: libdnet-devel
+BuildRequires: libevent-devel >= 1.4.7
%{?with_gnomeui:BuildRequires: libgnomeui-devel >= 2.2.0}
BuildRequires: libiw-devel
BuildRequires: libjpeg-devel >= 6b
%{!?with_qt:BuildRequires: libnotify-devel >= 0.4}
BuildRequires: libpng(APNG)-devel >= 0.10
-BuildRequires: libpng-devel >= 1.2.17
+BuildRequires: libpng-devel >= 1.4.1
BuildRequires: libstdc++-devel
-BuildRequires: libvpx-devel
+BuildRequires: libvpx-devel
BuildRequires: nspr-devel >= 1:4.8.7
BuildRequires: nss-devel >= 1:3.12.9
BuildRequires: pango-devel >= 1:1.14.0
@@ -72,7 +74,7 @@
BuildRequires: xcursor-devel
BuildRequires: xft-devel >= 2.1-2
%else
-BuildRequires: xorg-lib-libXScrnSaver-devel
+BuildRequires: xorg-lib-libXScrnSaver-devel
BuildRequires: xorg-lib-libXext-devel
BuildRequires: xorg-lib-libXinerama-devel
BuildRequires: xorg-lib-libXt-devel
@@ -119,7 +121,7 @@
Requires: cairo >= 1.10.2-5
Requires: dbus-glib >= 0.60
%{!?with_qt:Requires: gtk+2 >= 2:2.10.0}
-Requires: libpng >= 1.2.17
+Requires: libpng >= 1.4.1
Requires: libpng(APNG) >= 0.10
Requires: pango >= 1:1.14.0
Requires: sqlite3 >= %{sqlite_build_version}
@@ -174,17 +176,17 @@
%patch0 -p1
%patch1 -p1
%if "%{cc_version}" < "3.4"
-#%%patch3 -p2
+#%%patch2 -p2
%endif
+%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch7 -p1
%patch8 -p1
-%patch9 -p1
+%patch9 -p2
%build
-
if [ "$(grep -E '^[0-9]\.' mozilla/config/milestone.txt)" != "%{version}" ]; then
echo >&2
echo "Version %{version} does not match mozilla/config/milestone.txt!" >&2
@@ -262,10 +264,11 @@
ac_add_options --with-pthreads
ac_add_options --with-system-bz2
ac_add_options --with-system-jpeg
+ac_add_options --with-system-libevent
+ac_add_options --with-system-libvpx
ac_add_options --with-system-nspr
ac_add_options --with-system-nss
ac_add_options --with-system-png
-ac_add_options --with-system-libvpx
ac_add_options --with-system-zlib
ac_add_options --with-default-mozilla-five-home=%{_libdir}/%{name}
ac_add_options --disable-pedantic
@@ -582,6 +585,12 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.185 2011/08/18 18:43:27 qboosh
+- added gtkmozembed patch from FC (restore deprecated gtkmozembed API - still used by some packages)
+- updated BRs
+- use system libevent
+- release 2
+
Revision 1.184 2011/07/23 12:01:47 megabajt
- updated to 5.0.1 (since 5.0 xulrunner version matches firefox)
================================================================
Index: packages/xulrunner/xulrunner-gtkmozembed.patch
diff -u /dev/null packages/xulrunner/xulrunner-gtkmozembed.patch:1.1
--- /dev/null Thu Aug 18 20:43:33 2011
+++ packages/xulrunner/xulrunner-gtkmozembed.patch Thu Aug 18 20:43:27 2011
@@ -0,0 +1,8800 @@
+diff -up xulrunner-5.0/mozilla-release/embedding/browser/gtk/Makefile.in.gtkmozembed xulrunner-5.0/mozilla-release/embedding/browser/gtk/Makefile.in
+--- xulrunner-5.0/mozilla-release/embedding/browser/gtk/Makefile.in.gtkmozembed 2011-06-22 12:14:58.776816358 +0200
++++ xulrunner-5.0/mozilla-release/embedding/browser/gtk/Makefile.in 2011-06-22 12:14:58.776816358 +0200
+@@ -0,0 +1,54 @@
++#
++# ***** 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 the Mozilla browser.
++#
++# The Initial Developer of the Original Code is
++# Christopher Blizzard.
++# Portions created by the Initial Developer are Copyright (C) 1999
++# the Initial Developer. All Rights Reserved.
++#
++# Contributor(s):
++# Christopher Blizzard <blizzard at mozilla.org>
++#
++# 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 = gtkembedmoz
++
++DIRS=src
++
++ifdef ENABLE_TESTS
++TOOL_DIRS += tests
++endif
++
++include $(topsrcdir)/config/rules.mk
+diff -up xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/EmbedCertificates.cpp.gtkmozembed xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/EmbedCertificates.cpp
+--- xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/EmbedCertificates.cpp.gtkmozembed 2011-06-22 12:14:58.777816363 +0200
++++ xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/EmbedCertificates.cpp 2011-06-22 12:14:58.777816363 +0200
+@@ -0,0 +1,253 @@
++/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
++/* vim:set ts=2 sw=2 sts=2 tw=80 et cindent: */
++/* ***** 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) 2001
++ * the Initial Developer. All Rights Reserved.
++ *
++ * Contributor(s):
++ * Terry Hayes <thayes at netscape.com>
++ * Javier Delgadillo <javi at netscape.com>
++ * Oleg Romashin <romaxa at gmail.com>
++ *
++ * 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 ***** */
++/**
++ * Derived from nsNSSDialogs http://landfill.mozilla.org/mxr-test/seamonkey/source/security/manager/pki/src/nsNSSDialogs.cpp
++ */
++#include <strings.h>
++#include "nsIURI.h"
++#include "EmbedPrivate.h"
++#include "nsServiceManagerUtils.h"
++#include "nsIWebNavigationInfo.h"
++#include "nsDocShellCID.h"
++#include "nsCOMPtr.h"
++#ifdef MOZILLA_INTERNAL_API
++#include "nsString.h"
++#include "nsXPIDLString.h"
++#include "nsReadableUtils.h"
++#else
++#include "nsStringAPI.h"
++#endif
++#include "nsIPrompt.h"
++#include "nsIDOMWindowInternal.h"
++#include "nsIComponentManager.h"
++#include "nsIServiceManager.h"
++#include "nsIStringBundle.h"
++#include "nsIInterfaceRequestor.h"
++#include "nsIInterfaceRequestorUtils.h"
++#include "nsIX509Cert.h"
++#include "nsIX509CertDB.h"
++#include "nsIDateTimeFormat.h"
++#include "nsDateTimeFormatCID.h"
++#include "EmbedCertificates.h"
++#include "nsIKeygenThread.h"
++#include "nsIX509CertValidity.h"
++#include "nsICRLInfo.h"
++#include "gtkmozembed.h"
++
++#define PIPSTRING_BUNDLE_URL "chrome://pippki/locale/pippki.properties"
++
++EmbedCertificates::EmbedCertificates(void)
++{
++}
++
++EmbedCertificates::~EmbedCertificates()
++{
++}
++
++NS_IMPL_THREADSAFE_ADDREF(EmbedCertificates)
++NS_IMPL_THREADSAFE_RELEASE(EmbedCertificates)
++NS_INTERFACE_MAP_BEGIN(EmbedCertificates)
++NS_INTERFACE_MAP_ENTRY(nsITokenPasswordDialogs)
++NS_INTERFACE_MAP_ENTRY(nsICertificateDialogs)
++NS_INTERFACE_MAP_ENTRY(nsIClientAuthDialogs)
++NS_INTERFACE_MAP_ENTRY(nsICertPickDialogs)
++NS_INTERFACE_MAP_ENTRY(nsITokenDialogs)
++NS_INTERFACE_MAP_ENTRY(nsIGeneratingKeypairInfoDialogs)
++NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIDOMCryptoDialogs)
++NS_INTERFACE_MAP_END
++
++nsresult
++EmbedCertificates::Init(void)
++{
++ nsresult rv;
++ nsCOMPtr<nsIStringBundleService> service =
++ do_GetService(NS_STRINGBUNDLE_CONTRACTID, &rv);
++ if (NS_FAILED(rv)) return NS_OK;
++ rv = service->CreateBundle(PIPSTRING_BUNDLE_URL,
++ getter_AddRefs(mPIPStringBundle));
++ return NS_OK;
++}
++
++nsresult
++EmbedCertificates::SetPassword(nsIInterfaceRequestor *ctx,
++ const PRUnichar *tokenName, PRBool* _canceled)
++{
++ *_canceled = PR_FALSE;
++ return NS_OK;
++}
++
++nsresult
++EmbedCertificates::GetPassword(nsIInterfaceRequestor *ctx,
++ const PRUnichar *tokenName,
++ PRUnichar **_password,
++ PRBool* _canceled)
++{
++ *_canceled = PR_FALSE;
++ return NS_OK;
++}
++
++NS_IMETHODIMP
++EmbedCertificates::CrlImportStatusDialog(nsIInterfaceRequestor *ctx, nsICRLInfo *crl)
++{
++ return NS_OK;
++}
++
++NS_IMETHODIMP
++EmbedCertificates::ConfirmDownloadCACert(nsIInterfaceRequestor *ctx,
++ nsIX509Cert *cert,
++ PRUint32 *_trust,
++ PRBool *_retval)
++{
++ // If an implementation chooses not to implement UI for displaying
++ // the cert and asking the user for confirmation,
++ // then this function must return PR_FALSE.
++ *_retval = PR_FALSE;
++ *_trust = nsIX509CertDB::UNTRUSTED;
++ return NS_OK;
++}
++
++NS_IMETHODIMP
++EmbedCertificates::NotifyCACertExists(nsIInterfaceRequestor *ctx)
++{
++ return NS_OK;
++}
++
++NS_IMETHODIMP
++EmbedCertificates::ChooseCertificate(
++ nsIInterfaceRequestor *ctx,
++ const PRUnichar *cn,
++ const PRUnichar *organization,
++ const PRUnichar *issuer,
++ const PRUnichar **certNickList,
++ const PRUnichar **certDetailsList,
++ PRUint32 count,
++ PRInt32 *selectedIndex,
++ PRBool *canceled)
++{
++ *canceled = PR_FALSE;
++ return NS_OK;
++}
++
++NS_IMETHODIMP
++EmbedCertificates::PickCertificate(
++ nsIInterfaceRequestor *ctx,
++ const PRUnichar **certNickList,
++ const PRUnichar **certDetailsList,
++ PRUint32 count,
++ PRInt32 *selectedIndex,
++ PRBool *canceled)
++{
++ *canceled = PR_FALSE;
++ return NS_OK;
++}
++
++NS_IMETHODIMP
++EmbedCertificates::SetPKCS12FilePassword(
++ nsIInterfaceRequestor *ctx,
++ nsAString &_password,
++ PRBool *_retval)
++{
++ /* The person who wrote this method implementation did
++ * not read the contract.
++ */
++ *_retval = PR_FALSE;
++ return NS_OK;
++}
++
++NS_IMETHODIMP
++EmbedCertificates::GetPKCS12FilePassword(
++ nsIInterfaceRequestor *ctx,
++ nsAString &_password,
++ PRBool *_retval)
++{
++ /* The person who wrote this method implementation did
++ * not read the contract.
++ */
++ *_retval = PR_FALSE;
++ return NS_OK;
++}
++
++/* void viewCert (in nsIX509Cert cert); */
++NS_IMETHODIMP
++EmbedCertificates::ViewCert(
++ nsIInterfaceRequestor *ctx,
++ nsIX509Cert *cert)
++{
++ return NS_OK;
++}
++
++NS_IMETHODIMP
++EmbedCertificates::DisplayGeneratingKeypairInfo(nsIInterfaceRequestor *aCtx, nsIKeygenThread *runnable)
++{
++ return NS_OK;
++}
++
++NS_IMETHODIMP
++EmbedCertificates::ChooseToken(
++ nsIInterfaceRequestor *aCtx,
++ const PRUnichar **aTokenList,
++ PRUint32 aCount,
++ PRUnichar **aTokenChosen,
++ PRBool *aCanceled)
++{
++ *aCanceled = PR_FALSE;
++ return NS_OK;
++}
++
++NS_IMETHODIMP
++EmbedCertificates::DisplayProtectedAuth(
++ nsIInterfaceRequestor *aCtx,
++ nsIProtectedAuthThread *runnable)
++{
++ return NS_OK;
++}
++
++/* boolean ConfirmKeyEscrow (in nsIX509Cert escrowAuthority); */
++NS_IMETHODIMP
++EmbedCertificates::ConfirmKeyEscrow(nsIX509Cert *escrowAuthority, PRBool *_retval)
++{
++ // If an implementation chooses not to implement UI that asks the user for
++ // confirmation to hand out the private key,
++ // then this function must return PR_FALSE.
++ *_retval = PR_FALSE;
++ return NS_OK;
++}
++
+diff -up xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/EmbedCertificates.h.gtkmozembed xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/EmbedCertificates.h
+--- xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/EmbedCertificates.h.gtkmozembed 2011-06-22 12:14:58.778816368 +0200
++++ xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/EmbedCertificates.h 2011-06-22 12:14:58.778816368 +0200
+@@ -0,0 +1,84 @@
++/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
++/* vim:set ts=2 sw=2 sts=2 et cindent: */
++/* ***** 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) 2001
++ * the Initial Developer. All Rights Reserved.
++ *
++ * Contributor(s):
++ * Terry Hayes <thayes at netscape.com>
++ * Javier Delgadillo <javi at netscape.com>
++ * Oleg Romashin <romaxa at gmail.com>
++ *
++ * 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 ***** */
++/**
++ * Derived from nsNSSDialogs http://landfill.mozilla.org/mxr-test/seamonkey/source/security/manager/pki/src/nsNSSDialogs.h
++ */
++#ifndef __EmbedCertificates_h
++#define __EmbedCertificates_h
++#include "nsITokenPasswordDialogs.h"
++#include "nsICertificateDialogs.h"
++#include "nsIClientAuthDialogs.h"
++#include "nsICertPickDialogs.h"
++#include "nsITokenDialogs.h"
++#include "nsIDOMCryptoDialogs.h"
++#include "nsIGenKeypairInfoDlg.h"
++#include "nsCOMPtr.h"
++#include "nsIStringBundle.h"
++#define EMBED_CERTIFICATES_CID \
++ { 0x518e071f, 0x1dd2, 0x11b2, \
++ { 0x93, 0x7e, 0xc4, 0x5f, 0x14, 0xde, 0xf7, 0x78 }}
++#define EMBED_CERTIFICATES_DESCRIPTION "Certificates Listener Impl"
++class EmbedPrivate;
++class EmbedCertificates
++: public nsITokenPasswordDialogs,
++ public nsICertificateDialogs,
++ public nsIClientAuthDialogs,
++ public nsICertPickDialogs,
++ public nsITokenDialogs,
++ public nsIDOMCryptoDialogs,
++ public nsIGeneratingKeypairInfoDialogs
++{
++ public:
++ NS_DECL_ISUPPORTS
++ NS_DECL_NSITOKENPASSWORDDIALOGS
++ NS_DECL_NSICERTIFICATEDIALOGS
++ NS_DECL_NSICLIENTAUTHDIALOGS
++ NS_DECL_NSICERTPICKDIALOGS
++ NS_DECL_NSITOKENDIALOGS
++ NS_DECL_NSIDOMCRYPTODIALOGS
++ NS_DECL_NSIGENERATINGKEYPAIRINFODIALOGS
++ EmbedCertificates();
++ virtual ~EmbedCertificates();
++ nsresult Init(void);
++ protected:
++ nsCOMPtr<nsIStringBundle> mPIPStringBundle;
++};
++#endif /* __EmbedCertificates_h */
+diff -up xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/EmbedContentListener.cpp.gtkmozembed xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/EmbedContentListener.cpp
+--- xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/EmbedContentListener.cpp.gtkmozembed 2011-06-22 12:14:58.780816378 +0200
++++ xulrunner-5.0/mozilla-release/embedding/browser/gtk/src/EmbedContentListener.cpp 2011-06-22 12:14:58.780816378 +0200
+@@ -0,0 +1,156 @@
++/* ***** 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
++ * Christopher Blizzard.
++ * Portions created by the Initial Developer are Copyright (C) 2001
++ * the Initial Developer. All Rights Reserved.
++ *
++ * Contributor(s):
++ * Christopher Blizzard <blizzard at mozilla.org>
++ *
++ * 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 ***** */
++
++#include "nsIURI.h"
++
++#include "EmbedContentListener.h"
++#include "EmbedPrivate.h"
++
++#include "nsServiceManagerUtils.h"
++#include "nsIWebNavigationInfo.h"
++#include "nsDocShellCID.h"
++
++EmbedContentListener::EmbedContentListener(void)
++{
++ mOwner = nsnull;
++}
++
++EmbedContentListener::~EmbedContentListener()
++{
++}
++
++NS_IMPL_ISUPPORTS2(EmbedContentListener,
++ nsIURIContentListener,
++ nsISupportsWeakReference)
++
++nsresult
++EmbedContentListener::Init(EmbedPrivate *aOwner)
++{
++ mOwner = aOwner;
++ return NS_OK;
++}
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xulrunner/xulrunner.spec?r1=1.184&r2=1.185&f=u
More information about the pld-cvs-commit
mailing list