From 8db1f29b007e8918e4806c5b2d886421e0845026 Mon Sep 17 00:00:00 2001 From: Mikhail Voytenko Date: Tue, 23 Mar 2010 10:25:18 +0100 Subject: fwk138: #i108774# update with the newer version --- np_sdk/mozsrc/npunix.c | 60 +++++++++++++++++++++++++++++++++++++------------- 1 file changed, 45 insertions(+), 15 deletions(-) diff --git a/np_sdk/mozsrc/npunix.c b/np_sdk/mozsrc/npunix.c index bac0a38f10d4..b0f087e7a384 100644 --- a/np_sdk/mozsrc/npunix.c +++ b/np_sdk/mozsrc/npunix.c @@ -1,25 +1,41 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- * - * 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/ + * ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 * - * 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 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 Netscape are - * Copyright (C) 1998 Netscape Communications Corporation. All - * Rights Reserved. + * 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): - * Stephen Mak - */ + * Stephen Mak + * + * 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 ***** */ /* * npunix.c @@ -223,6 +239,18 @@ NPN_ForceRedraw(NPP instance) CallNPN_ForceRedrawProc(gNetscapeFuncs.forceredraw, instance); } +void NPN_PushPopupsEnabledState(NPP instance, NPBool enabled) +{ + CallNPN_PushPopupsEnabledStateProc(gNetscapeFuncs.pushpopupsenabledstate, + instance, enabled); +} + +void NPN_PopPopupsEnabledState(NPP instance) +{ + CallNPN_PopPopupsEnabledStateProc(gNetscapeFuncs.poppopupsenabledstate, + instance); +} + /*********************************************************************** @@ -364,7 +392,7 @@ NP_GetMIMEDescription(void) * that the navigator needs. */ NPError -NP_GetValue(NPP future, NPPVariable variable, void *value) +NP_GetValue(void* future, NPPVariable variable, void *value) { return NPP_GetValue(future, variable, value); } @@ -445,6 +473,8 @@ NP_Initialize(NPNetscapeFuncs* nsTable, NPPluginFuncs* pluginFuncs) gNetscapeFuncs.getJavaPeer = nsTable->getJavaPeer; #endif gNetscapeFuncs.getvalue = nsTable->getvalue; + gNetscapeFuncs.pushpopupsenabledstate = nsTable->pushpopupsenabledstate; + gNetscapeFuncs.poppopupsenabledstate = nsTable->poppopupsenabledstate; /* * Set up the plugin function table that Netscape will use to -- cgit v1.2.3 From 7c3526ec2d67110a25526edb185c656b6c90502d Mon Sep 17 00:00:00 2001 From: Mikhail Voytenko Date: Tue, 23 Mar 2010 10:27:51 +0100 Subject: fwk138: #i108774# let it be compiled in the current environment --- np_sdk/mozsrc/npunix.c | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/np_sdk/mozsrc/npunix.c b/np_sdk/mozsrc/npunix.c index b0f087e7a384..55d0fa5316d2 100644 --- a/np_sdk/mozsrc/npunix.c +++ b/np_sdk/mozsrc/npunix.c @@ -239,20 +239,6 @@ NPN_ForceRedraw(NPP instance) CallNPN_ForceRedrawProc(gNetscapeFuncs.forceredraw, instance); } -void NPN_PushPopupsEnabledState(NPP instance, NPBool enabled) -{ - CallNPN_PushPopupsEnabledStateProc(gNetscapeFuncs.pushpopupsenabledstate, - instance, enabled); -} - -void NPN_PopPopupsEnabledState(NPP instance) -{ - CallNPN_PopPopupsEnabledStateProc(gNetscapeFuncs.poppopupsenabledstate, - instance); -} - - - /*********************************************************************** * * Wrapper functions : Netscape Navigator -> plugin @@ -473,8 +459,6 @@ NP_Initialize(NPNetscapeFuncs* nsTable, NPPluginFuncs* pluginFuncs) gNetscapeFuncs.getJavaPeer = nsTable->getJavaPeer; #endif gNetscapeFuncs.getvalue = nsTable->getvalue; - gNetscapeFuncs.pushpopupsenabledstate = nsTable->pushpopupsenabledstate; - gNetscapeFuncs.poppopupsenabledstate = nsTable->poppopupsenabledstate; /* * Set up the plugin function table that Netscape will use to -- cgit v1.2.3