Commit 9c02881a authored by Phil Miller's avatar Phil Miller

* updates

parent f3559538
#
# Chakra Packages for Chakra, part of chakra-project.org
#
# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
# include global config
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
pkgname=dvdauthor
pkgver=0.6.14
pkgrel=1
pkgdesc="DVD authoring tools"
arch=('i686' 'x86_64')
url="http://dvdauthor.sourceforge.net/"
license=('GPL')
depends=('libdvdread' 'imagemagick')
source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz)
md5sums=('bd646b47950c4091ffd781d43fd2c5e9')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
./configure --prefix=/usr || return 1
make || return 1
make DESTDIR="${pkgdir}" install || return 1
}
#
# Chakra Packages for Chakra, part of chakra-project.org
#
# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
# include global config
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
pkgname=k9copy
pkgver=2.3.5
pkgrel=1
pkgdesc="A small utility which allows the copy of DVD under Linux"
arch=('i686' 'x86_64')
url="http://k9copy.sourceforge.net"
license=('GPL')
depends=('kdebase-runtime' 'libmpeg2' 'xine-lib' 'dvd+rw-tools' 'dvdauthor')
makedepends=('automoc4' 'cmake')
install=k9copy.install
source=(http://downloads.sourceforge.net/project/${pkgname}/k9copy-kde4/${pkgver}/${pkgname}-${pkgver}-Source.tar.gz
k9copy-2.3.5-gcc45.patch)
md5sums=('808382988bc87c58d7149da97637e57d'
'826e1de9da577f195ae13f2f7bdb7aa6')
build() {
cd "${srcdir}/${pkgname}-${pkgver}-Source"
# fix build with gcc45
patch -Np0 -i ${srcdir}/k9copy-2.3.5-gcc45.patch || return 1
sed -i -e "s:Name=k9copy:Name=K9copy:g" k9copy.desktop k9copy_assistant.desktop
cmake -DCMAKE_INSTALL_PREFIX=/usr || return 1
make || return 1
make DESTDIR="${pkgdir}" install || return 1
}
Passing const char * instead of QByteArray to printf
http://bugs.gentoo.org/show_bug.cgi?id=304755
Patch written by Kacper Kowalik <xarthisius.kk@gmail.com>
--- src/xine/k9xineplayer.cpp
+++ src/xine/k9xineplayer.cpp
@@ -251,7 +251,7 @@
if ((vo_port = xine_open_video_driver(xine,
m_vo.toAscii(), XINE_VISUAL_TYPE_X11, (void *) &vis)) == NULL) {
- printf("I'm unable to initialize '%s' video driver. Giving up.\n", m_vo.toAscii());
+ printf("I'm unable to initialize '%s' video driver. Giving up.\n", m_vo.toAscii().constData());
return ;
}
@@ -270,7 +270,7 @@
running=false;
m_title="";
if ((!xine_open(stream, m_mrl.toUtf8())) || (!xine_play(stream, 0, 0))) {
- printf("Unable to open mrl '%s'\n", m_mrl.toUtf8());
+ printf("Unable to open mrl '%s'\n", m_mrl.toUtf8().constData());
return ;
}
QTimer::singleShot (500, this, SLOT (updatePosition ()));
post_install() {
xdg-icon-resource forceupdate --theme hicolor &> /dev/null
}
post_upgrade() {
post_install
}
post_remove() {
post_install
}
#
# Chakra Packages for Chakra, part of chakra-project.org
#
# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
# include global config
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
pkgname=skanlite
pkgver=0.4
_kdever=4.4.0
pkgrel=1
pkgdesc="Image Scanning Application for KDE"
arch=('i686' 'x86_64')
url='http://www.kde.org'
license=('LGPL')
depends=('kdegraphics-common')
makedepends=('pkgconfig' 'cmake' 'automoc4')
options=('docs')
source=("http://download.kde.org/stable/${_kdever}/src/extragear/${pkgname}-${pkgver}-kde${_kdever}.tar.bz2")
md5sums=('b1e6e8a3e6b2ffab667afbf6426d344d')
build() {
cd ${srcdir}
mkdir build
cd build
cmake ../${pkgname}-${pkgver}-kde${_kdever} \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr
make || return 1
}
package() {
cd ${srcdir}/build
make DESTDIR=${pkgdir} install
}
#
# Chakra Packages for Chakra, part of chakra-project.org
#
# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
# PKGBUILD based on: http://aur.archlinux.org/packages.php?ID=26800
# include global config
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
pkgname=vlc-dev
pkgver=1.1.0rc1
_dlver=1.1.0-rc
pkgrel=1
pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player with VAAPI support"
arch=('i686' 'x86_64')
url="http://www.videolan.org/vlc/"
license=(GPL)
# NOTE: Here you choose whether or not to enable all the VAAPI stuff (GPU acceleration for video processing - which is faster).
# But with VLC this is still experimental (like this whole bleeding edge version of VLC). Thus, if for any reason you want to
# disable VAAPI, just set the value of the following variable to anything else than "1". You can also comment the variable itself,
# modify it or just remove it completely. We call this the 'Freedom of choice' down here.
_vaapi=1
makedepends=('libnotify' 'libxpm' 'lirc-utils' 'live-media' 'xulrunner')
optdepends=('libdvdcss: for decoding encrypted DVDs'
'libnotify: for notification plugin'
'lirc-utils: for lirc plugin')
if [ "$_vaapi" == "1" ]; then
depends=('a52dec' 'avahi' 'ffmpeg' 'fribidi' 'fluidsynth' 'libass' 'libcddb'
'libcdio' 'libdca' 'libdvbpsi' 'libdvdnav' 'libmad' 'libmatroska'
'libmodplug' 'libmpcdec' 'libmpeg2' 'libmtp' 'libproxy' 'libshout'
'libv4l' 'libva-sds' 'libxv' 'lua' 'mesa' 'qt' 'sdl_image' 'smbclient'
'sysfsutils' 'taglib' 'ttf-freefont' 'vdpau-video' 'xdg-utils' 'zvbi')
else # 'libva-sds' and 'vdpau-video' won't be installed, if "_vaapi" variable not set as "1"
depends=('a52dec' 'avahi' 'ffmpeg' 'fribidi' 'fluidsynth' 'libass' 'libcddb'
'libcdio' 'libdca' 'libdvbpsi' 'libdvdnav' 'libmad' 'libmatroska'
'libmodplug' 'libmpcdec' 'libmpeg2' 'libmtp' 'libproxy' 'libshout'
'libv4l' 'libxv' 'lua' 'mesa' 'qt' 'sdl_image' 'smbclient' 'sysfsutils'
'taglib' 'ttf-freefont' 'xdg-utils' 'zvbi')
fi
replaces=('vlc')
conflicts=('vlc')
provides=('vlc')
options=(!libtool)
install=vlc.install
source=(http://downloads.videolan.org/pub/videolan/testing/vlc-${_dlver}/vlc-${_dlver}.tar.bz2
vlc-vdpau.desktop)
md5sums=('4983cbcaf206392c8fa7df6608fdf1ef'
'b58ffb8c14b6967685a08c1d5332e190')
build() {
# fix build
if [ "${_arch}" = "i686" ]; then
export CXXFLAGS="-march=i686 -mtune=generic -O2 -pipe -D__STDC_CONSTANT_MACROS"
else
export CXXFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -D__STDC_CONSTANT_MACROS"
fi
cd $startdir/src/vlc-${_dlver}
sed -i -e 's:truetype/freefont:TTF:g' modules/misc/freetype.c
[ "${CARCH}" = "i686" ] && EXTRAFEATURES="--enable-loader --enable-live555 --with-live555-tree=/usr/lib/live"
[ "${CARCH}" = "x86_64" ] && EXTRAFEATURES="--enable-fast-install --enable-live555 --with-live555-tree=/usr/lib/live"
./configure --prefix=/usr \
--enable-libass \
--enable-dvdread \
--enable-jack \
--enable-dvdnav \
--disable-rpath \
--enable-zvbi \
--enable-qt4 \
--enable-faad \
--enable-alsa \
--enable-skins2 \
--enable-dvb \
--enable-v4l \
--enable-theora \
--enable-flac \
--enable-snapshot \
--enable-dbus \
--enable-ogg \
--enable-dbus-control \
--enable-shared \
--enable-nls \
--enable-lirc \
--enable-shout \
--enable-pvr \
--enable-ncurses \
--enable-mozilla \
--enable-merge-ffmpeg \
--disable-projectm \
--program-suffix= \
--enable-realrtsp ${EXTRAFEATURES} || return 1
CFLAGS="-fPIC"
make || return 1
make DESTDIR=${pkgdir}/ install || return 1
for res in 16 32 48 128; do
install -D -m644 ${srcdir}/vlc-${_dlver}/share/vlc${res}x${res}.png \
${pkgdir}/usr/share/icons/hicolor/${res}x${res}/apps/vlc.png || return 1
done
#Enabling hardware acceleration option in the .desktop file
install -D -m 644 ${srcdir}/vlc-vdpau.desktop ${pkgdir}/usr/share/applications/vlc-vdpau.desktop
rm -rf ${pkgdir}/usr/lib/mozilla
}
\ No newline at end of file
--- vlc-1.0.4/modules/codec/png.c~ 2010-01-19 02:31:45.575326077 +0100
+++ vlc-1.0.4/modules/codec/png.c 2010-01-19 02:32:21.465321175 +0100
@@ -155,7 +155,7 @@
p_info = png_create_info_struct( p_png );
if( p_info == NULL )
{
- png_destroy_read_struct( &p_png, png_infopp_NULL, png_infopp_NULL );
+ png_destroy_read_struct( &p_png, NULL, NULL );
block_Release( p_block ); *pp_block = NULL;
return NULL;
}
@@ -163,7 +163,7 @@
p_end_info = png_create_info_struct( p_png );
if( p_end_info == NULL )
{
- png_destroy_read_struct( &p_png, &p_info, png_infopp_NULL );
+ png_destroy_read_struct( &p_png, &p_info, NULL );
block_Release( p_block ); *pp_block = NULL;
return NULL;
}
diff -p -up vlc-1.0.4/projects/mozilla/control/npolibvlc.cpp~ vlc-1.0.4/projects/mozilla/control/npolibvlc.cpp
--- vlc-1.0.4/projects/mozilla/control/npolibvlc.cpp~ 2009-12-07 22:12:58.000000000 +0100
+++ vlc-1.0.4/projects/mozilla/control/npolibvlc.cpp 2010-01-06 15:50:32.000000000 +0100
@@ -949,7 +949,7 @@ LibvlcPlaylistNPObject::invoke(int index
void LibvlcPlaylistNPObject::parseOptions(const NPString &nps,
int *i_options, char*** ppsz_options)
{
- if( nps.utf8length )
+ if( nps.UTF8Length )
{
char *s = stringValue(nps);
char *val = s;
@@ -961,7 +961,7 @@ void LibvlcPlaylistNPObject::parseOption
{
int nOptions = 0;
- char *end = val + nps.utf8length;
+ char *end = val + nps.UTF8Length;
while( val < end )
{
// skip leading blanks
diff -p -up vlc-1.0.4/projects/mozilla/control/nporuntime.cpp~ vlc-1.0.4/projects/mozilla/control/nporuntime.cpp
--- vlc-1.0.4/projects/mozilla/control/nporuntime.cpp~ 2009-12-07 22:12:58.000000000 +0100
+++ vlc-1.0.4/projects/mozilla/control/nporuntime.cpp 2010-01-06 15:51:12.000000000 +0100
@@ -37,11 +37,11 @@
char* RuntimeNPObject::stringValue(const NPString &s)
{
- NPUTF8 *val = static_cast<NPUTF8*>(malloc((s.utf8length+1) * sizeof(*val)));
+ NPUTF8 *val = static_cast<NPUTF8*>(malloc((s.UTF8Length+1) * sizeof(*val)));
if( val )
{
- strncpy(val, s.utf8characters, s.utf8length);
- val[s.utf8length] = '\0';
+ strncpy(val, s.UTF8Characters, s.UTF8Length);
+ val[s.UTF8Length] = '\0';
}
return val;
}
diff -p -up vlc-1.0.4/projects/mozilla/support/npunix.c~ vlc-1.0.4/projects/mozilla/support/npunix.c
--- vlc-1.0.4/projects/mozilla/support/npunix.c~ 2009-12-05 10:03:25.000000000 +0100
+++ vlc-1.0.4/projects/mozilla/support/npunix.c 2010-01-06 15:43:03.000000000 +0100
@@ -1,21 +1,17 @@
/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
*
- * Mozilla/Firefox plugin for VLC
- * Copyright (C) 2009, Jean-Paul Saman <jpsaman@videolan.org>
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * 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.
*
@@ -27,7 +23,19 @@
* Contributor(s):
* Stephen Mak <smak@sun.com>
*
- */
+ * 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
@@ -43,19 +51,11 @@
*----------------------------------------------------------------------
*/
-#include "config.h"
-
#define XP_UNIX 1
-#define OJI 1
-
-#include <npapi.h>
-#ifdef HAVE_NPFUNCTIONS_H
-#include <npfunctions.h>
-#else
-#include <npupp.h>
-#endif
-#include "../vlcshell.h"
+#include <stdio.h>
+#include "npapi.h"
+#include "npfunctions.h"
/*
* Define PLUGIN_TRACE to have the wrapper functions print
@@ -69,6 +69,7 @@
#define PLUGINDEBUGSTR(msg)
#endif
+
/***********************************************************************
*
* Globals
@@ -77,6 +78,7 @@
static NPNetscapeFuncs gNetscapeFuncs; /* Netscape Function table */
+
/***********************************************************************
*
* Wrapper functions : plugin calling Netscape Navigator
@@ -103,502 +105,229 @@ NPN_Version(int* plugin_major, int* plug
NPError
NPN_GetValue(NPP instance, NPNVariable variable, void *r_value)
{
-#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
- return CallNPN_GetValueProc(gNetscapeFuncs.getvalue,
- instance, variable, r_value);
-#else
return (*gNetscapeFuncs.getvalue)(instance, variable, r_value);
-#endif
}
NPError
NPN_SetValue(NPP instance, NPPVariable variable, void *value)
{
-#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
- return CallNPN_SetValueProc(gNetscapeFuncs.setvalue,
- instance, variable, value);
-#else
return (*gNetscapeFuncs.setvalue)(instance, variable, value);
-#endif
}
NPError
NPN_GetURL(NPP instance, const char* url, const char* window)
{
-#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
- return CallNPN_GetURLProc(gNetscapeFuncs.geturl, instance, url, window);
-#else
return (*gNetscapeFuncs.geturl)(instance, url, window);
-#endif
}
NPError
NPN_GetURLNotify(NPP instance, const char* url, const char* window, void* notifyData)
{
-#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
- return CallNPN_GetURLNotifyProc(gNetscapeFuncs.geturlnotify, instance, url, window, notifyData);
-#else
return (*gNetscapeFuncs.geturlnotify)(instance, url, window, notifyData);
-#endif
}
NPError
NPN_PostURL(NPP instance, const char* url, const char* window,
uint32_t len, const char* buf, NPBool file)
{
-#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
- return CallNPN_PostURLProc(gNetscapeFuncs.posturl, instance,
- url, window, len, buf, file);
-#else
return (*gNetscapeFuncs.posturl)(instance, url, window, len, buf, file);
-#endif
}
NPError
NPN_PostURLNotify(NPP instance, const char* url, const char* window, uint32_t len,
const char* buf, NPBool file, void* notifyData)
{
-#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
- return CallNPN_PostURLNotifyProc(gNetscapeFuncs.posturlnotify,
- instance, url, window, len, buf, file, notifyData);
-#else
return (*gNetscapeFuncs.posturlnotify)(instance, url, window, len, buf, file, notifyData);
-
-#endif
}
NPError
NPN_RequestRead(NPStream* stream, NPByteRange* rangeList)
{
-#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
- return CallNPN_RequestReadProc(gNetscapeFuncs.requestread,
- stream, rangeList);
-#else
return (*gNetscapeFuncs.requestread)(stream, rangeList);
-#endif
}
NPError
NPN_NewStream(NPP instance, NPMIMEType type, const char *window,
NPStream** stream_ptr)
{
-#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
- return CallNPN_NewStreamProc(gNetscapeFuncs.newstream, instance,
- type, window, stream_ptr);
-#else
return (*gNetscapeFuncs.newstream)(instance, type, window, stream_ptr);
-#endif
}
int32_t
NPN_Write(NPP instance, NPStream* stream, int32_t len, void* buffer)
{
-#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
- return CallNPN_WriteProc(gNetscapeFuncs.write, instance,
- stream, len, buffer);
-#else
return (*gNetscapeFuncs.write)(instance, stream, len, buffer);
-#endif
}
NPError
NPN_DestroyStream(NPP instance, NPStream* stream, NPError reason)
{
-#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
- return CallNPN_DestroyStreamProc(gNetscapeFuncs.destroystream,
- instance, stream, reason);
-#else
return (*gNetscapeFuncs.destroystream)(instance, stream, reason);
-#endif
}
void
NPN_Status(NPP instance, const char* message)
{
-#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
- CallNPN_StatusProc(gNetscapeFuncs.status, instance, message);
-#else
(*gNetscapeFuncs.status)(instance, message);
-#endif
}
const char*
NPN_UserAgent(NPP instance)
{
-#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
- return CallNPN_UserAgentProc(gNetscapeFuncs.uagent, instance);
-#else
return (*gNetscapeFuncs.uagent)(instance);
-#endif
}
-void *NPN_MemAlloc(uint32_t size)
+void*
+NPN_MemAlloc(uint32_t size)
{
-#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
- return CallNPN_MemAllocProc(gNetscapeFuncs.memalloc, size);
-#else
return (*gNetscapeFuncs.memalloc)(size);
-#endif
}
void NPN_MemFree(void* ptr)
{
-#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
- CallNPN_MemFreeProc(gNetscapeFuncs.memfree, ptr);
-#else
(*gNetscapeFuncs.memfree)(ptr);
-#endif
}
uint32_t NPN_MemFlush(uint32_t size)
{
-#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
- return CallNPN_MemFlushProc(gNetscapeFuncs.memflush, size);
-#else
return (*gNetscapeFuncs.memflush)(size);
-#endif
}
void NPN_ReloadPlugins(NPBool reloadPages)
{
-#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
- CallNPN_ReloadPluginsProc(gNetscapeFuncs.reloadplugins, reloadPages);
-#else
(*gNetscapeFuncs.reloadplugins)(reloadPages);
-#endif
-}
-
-#ifdef OJI
-JRIEnv* NPN_GetJavaEnv()
-{
-#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
- return CallNPN_GetJavaEnvProc(gNetscapeFuncs.getJavaEnv);
-#else
- return (*gNetscapeFuncs.getJavaEnv);
-#endif
}
-jref NPN_GetJavaPeer(NPP instance)
-{
-#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
- return CallNPN_GetJavaPeerProc(gNetscapeFuncs.getJavaPeer,
- instance);
-#else
- return (*gNetscapeFuncs.getJavaPeer)(instance);
-#endif
-}
-#endif
-
void
NPN_InvalidateRect(NPP instance, NPRect *invalidRect)
{
-#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
- CallNPN_InvalidateRectProc(gNetscapeFuncs.invalidaterect, instance,
- invalidRect);
-#else
(*gNetscapeFuncs.invalidaterect)(instance, invalidRect);
-#endif
}
void
NPN_InvalidateRegion(NPP instance, NPRegion invalidRegion)
{
-#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
- CallNPN_InvalidateRegionProc(gNetscapeFuncs.invalidateregion, instance,
- invalidRegion);
-#else
(*gNetscapeFuncs.invalidateregion)(instance, invalidRegion);
-#endif
}
void
NPN_ForceRedraw(NPP instance)
{
-#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
- CallNPN_ForceRedrawProc(gNetscapeFuncs.forceredraw, instance);
-#else
(*gNetscapeFuncs.forceredraw)(instance);
-#endif
}
void NPN_PushPopupsEnabledState(NPP instance, NPBool enabled)
{
-#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
- CallNPN_PushPopupsEnabledStateProc(gNetscapeFuncs.pushpopupsenabledstate,
- instance, enabled);
-#else
(*gNetscapeFuncs.pushpopupsenabledstate)(instance, enabled);
-#endif
}
void NPN_PopPopupsEnabledState(NPP instance)
{
-#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
- CallNPN_PopPopupsEnabledStateProc(gNetscapeFuncs.poppopupsenabledstate,
- instance);
-#else
(*gNetscapeFuncs.poppopupsenabledstate)(instance);
-#endif
}
NPIdentifier NPN_GetStringIdentifier(const NPUTF8 *name)
{
- int minor = gNetscapeFuncs.version & 0xFF;
- if( minor >= 14 )
- {
-#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
- return CallNPN_GetStringIdentifierProc(
- gNetscapeFuncs.getstringidentifier, name);
-#else