nspluginwrapper

* debian/patches/use_syslsb.patch; dont build LSB libs on our own;
  this should unbreak flash+nspluginwrapper after latest ia32-libs
  update
  + use USE_SYSTEM_LSB accordingly in debian/rules

55. By Saša Bodiroža on 2009-08-21

releasing version 1.2.2-0ubuntu6

56. By Saša Bodiroža on 2009-08-21

Merge with upstream branch r1.1.7

57. By Saša Bodiroža on 2009-08-21

Add initial changelog entry

58. By Saša Bodiroža on 2009-08-21

Update Maintainer field in debian/control, as proposed by
DebianMaintainerField spec

59. By Saša Bodiroža on 2009-08-21

* Update debian/patches/000_debian_make_symlinks.diff
  - change short option for "nosymlinks" from "n" to "s" to avoid collision
    with option "native"
  - add option "nosymlinks" to print_usage()

60. By Saša Bodiroža on 2009-08-21

* Update debian/patches/003_update_help_info.diff because of change in
debian/patches/000_debian_make_symlinks.diff
* Refresh patches

61. By Saša Bodiroža on 2009-08-21

Update debian/patches/use_syslsb.patch because of different Makefile

62. By Saša Bodiroža on 2009-08-21

Add patch debian/patches/004_system_only_update.diff from Debian
version 1.2.2-1

63. By Saša Bodiroža on 2009-08-21

change short option for "nosymlinks" from "n" to "x" to avoid collision

64. By Saša Bodiroža on 2009-08-21

Update .bzr-builddeb/default.conf

65. By Saša Bodiroža on 2009-08-21

Add LP bug number to debian/changelog

66. By Saša Bodiroža on 2009-08-21

Add patch debian/patches/000_allow_empty_short_option.diff to allow no short
option for some parameter.

67. By Saša Bodiroža on 2009-08-21

Increment indices in the name of all previous patches.

68. By Saša Bodiroža on 2009-08-21

Refresh patches

69. By Saša Bodiroža on 2009-08-21

Attribute the patch 000_allow_empty_short_option.diff to Alexander Sack

70. By Saša Bodiroža on 2009-08-21

* Remove short option "x" for "nosymlinks" option in
  debian/patches/001_debian_make_symlinks.diff
  - Update debian/patches/004_update_help_info.diff
  - Update debian/patches/005_system_only_update.diff

71. By Saša Bodiroža on 2009-08-21

releasing version 1.3.0-0ubuntu1

Unmerged revisions

71. By Saša Bodiroža on 2009-08-21: releasing version 1.3.0-0ubuntu1
70. By Saša Bodiroža on 2009-08-21: * Remove short option "x" for "nosymlinks" option in
  debian/patches/001_debian_make_symlinks.diff
  - Update debian/patches/004_update_help_info.diff
  - Update debian/patches/005_system_only_update.diff
69. By Saša Bodiroža on 2009-08-21: Attribute the patch 000_allow_empty_short_option.diff to Alexander Sack
68. By Saša Bodiroža on 2009-08-21: Refresh patches
67. By Saša Bodiroža on 2009-08-21: Increment indices in the name of all previous patches.
66. By Saša Bodiroža on 2009-08-21: Add patch debian/patches/000_allow_empty_short_option.diff to allow no short
option for some parameter.
65. By Saša Bodiroža on 2009-08-21: Add LP bug number to debian/changelog
64. By Saša Bodiroža on 2009-08-21: Update .bzr-builddeb/default.conf
63. By Saša Bodiroža on 2009-08-21: change short option for "nosymlinks" from "n" to "x" to avoid collision
62. By Saša Bodiroža on 2009-08-21: Add patch debian/patches/004_system_only_update.diff from Debian
version 1.2.2-1

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Saša Bodiroža

nspluginwrapper

Merge lp:~jazzva/nspluginwrapper/1.3.0 into lp:nspluginwrapper

Commit message

Description of the change

Unmerged revisions

Preview Diff

Subscribers

 === modified file '.bzr-builddeb/default.conf'
 --- .bzr-builddeb/default.conf	2009-01-02 10:12:06 +0000
 +++ .bzr-builddeb/default.conf	2009-08-11 01:33:30 +0000
@@ -1,5 +1,5 @@
  [BUILDDEB]
  merge=True
  export-upstream = .
--export-upstream-revision = revid:jazzva@gmail.com-20090102100727-yx8scdwpkmh9xace
++export-upstream-revision = revid:jazzva@gmail.com-20090811003842-htca2u6z7nfh10w3
 === modified file 'ChangeLog'
 --- ChangeLog	2009-01-02 10:07:27 +0000
 +++ ChangeLog	2009-08-11 00:38:42 +0000
@@ -1,8 +1,58 @@
--2009-01-01 07:36  Gwenole Beauchesne <gb.public@free.fr>
--
--	* NEWS, nspluginwrapper.spec: Updates for 1.2.2.
--
--2009-01-01 07:34  Gwenole Beauchesne <gb.public@free.fr>
++2009-01-02 08:50  Gwenole Beauchesne <gb.public@free.fr>
++
++	* NEWS, nspluginwrapper.spec: Fix spelling.
++
++2009-01-01 20:51  Gwenole Beauchesne <gb.public@free.fr>
++
++	* src/rpc.c: Factor our socket creation.
++
++2009-01-01 20:26  Gwenole Beauchesne <gb.public@free.fr>
++
++	* src/npruntime-impl.h, src/npruntime.c, src/npw-viewer.c: Make it
++	  possible to disable NPIdentifier cache with
++	  NPW_NPRUNTIME_CACHE=no too.
++
++2009-01-01 17:58  Gwenole Beauchesne <gb.public@free.fr>
++
++	* NEWS, nspluginwrapper.spec: Updates for 1.3.0.
++
++2009-01-01 17:56  Gwenole Beauchesne <gb.public@free.fr>
++
++	* configure, lsb-build/headers/glib-2.0/glib.h,
++	  lsb-build/stub_libs/libglib-2.0.c: Add g_hash_table_find() and
++	  g_hash_table_remove_all() thunks. Besides, for bi-arch builds,
++	  it's assumed that 32-/64-bit glib versions are the same and
++	  exports the same functions.
++
++2009-01-01 17:46  Gwenole Beauchesne <gb.public@free.fr>
++
++	* src/npw-viewer.c: Add NPIdentifier cache.
++
++2009-01-01 15:13  Gwenole Beauchesne <gb.public@free.fr>
++
++	* src/npruntime-impl.h, src/npruntime.c: Add NPClass::HasMethod
++	  cache so that to lower RPC round-trip.
++
++2009-01-01 13:54  Gwenole Beauchesne <gb.public@free.fr>
++
++	* src/npw-viewer.c: Forcibly destroy the Xt source on exit.
++
++2009-01-01 11:02  Gwenole Beauchesne <gb.public@free.fr>
++
++	* NEWS: Updates.
++
++2009-01-01 10:58  Gwenole Beauchesne <gb.public@free.fr>
++
++	* src/npw-viewer.c: Don't create Xt polling sources if we know the
++	  plug-in uses Gtk (XEMBED).
++
++2009-01-01 10:33  Gwenole Beauchesne <gb.public@free.fr>
++
++	* src/npw-viewer.c: Get rid of the extra 25ms timer. The Xt timers
++	  & input sources are now
++	  checked in the X events source ::prepare() function.
++
++2009-01-01 07:31  Gwenole Beauchesne <gb.public@free.fr>
  	* Makefile, NEWS, README, configure, src/cxxabi-compat.cpp,
  	  src/debug.c, src/debug.h, src/libxpcom.c, src/npruntime-impl.h,
@@ -17,85 +67,186 @@
  	  utils/getdeps.sh, utils/mkruntime.sh, utils/repackage.sh: Update
  	  copyright notices.
--2008-12-28 11:36  Gwenole Beauchesne <gb.public@free.fr>
--
--	* NEWS, src/npw-malloc.c, src/npw-malloc.h, src/npw-viewer.c:
--	  Backport from trunk:
--
--	  Make sure NPWindow::ws_info points to a unique location for the
--	  lifetime of the window. This fixes support for the VLC plugin
--	  that makes a local copy of NPWindow but doesn't bother about
--	  making an NPWindow::ws_info copy.
--
--2008-12-26 23:37  Gwenole Beauchesne <gb.public@free.fr>
--
--	* NEWS: Updates with "hot" fixes.
--
--2008-12-26 23:33  Gwenole Beauchesne <gb.public@free.fr>
--
--	* src/npw-wrapper.c: Backport from trunk:
--
--	  Fix NPN_GetStringIdentifiers() to free identifiers with
--	  NPW_MemFree().
--	* src/npw-player.c: Backport from trunk:
--
--	  Fix stream_new() to return NULL if an error occurred.
--
--2008-12-26 13:42  Gwenole Beauchesne <gb.public@free.fr>
--
--	* nspluginwrapper.spec: Bump release for development.
--
--2008-12-25 21:43  Gwenole Beauchesne <gb.public@free.fr>
--
--	* nspluginwrapper.spec: Fix day-of-week.
--
--2008-12-25 21:40  Gwenole Beauchesne <gb.public@free.fr>
--
--	* NEWS, nspluginwrapper.spec: Updates for real 1.2.0 release.
--
--2008-12-25 21:37  Gwenole Beauchesne <gb.public@free.fr>
--
--	* ChangeLog, Makefile: Fix ChangeLog generation for the branch.
--
--2008-12-25 21:29  Gwenole Beauchesne <gb.public@free.fr>
--
--	* ChangeLog: Generated by svn2cl.
--
--2008-12-25 21:29  Gwenole Beauchesne <gb.public@free.fr>
--
--	* ChangeLog: Generated by svn2cl.
--
--2008-12-21 21:43  Gwenole Beauchesne <gb.public@free.fr>
--
--	* src/debug.h: Fix npw_return_if_fail() definition in !DEBUG mode.
--
--2008-12-21 14:02  Gwenole Beauchesne <gb.public@free.fr>
--
--	* src/npw-viewer.c: Destroy the plugin window in NPP_Destroy().
--	  NPAPI docs mention plugin shall not use graphics operations
--	  beyond that call. So, don't bother with broken plugins, we
--	  already have our own bugs to bother with...
--
--2008-12-21 12:14  Gwenole Beauchesne <gb.public@free.fr>
--
--	* .: Create nspluginwrapper-1.2-branch from rev 837.
++2008-12-29 15:14  Gwenole Beauchesne <gb.public@free.fr>
++
++	* src/npw-config.c: Fix upgrades from previous versions.
++
++2008-12-29 14:53  Gwenole Beauchesne <gb.public@free.fr>
++
++	* Makefile, nspluginwrapper.spec: Rename loader script to
++	  npviewer.sh.
++
++2008-12-29 14:52  Gwenole Beauchesne <gb.public@free.fr>
++
++	* Makefile, configure, src/npw-config.c, src/npw-wrapper.c,
++	  src/sysdeps.h: Make it possible to use alternate viewer paths
++	  with --viewer-paths configure option. By default,
++	  pkglibdir/%ARCH%/%OS% is used. If no viewer path includes an
++	  ARCH/OS expansion, then nspluginwrapper files are installed in a
++	  "flat" hierarchy. NPW_PluginInfo format is now extended to
++	  include the viewer_path[] too.
++
++2008-12-29 10:48  Gwenole Beauchesne <gb.public@free.fr>
++
++	* src/npw-viewer.sh: Move down NPW_VIEWER_DIR, after
++	  TARGET_ARCH/TARGET_OS were normalised. Also fix uses of
++	  normalized ARCH/OS variables.
++
++2008-12-29 09:47  Gwenole Beauchesne <gb.public@free.fr>
++
++	* src/npw-viewer.sh: Normalize ARCH/OS variables here too.
++
++2008-12-28 18:16  Gwenole Beauchesne <gb.public@free.fr>
++
++	* Makefile, src/npw-viewer.sh: Factor out install paths.
++
++2008-12-28 17:18  Gwenole Beauchesne <gb.public@free.fr>
++
++	* configure: Improve biarch-build check.
++
++2008-12-28 17:03  Gwenole Beauchesne <gb.public@free.fr>
++
++	* Makefile, configure, src/rpc.c: Normalize CPU and OS values for
++	  both hosts and targets. Cleanup a few internal configure option
++	  names. Rephrase --enable-generic.
++
++2008-12-28 11:25  Gwenole Beauchesne <gb.public@free.fr>
++
++	* src/npw-viewer.c: Make sure NPWindow::ws_info points to a unique
++	  location for the lifetime of the window. This fixes support for
++	  the VLC plugin that makes a local copy of NPWindow but doesn't
++	  bother about making an NPWindow::ws_info copy.
++
++2008-12-28 11:21  Gwenole Beauchesne <gb.public@free.fr>
++
++	* src/npw-malloc.c, src/npw-malloc.h: Add NPW_MemAllocCopy() and
++	  NPW_MemClone() functions.
++
++2008-12-27 15:19  Gwenole Beauchesne <gb.public@free.fr>
++
++	* src/npw-viewer.c: Minor clean-ups.
++
++2008-12-27 14:56  Gwenole Beauchesne <gb.public@free.fr>
++
++	* configure: Enable main-thread checks by default for all builds
++	  from snapshots.
++
++2008-12-27 14:54  Gwenole Beauchesne <gb.public@free.fr>
++
++	* configure, src/npruntime.c, src/npw-viewer.c: Rework configure
++	  option. Use NPW_THREAD_CHECK=yes (or "1") at run-time.
++
++2008-12-27 14:45  Gwenole Beauchesne <gb.public@free.fr>
++
++	* configure, src/npruntime.c, src/npw-viewer.c: Convert the PID
++	  check to a main-thread check.
++
++2008-12-27 12:19  Gwenole Beauchesne <gb.public@free.fr>
++
++	* src/npw-malloc.c: Simplify memory allocation code further.
++
++2008-12-27 12:07  Gwenole Beauchesne <gb.public@free.fr>
++
++	* src/npw-malloc.c: Allow malloc-checks for the libc memory
++	  allocation hooks too. This also simplifies/clarifies the
++	  different memory allocation backends.
++
++2008-12-27 11:45  Gwenole Beauchesne <gb.public@free.fr>
++
++	* Makefile, configure, src/npw-malloc.c: Enable malloc-checks by
++	  default for all builds from snapshots.
++
++2008-12-27 11:16  Gwenole Beauchesne <gb.public@free.fr>
++
++	* configure, src/npw-malloc.c, src/npw-malloc.h: Add basic malloc
++	  check routines to detect possible buffer overflows or
++	  underflows. This is enabled at run-time with
++	  NPW_MALLOC_CHECK=yes (or "1").
++
++2008-12-26 23:31  Gwenole Beauchesne <gb.public@free.fr>
++
++	* src/npw-wrapper.c: Fix NPN_GetStringIdentifiers() to free
++	  identifiers with NPW_MemFree().
++
++2008-12-26 23:24  Gwenole Beauchesne <gb.public@free.fr>
++
++	* src/npw-player.c: Fix stream_new() to return NULL if an error
++	  occurred.
++
++2008-12-26 21:34  Gwenole Beauchesne <gb.public@free.fr>
++
++	* NEWS, nspluginwrapper.spec: Merge documentation updates from
++	  1.2-branch.
++
++2008-12-26 21:26  Gwenole Beauchesne <gb.public@free.fr>
++
++	* src/npruntime.c: Use NPW_MemAlloc() instead of NPW_MemAlloc0()
++	  since all struct members are initialized manually.
++
++2008-12-26 21:24  Gwenole Beauchesne <gb.public@free.fr>
++
++	* src/npw-malloc.c: Report an error instead of a debug-warning for
++	  NPW_MemFree()'ing a pointer that was not allocated with
++	  NPW_MemAlloc().
++
++2008-12-25 21:23  Gwenole Beauchesne <gb.public@free.fr>
++
++	* src/debug.h: Merge from 1.2-branch:
++
++	  Fix npw_return_if_fail() definition in !DEBUG mode.
++
++2008-12-25 21:22  Gwenole Beauchesne <gb.public@free.fr>
++
++	* src/npw-viewer.c: Merge from 1.2-branch:
++
++	  Destroy the plugin window in NPP_Destroy(). NPAPI docs mention
++	  plugin shall not use graphics operations beyond that call. So,
++	  don't bother with broken plugins, we already have our own bugs
++	  to bother with...
++
++2008-12-25 21:21  Gwenole Beauchesne <gb.public@free.fr>
++
++	* src/npw-rpc.h, src/npw-viewer.c, src/npw-wrapper.c: Revert RPC
++	  sync and silent X errors commits. They didn't fix anything in a
++	  useful way. IOW, don't bother fixing bugs that are not
++	  nspluginwrapper related and that could actually degrade its
++	  stability.
++
++2008-12-21 12:19  Gwenole Beauchesne <gb.public@free.fr>
++
++	* nspluginwrapper.spec, src/npw-wrapper.c: Bump release for
++	  development.
++
++2008-12-21 09:32  Gwenole Beauchesne <gb.public@free.fr>
++
++	* src/npw-rpc.h, src/npw-viewer.c, src/npw-wrapper.c: Try to
++	  improve the RPC flush mechanism. Flash doesn't like "cancelled"
++	  NPN_GetURLNotify() with an NPERR_INVALID_INSTANCE_ERROR return.
++	  So, we try our best to honour that call prior to sending
++	  NPP_Destroy().
++
++2008-12-21 08:19  Gwenole Beauchesne <gb.public@free.fr>
++
++	* src/npw-wrapper.c: Purge all incoming RPC prior to calling
++	  NPP_Destroy().
++
++2008-12-21 08:16  Gwenole Beauchesne <gb.public@free.fr>
++
++	* src/npw-viewer.c: Don't kill the application on X errors. That
++	  is, we ignore all X errors that could arise between the
++	  completion of NPP_Destroy() and plugin_instance_finalize(). This
++	  is not fully correct as other plugins can be created and then
++	  destroyed in the while.
++
++	  XXX: this is a hack to debug later because in the presence of
++	  Firefox 3.0 (i.e. neither 3.1b2 nor 2.x are affected, it seems),
++	  the toplevel window receives an "unexpected GDK_DESTROY from the
++	  outside". Native plugins often get that without nspluginwrapper
++	  too but the application is not killed either.
 -12-20 22:24  Gwenole Beauchesne <gb.public@free.fr>
--	* gwenole/projects/nspluginwrapper/trunk/ChangeLog: Generated by
--	  svn2cl.
--
--2008-12-20 22:22  Gwenole Beauchesne <gb.public@free.fr>
--
--	* gwenole/projects/nspluginwrapper/trunk/NEWS,
--	  gwenole/projects/nspluginwrapper/trunk/nspluginwrapper.spec:
--	  1.2.0.
--
--2008-12-20 21:32  Gwenole Beauchesne <gb.public@free.fr>
--
--	* gwenole/projects/nspluginwrapper/trunk/src/npw-config.c:
--	  Suppress error messages in non-verbose mode when exec()'ing
--	  npviewer.bin (Stanislav Brabec).
++	* ChangeLog: Generated by svn2cl.
 -12-20 22:22  Gwenole Beauchesne <gb.public@free.fr>
 === modified file 'Makefile'
 --- Makefile	2009-01-02 10:07:27 +0000
 +++ Makefile	2009-08-11 00:38:42 +0000
@@ -23,10 +23,10 @@
  ifeq ($(SNAPSHOT),)
  SNAPSHOT := $(shell echo "$(RELEASE)" | grep "^0")
  ifeq ($(SNAPSHOT),$(RELEASE))
--SNAPSHOT := 1
--endif
--endif
--ifeq ($(SNAPSHOT),1)
++SNAPSHOT := 2
++endif
++endif
++ifeq ($(SNAPSHOT),2)
  VERSION_SUFFIX = -$(SVNDATE)
  endif
@@ -77,7 +77,7 @@
  endif
  ARCH_32 = $(ARCH)
--ifeq ($(biarch), yes)
++ifeq ($(build_biarch), yes)
  ARCH_32 = $(TARGET_ARCH)
  LSB_LIBS = $(LSB_OBJ_DIR)/libc.so $(LSB_OBJ_DIR)/libgcc_s_32.so
  LSB_LIBS += $(LSB_CORE_STUBS:%=$(LSB_OBJ_DIR)/%.so)
@@ -114,7 +114,7 @@
  npviewer_RAWSRCS = npw-viewer.c npw-common.c npw-malloc.c npw-rpc.c rpc.c debug.c utils.c npruntime.c
  npviewer_SOURCES = $(npviewer_RAWSRCS:%.c=$(SRC_PATH)/src/%.c)
  npviewer_OBJECTS = $(npviewer_RAWSRCS:%.c=npviewer-%.o)
--ifeq ($(biarch),yes)
++ifeq ($(build_biarch),yes)
  npviewer_CFLAGS  = $(CFLAGS_32)
  npviewer_CFLAGS += -I$(LSB_INC_DIR)
  npviewer_CFLAGS += -I$(LSB_INC_DIR)/glib-2.0
@@ -155,7 +155,7 @@
  libxpcom_SOURCES = $(libxpcom_RAWSRCS:%.c=$(SRC_PATH)/src/%.c)
  libxpcom_OBJECTS = $(libxpcom_RAWSRCS:%.c=libxpcom-%.o)
  libxpcom_CFLAGS  = $(PIC_CFLAGS)
--ifeq ($(biarch),yes)
++ifeq ($(build_biarch),yes)
  libxpcom_CFLAGS += -I$(LSB_INC_DIR)
  libxpcom_LDFLAGS = $(LDFLAGS_32) -L$(LSB_OBJ_DIR)
  endif
@@ -182,7 +182,7 @@
  npconfig_LDFLAGS += $(libpthread_LDFLAGS)
  endif
--nploader_PROGRAM = npviewer
++nploader_PROGRAM = npviewer.sh
  nploader_RAWSRCS = npw-viewer.sh
  nploader_SOURCES = $(nploader_RAWSRCS:%.sh=$(SRC_PATH)/src/%.sh)
@@ -255,51 +255,43 @@
  uninstall: uninstall.player uninstall.wrapper uninstall.viewer uninstall.libxpcom uninstall.libnoxshm uninstall.loader uninstall.config uninstall.dirs
  uninstall.dirs:
--	rmdir $(DESTDIR)$(pkglibdir)/noarch
--	rmdir $(DESTDIR)$(pkglibdir)/$(ARCH)/$(OS)
--	rmdir $(DESTDIR)$(pkglibdir)/$(ARCH)
--ifneq ($(ARCH),$(ARCH_32))
--	rmdir $(DESTDIR)$(pkglibdir)/$(ARCH_32)/$(TARGET_OS)
--	rmdir $(DESTDIR)$(pkglibdir)/$(ARCH_32)
--endif
++	rmdir -p $(DESTDIR)$(nptargetdir) || :
++	rmdir -p $(DESTDIR)$(nphostdir) || :
++	rmdir -p $(DESTDIR)$(npcommondir) || :
  uninstall.player:
--	rm -f $(DESTDIR)$(pkglibdir)/$(ARCH)/$(OS)/$(npplayer_PROGRAM)
++	rm -f $(DESTDIR)$(nphostdir)/$(npplayer_PROGRAM)
  uninstall.wrapper:
--	rm -f $(DESTDIR)$(pkglibdir)/$(ARCH)/$(OS)/$(npwrapper_LIBRARY)
++	rm -f $(DESTDIR)$(nphostdir)/$(npwrapper_LIBRARY)
  uninstall.viewer:
--	rm -f $(DESTDIR)$(pkglibdir)/$(ARCH_32)/$(TARGET_OS)/$(npviewer_PROGRAM)
--	rm -f $(DESTDIR)$(pkglibdir)/$(ARCH_32)/$(TARGET_OS)/$(npviewer_PROGRAM:%.bin=%)
++	rm -f $(DESTDIR)$(nptargetdir)/$(npviewer_PROGRAM)
++	rm -f $(DESTDIR)$(nptargetdir)/$(npviewer_PROGRAM:%.bin=%)
  uninstall.libxpcom:
--	rm -f $(DESTDIR)$(pkglibdir)/$(ARCH_32)/$(TARGET_OS)/$(libxpcom_LIBRARY)
++	rm -f $(DESTDIR)$(nptargetdir)/$(libxpcom_LIBRARY)
  uninstall.libnoxshm:
--	rm -f $(DESTDIR)$(pkglibdir)/$(ARCH_32)/$(TARGET_OS)/$(libnoxshm_LIBRARY)
++	rm -f $(DESTDIR)$(nptargetdir)/$(libnoxshm_LIBRARY)
  uninstall.loader:
--	rm -f $(DESTDIR)$(pkglibdir)/noarch/$(nploader_PROGRAM)
++	rm -f $(DESTDIR)$(npcommondir)/$(nploader_PROGRAM)
  uninstall.config:
  	rm -f $(DESTDIR)$(bindir)/nspluginwrapper
--	rm -f $(DESTDIR)$(pkglibdir)/$(ARCH)/$(OS)/$(npconfig_PROGRAM)
++	rm -f $(DESTDIR)$(nphostdir)/$(npconfig_PROGRAM)
  uninstall.mkruntime:
--	rm -f $(DESTDIR)$(pkglibdir)/noarch/mkruntime
++	rm -f $(DESTDIR)$(npcommondir)/mkruntime
  install: install.dirs install.player install.wrapper install.viewer install.libxpcom install.libnoxshm install.loader install.config
  install.dirs:
--	mkdir -p $(DESTDIR)$(pkglibdir)/noarch
--	mkdir -p $(DESTDIR)$(pkglibdir)/$(ARCH)
--	mkdir -p $(DESTDIR)$(pkglibdir)/$(ARCH)/$(OS)
--ifneq ($(ARCH),$(ARCH_32))
--	mkdir -p $(DESTDIR)$(pkglibdir)/$(ARCH_32)
--	mkdir -p $(DESTDIR)$(pkglibdir)/$(ARCH_32)/$(TARGET_OS)
--endif
++	mkdir -p $(DESTDIR)$(npcommondir) || :
++	mkdir -p $(DESTDIR)$(nphostdir) || :
++	mkdir -p $(DESTDIR)$(nptargetdir) || :
  ifeq ($(build_player),yes)
  install.player: $(npplayer_PROGRAM)
--	$(INSTALL) -m 755 $(STRIP_OPT) $(npplayer_PROGRAM) $(DESTDIR)$(pkglibdir)/$(ARCH)/$(OS)/$(npplayer_PROGRAM)
++	$(INSTALL) -m 755 $(STRIP_OPT) $(npplayer_PROGRAM) $(DESTDIR)$(nphostdir)/$(npplayer_PROGRAM)
  	mkdir -p $(DESTDIR)$(bindir)
--	$(LN_S) $(pkglibdir)/$(ARCH)/$(OS)/$(npplayer_PROGRAM) $(DESTDIR)$(bindir)/nspluginplayer
++	$(LN_S) $(nphostdir)/$(npplayer_PROGRAM) $(DESTDIR)$(bindir)/nspluginplayer
  else
  install.player:
  endif
  install.wrapper: $(npwrapper_LIBRARY)
--	$(INSTALL) -m 755 $(STRIP_OPT) $(npwrapper_LIBRARY) $(DESTDIR)$(pkglibdir)/$(ARCH)/$(OS)/$(npwrapper_LIBRARY)
++	$(INSTALL) -m 755 $(STRIP_OPT) $(npwrapper_LIBRARY) $(DESTDIR)$(nphostdir)/$(npwrapper_LIBRARY)
  ifeq ($(build_viewer),yes)
  install.viewer: install.viewer.bin install.viewer.glue
  install.libxpcom: do.install.libxpcom
@@ -310,26 +302,26 @@
  install.libnoxshm:
  endif
  install.viewer.bin: $(npviewer_PROGRAM)
--	$(INSTALL) -m 755 $(STRIP_OPT) $(npviewer_PROGRAM) $(DESTDIR)$(pkglibdir)/$(ARCH_32)/$(TARGET_OS)/$(npviewer_PROGRAM)
++	$(INSTALL) -m 755 $(STRIP_OPT) $(npviewer_PROGRAM) $(DESTDIR)$(nptargetdir)/$(npviewer_PROGRAM)
  install.viewer.glue::
--	p=$(DESTDIR)$(pkglibdir)/$(ARCH_32)/$(TARGET_OS)/$(npviewer_PROGRAM:%.bin=%);	\
++	p=$(DESTDIR)$(nptargetdir)/$(npviewer_PROGRAM:%.bin=%);	\
  	echo "#!/bin/sh" > $$p;								\
  	echo "TARGET_OS=$(TARGET_OS)" >> $$p;						\
  	echo "TARGET_ARCH=$(TARGET_ARCH)" >> $$p;					\
--	echo ". $(pkglibdir)/noarch/$(nploader_PROGRAM)" >> $$p;			\
++	echo ". $(npcommondir)/$(nploader_PROGRAM)" >> $$p;			\
  	chmod 755 $$p
  do.install.libxpcom: $(libxpcom_LIBRARY)
--	$(INSTALL) -m 755 $(STRIP_OPT) $(libxpcom_LIBRARY) $(DESTDIR)$(pkglibdir)/$(ARCH_32)/$(TARGET_OS)/$(libxpcom_LIBRARY)
++	$(INSTALL) -m 755 $(STRIP_OPT) $(libxpcom_LIBRARY) $(DESTDIR)$(nptargetdir)/$(libxpcom_LIBRARY)
  do.install.libnoxshm: $(libnoxshm_LIBRARY)
--	$(INSTALL) -m 755 $(STRIP_OPT) $(libnoxshm_LIBRARY) $(DESTDIR)$(pkglibdir)/$(ARCH_32)/$(TARGET_OS)/$(libnoxshm_LIBRARY)
++	$(INSTALL) -m 755 $(STRIP_OPT) $(libnoxshm_LIBRARY) $(DESTDIR)$(nptargetdir)/$(libnoxshm_LIBRARY)
  install.config: $(npconfig_PROGRAM)
--	$(INSTALL) -m 755 $(STRIP_OPT) $(npconfig_PROGRAM) $(DESTDIR)$(pkglibdir)/$(ARCH)/$(OS)/$(npconfig_PROGRAM)
++	$(INSTALL) -m 755 $(STRIP_OPT) $(npconfig_PROGRAM) $(DESTDIR)$(nphostdir)/$(npconfig_PROGRAM)
  	mkdir -p $(DESTDIR)$(bindir)
--	$(LN_S) $(pkglibdir)/$(ARCH)/$(OS)/$(npconfig_PROGRAM) $(DESTDIR)$(bindir)/nspluginwrapper
++	$(LN_S) $(nphostdir)/$(npconfig_PROGRAM) $(DESTDIR)$(bindir)/nspluginwrapper
  install.loader: $(nploader_PROGRAM)
--	$(INSTALL) -m 755 $(nploader_PROGRAM) $(DESTDIR)$(pkglibdir)/noarch/$(nploader_PROGRAM)
++	$(INSTALL) -m 755 $(nploader_PROGRAM) $(DESTDIR)$(npcommondir)/$(nploader_PROGRAM)
  install.mkruntime: $(SRC_PATH)/utils/mkruntime.sh
--	$(INSTALL) -m 755 $< $(DESTDIR)$(pkglibdir)/noarch/mkruntime
++	$(INSTALL) -m 755 $< $(DESTDIR)$(npcommondir)/mkruntime
  $(archivedir)::
  	[ -d $(archivedir) ] || mkdir $(archivedir) > /dev/null 2>&1
@@ -342,7 +334,7 @@
  	BUILDDIR=`mktemp -d /tmp/buildXXXXXXXX`						; \
  	mkdir -p $$BUILDDIR/$(PACKAGE)-$(VERSION)					; \
  	(cd $(SRC_PATH) && tar c $(FILES)) | tar x -C $$BUILDDIR/$(PACKAGE)-$(VERSION)	; \
--	[ "$(SNAPSHOT)" = "1" ] && svndate_def="%" || svndate_def="#"			; \
++	[ "$(SNAPSHOT)" = "2" ] && svndate_def="%" || svndate_def="#"			; \
  	sed -e "s/^[%#]define svndate.*/$${svndate_def}define svndate $(SVNDATE)/" 	  \
  	  < $(SRC_PATH)/nspluginwrapper.spec						  \
  	  > $$BUILDDIR/$(PACKAGE)-$(VERSION)/nspluginwrapper.spec			; \
@@ -367,7 +359,7 @@
  changelog: ../common/authors.xml
  	svn_prefix=`svn info .|sed -n '/^URL *: .*\/svn\/\(.*\)$$/s//\1\//p'`; \
--	LC_ALL=C TZ=GMT svn2cl --strip-prefix=$$svn_prefix --authors=../common/authors.xml --accum || :
++	LC_ALL=C TZ=GMT svn2cl --strip-prefix=$$svn_prefix --authors=../common/authors.xml || :
  changelog.commit: changelog
  	svn commit -m "Generated by svn2cl." ChangeLog
@@ -413,7 +405,7 @@
  	$(CC) -o $@ -c $< $(CPPFLAGS) $(CFLAGS)
  $(nploader_PROGRAM): $(nploader_SOURCES)
--	sed -e "s|%NPW_LIBDIR%|$(pkglibdir)|" $< > $@
++	sed -e 's|%NPW_VIEWER_DIR%|$(nptargetdir_var)|' $< > $@
  	chmod 755 $@
  $(LSB_OBJ_DIR)::
 === modified file 'NEWS'
 --- NEWS	2009-01-02 10:07:27 +0000
 +++ NEWS	2009-08-11 00:38:42 +0000
@@ -1,6 +1,14 @@
  nspluginwrapper NEWS -- history of user-visible changes.  2009-01-02
  Copyright (C) 2005-2009 Gwenole Beauchesne
++Version 1.3.0 (BETA) - 02.Jan.2009
++* Don't poll for Xt events in Gtk (XEMBED) plug-ins
++* Use 40 Hz timer for Xt events only when necessary (Xt input sources)
++* Add NPIdentifier and NPClass::HasMethod caches, i.e. lower RPC traffic
++* Add support for multiple viewer paths, see --viewer-paths=PATH-EXPR
++* Add basic checks for malloc()'ed buffer underflow/overflow
++* Add checks for single-threaded calls into the browser (NPN_*() functions)
++
  Version 1.2.2 - 02.Jan.2009
  * Fix support for the VLC plug-in
  * Fix memory deallocation in NPN_GetStringIdentifiers()
@@ -12,7 +20,8 @@
  * Add support for SunStudio compilers
  * Add support for Flash Player 10 on OpenSolaris 2008.11
  * Fix build on non-Linux platforms
--* Fix NPP_Destroy() to keep NPP instances longer, but destroy window immediately
++* Fix NPP_Destroy() to keep NPP instances longer
++* Fix NPP_Destroy() to destroy the plugin window immediately
  Version 1.1.10 (BETA) - 08.Dec.2008
  * Fix NPPVpluginScriptableNPObject::Invalidate()
 === modified file 'configure'
 --- configure	2009-01-02 10:07:27 +0000
 +++ configure	2009-08-11 00:38:42 +0000
@@ -19,15 +19,63 @@
  TMPE="${TMPDIR1}/npw-conf-${RANDOM}-$$-${RANDOM}"
  TMPS="${TMPDIR1}/npw-conf-${RANDOM}-$$-${RANDOM}.S"
++# find source path
++# XXX: we assume an absolute path is given when launching configure,
++# except in './configure' case.
++source_path=${0%configure}
++source_path=${source_path%/}
++source_path_used="yes"
++if test -z "$source_path" -o "$source_path" = "." ; then
++    source_path=`pwd`
++    source_path_used="no"
++fi
++
++# determine versions
++VERSION=`sed < $source_path/$PACKAGE.spec -n '/^\%define version[	]*/s///p'`
++RELEASE=`sed < $source_path/$PACKAGE.spec -n '/^\%define release[	]*/s///p'`
++SVNDATE=`sed < $source_path/$PACKAGE.spec -n '/^\%define svndate[ 	]*/s///p'`
++if test -z "$SVNDATE"; then
++    SVNDATE=`date '+%Y%m%d'`
++fi
++
++MAJOR_VERSION=`echo "$VERSION"|cut -d'.' -f1`
++MINOR_VERSION=`echo "$VERSION"|cut -d'.' -f2`
++MICRO_VERSION=`echo "$VERSION"|cut -d'.' -f3`
++
++# development snapshots are officially generated tarballs for testing
++# ("odd" minor and micro versions)
++is_odd() {
++    local rem=`expr "$1" % 2`
++    test $rem -eq 1 && return 0 || return 1
++}
++
++if is_odd $MINOR_VERSION || is_odd $MICRO_VERSION; then
++    SNAPSHOT=1
++else
++    SNAPSHOT=0
++fi
++
++# snapshots can also be unofficially generated tarballs
++# (Release: 0.1 in specfile)
++if echo "$RELEASE" | grep -q ^0; then
++    SNAPSHOT=2
++fi
++
++if test $SNAPSHOT -ge 1; then
++    yes_for_snapshots="yes"
++else
++    yes_for_snapshots="no"
++fi
++
  # default parameters
  prefix="/usr"
  lib32=""
  lib64=""
  x_base_dirs=""
--biarch="guess"
  build_viewer="guess"
  build_player="yes"
--linux_only="guess"
++build_generic="guess"
++build_biarch="guess"
  strip="no"
  cc="gcc"
  cxx="g++"
@@ -37,52 +85,49 @@
  target_cpu="i386"
  rpc_init_timeout=5
  malloc_hooks="glib,libc"
--use_pid_check="no"
--case "$host_cpu" in
++enable_malloc_check="$yes_for_snapshots"
++enable_thread_check="$yes_for_snapshots"
++
++normalize_cpu() {
++local cpu="$1"
++case "$cpu" in
  arm*)
--    host_cpu="arm"
++    cpu="arm"
      ;;
--i386|i486|i586|i686|i86pc|BePC)
--    host_cpu="i386"
++i[3456]86|k[678]|i86pc|BePC)
++    cpu="i386"
      ;;
  ia64)
--    host_cpu="ia64"
++    cpu="ia64"
      ;;
  "Power Macintosh"|ppc)
--    host_cpu="ppc"
++    cpu="ppc"
      ;;
  ppc64)
--    host_cpu="ppc64"
++    cpu="ppc64"
      ;;
  sparc)
--    host_cpu="sparc"
++    cpu="sparc"
      ;;
  sparc64)
--    host_cpu="sparc64"
++    cpu="sparc64"
      ;;
  x86_64|amd64)
--    host_cpu="x86_64"
--    ;;
--*)
--    host_cpu="unknown"
++    cpu="x86_64"
      ;;
  esac
--case "$host_os" in
++echo "$cpu"
++}
++
++normalize_os() {
++local os="$1"
++case "$os" in
  sunos*)
--    host_os="solaris"
++    os="solaris"
      ;;
  esac
--
--# find source path
--# XXX: we assume an absolute path is given when launching configure,
--# except in './configure' case.
--source_path=${0%configure}
--source_path=${source_path%/}
--source_path_used="yes"
--if test -z "$source_path" -o "$source_path" = "." ; then
--    source_path=`pwd`
--    source_path_used="no"
--fi
++echo "$os"
++}
  for opt do
  case "$opt" in
@@ -92,14 +137,20 @@
  --pkglibdir=*)
      pkglibdir=`echo "$opt" | cut -d '=' -f 2`
      ;;
++--viewer-paths=*)
++    viewer_paths=`echo "$opt" | cut -d '=' -f 2`
++    ;;
  --target-os=*)
      target_os=`echo "$opt" | cut -d '=' -f 2 | tr '[A-Z]' '[a-z]'`
      ;;
  --target-cpu=*)
--    target_cpu=`echo "$opt" | cut -d '=' -f 2 | sed -e 's/^i.86$/i386/'`
++    target_cpu=`echo "$opt" | cut -d '=' -f 2`
      ;;
  --enable-generic)
--    linux_only="no"
++    build_generic="yes"
++    ;;
++--disable-generic)
++    build_generic="no"
      ;;
  --enable-strip)
      strip="yes"
@@ -108,10 +159,10 @@
      strip="no"
      ;;
  --enable-biarch)
--    biarch="yes"
++    build_biarch="yes"
      ;;
  --disable-biarch)
--    biarch="no"
++    build_biarch="no"
      ;;
  --enable-viewer)
      build_viewer="yes"
@@ -125,11 +176,17 @@
  --disable-player)
      build_player="no"
      ;;
----enable-pid-check)
--    use_pid_check="yes"
--    ;;
----disable-pid-check)
--    use_pid_check="no"
++--enable-thread-check)
++    enable_thread_check="yes"
++    ;;
++--disable-thread-check)
++    enable_thread_check="no"
++    ;;
++--enable-malloc-check)
++    enable_malloc_check="yes"
++    ;;
++--disable-malloc-check)
++    enable_malloc_check="no"
      ;;
  --with-lib32=*)
      lib32=`echo "$opt" | cut -d '=' -f 2`
@@ -155,34 +212,45 @@
  esac
  done
++host_cpu=`normalize_cpu "$host_cpu"`
++host_os=`normalize_os "$host_os"`
++target_cpu=`normalize_cpu "$target_cpu"`
++target_os=`normalize_os "$target_os"`
++
  # check for linux only build
--if test "$linux_only" = "guess"; then
++if test "$build_generic" = "guess"; then
      if test "$host_os" = "linux" -a "$target_os" = "linux"; then
--	linux_only="yes"
++	build_generic="no"
      else
--	linux_only="no"
++	build_generic="yes"
      fi
  fi
  # check for biarch build (Linux only)
--if test "$biarch" = "guess"; then
--    # XXX: biarch builds require LSB headers for now
--    biarch="no"
++# XXX: biarch builds require LSB headers for now
++build_biarch_possible="no"
++if test "$host_os" = "linux" -a "$target_os" = "linux"; then
      case $host_cpu:$target_cpu in
      x86_64:i386 | ppc64:ppc)
--	if test "$host_os" = "linux"; then
--	    biarch="yes"
--	fi
++	build_biarch_possible="yes"
  	;;
      esac
  fi
++if test "$build_biarch" = "guess"; then
++    build_biarch="$build_biarch_possible"
++elif test "$build_biarch" = "yes"; then
++    if test "$build_biarch_possible" = "no"; then
++	echo "WARNING: bi-arch build is not possible, disabling"
++	build_biarch="no"
++    fi
++fi
  # check for viewer build
  if test "$build_viewer" = "guess"; then
      build_viewer="no"
      case $host_os in
      linux)
--	if test "$host_cpu" = "$target_cpu" -o "$biarch" = "yes"; then
++	if test "$host_cpu" = "$target_cpu" -o "$build_biarch" = "yes"; then
  	    build_viewer="yes"
  	fi
  	;;
@@ -224,6 +292,12 @@
      pkglibdir="$prefix/lib/$PACKAGE"
  fi
++# check for viewer paths
++default_viewer_paths="$pkglibdir/%ARCH%/%OS%"
++if test -z "$viewer_paths"; then
++    viewer_paths="$default_viewer_paths"
++fi
++
  # check for __attribute__((visibility())) support
  cat > $TMPC << EOF
  int foo __attribute__((visibility("hidden"))) = 1;
@@ -280,7 +354,7 @@
  fi
  # check for __stack_chk_fail() in target GNU C library
--if test "$biarch" = "yes"; then
++if test "$build_biarch" = "yes"; then
      glibc_header_dir="/usr/include"
      libc_provides_ssp=no
      if test -f $glibc_header_dir/features.h \
@@ -370,7 +444,7 @@
  	    CFLAGS="$CFLAGS -mtune=generic"
  	fi
      fi
--    if test "$biarch" = "yes" -a -z "$CFLAGS_32"; then
++    if test "$build_biarch" = "yes" -a -z "$CFLAGS_32"; then
  	CFLAGS_32="-m32 -O2 -g"
  	if check_cc_option -mtune=generic $CFLAGS_32; then
  	    CFLAGS_32="$CFLAGS_32 -mtune=generic"
@@ -596,7 +670,7 @@
  	is_ok="yes"
  	;;
      glib)
--	if test "x$linux_only" = "xno"; then
++	if test "x$build_generic" = "xyes"; then
  	    echo "WARNING: disabling glib memory hooks with --enable-generic"
  	elif ! $pkgconfig --atleast-version=2.10 glib-2.0; then
  	    echo "WARNING: disabling glib memory hooks that require glib >= 2.10 (system is $GLIB_VERSION)"
@@ -631,6 +705,7 @@
  echo "  --help                      print this message"
  echo "  --prefix=PREFIX             install in PREFIX [$prefix]"
  echo "  --pkglibdir=ROOT            install private files in ROOT [$pkglibdir]"
++echo "  --viewer-paths=PATH         allowed viewer lookup PATH [$viewer_paths]"
  echo "  --target-os=OS              build plugin support for target OS [$target_os]"
  echo "  --target-cpu=CPU            build plugin support for target CPU [$target_cpu]"
  echo "  --enable-viewer             build viewer [$build_viewer]"
@@ -639,9 +714,10 @@
  echo "Advanced options (experts only):"
  echo "  --source-path=PATH          path of source code [$source_path]"
  echo "  --enable-strip              strip resulting binaries and libraries [$strip]"
--echo "  --enable-generic            don't use system-specific additions"
--echo "  --enable-biarch             build both 32-bit and 64-bit components at once"
--echo "  --enable-pid-check          enable PID check (DEBUG) [$use_pid_check]"
++echo "  --enable-generic            build with generic APIs [$build_generic]"
++echo "  --enable-biarch             build both 32-bit and 64-bit components at once [$build_biarch]"
++echo "  --enable-thread-check       enable main thread checks (DEBUG) [$enable_thread_check]"
++echo "  --enable-malloc-check       enable memory allocation checks (DEBUG) [$enable_malloc_check]"
  echo "  --with-lib32=NAME           use NAME as the 32-bit library dir name [$lib32]"
  echo "  --with-lib64=NAME           use NAME as the 64-bit library dir name [$lib64]"
  echo "  --with-x11-prefix=PREFIX    use PREFIX as the X11 base dir [autodetect]"
@@ -654,18 +730,19 @@
  exit 1
  fi
++echo "Source path               $source_path"
  echo "Install prefix            $prefix"
  echo "nspluginwrapper root dir  $pkglibdir"
--echo "Strip binaries            $strip"
--echo "Bi-arch build             $biarch"
++echo "Viewer paths              $viewer_paths"
  echo "Build viewer              $build_viewer"
--echo "Build for Linux only      $linux_only"
  echo "Build standalone player   $build_player"
++echo "Build 32-/64-bit at once  $build_biarch"
++echo "Build with generic APIs   $build_generic"
  echo "32-bit library dir name   $lib32"
  echo "64-bit library dir name   $lib64"
--echo "Source path               $source_path"
  echo "C compiler                $cc"
  echo "C++ compiler              $cxx"
++echo "Strip binaries            $strip"
  echo "Host OS                   $host_os"
  echo "Host CPU                  $host_cpu"
  echo "Host big endian           $bigendian"
@@ -673,7 +750,8 @@
  echo "Target CPU                $target_cpu"
  echo "RPC init timeout          $rpc_init_timeout secs"
  echo "Memory allocation hooks   $malloc_hooks"
--echo "Use PID check (DEBUG)     $use_pid_check"
++echo "Use thread checks (DEBUG) $enable_thread_check"
++echo "Use malloc checks (DEBUG) $enable_malloc_check"
  config_mak="config-host.mak"
  echo "# Automatically generated by configure - do not modify" > $config_mak
@@ -691,7 +769,7 @@
  echo "GTK_LDFLAGS=$GTK_LDFLAGS" >> $config_mak
  echo "CURL_CFLAGS=$CURL_CFLAGS" >> $config_mak
  echo "CURL_LDFLAGS=$CURL_LDFLAGS" >> $config_mak
--if test "$biarch" = "yes"; then
++if test "$build_biarch" = "yes"; then
  echo "LDFLAGS_32=-m32" >> $config_mak
  echo "CFLAGS_32=$CFLAGS_32" >> $config_mak
  else
@@ -768,7 +846,7 @@
  echo "SRC_PATH=$source_path" >> $config_mak
  echo "build_viewer=$build_viewer" >> $config_mak
  echo "build_player=$build_player" >> $config_mak
--echo "biarch=$biarch" >> $config_mak
++echo "build_biarch=$build_biarch" >> $config_mak
  echo "lib32=$lib32" >> $config_mak
  echo "lib64=$lib64" >> $config_mak
  echo "prefix=$prefix" >> $config_mak
@@ -780,21 +858,11 @@
  echo "x11prefix=$x_base_dir" >> $config_mak
  echo "ALLOW_STRIP=$strip" >> $config_mak
--VERSION=`sed < $source_path/$PACKAGE.spec -n '/^\%define version[	]*/s///p'`
--RELEASE=`sed < $source_path/$PACKAGE.spec -n '/^\%define release[	]*/s///p'`
--SVNDATE=`sed < $source_path/$PACKAGE.spec -n '/^\%define svndate[ 	]*/s///p'`
--if test -z "$SVNDATE"; then
--    SVNDATE=`date '+%Y%m%d'`
--fi
--SNAPSHOT=0
--if echo "$RELEASE" | grep -q ^0; then
--    SNAPSHOT=1
--fi
  echo "VERSION=$VERSION" >> $config_mak
  echo "SVNDATE=$SVNDATE" >> $config_mak
  echo "SNAPSHOT=$SNAPSHOT" >> $config_mak
  echo "#define NPW_SNAPSHOT $SNAPSHOT" >> $config_h
--if test "$SNAPSHOT" = "1"; then
++if test $SNAPSHOT -ge 2; then
      echo "#define NPW_VERSION \"$VERSION-Pre ($SVNDATE)\"" >> $config_h
  else
      echo "#define NPW_VERSION \"$VERSION\"" >> $config_h
@@ -803,6 +871,26 @@
  echo "pkglibdir=$pkglibdir" >> $config_mak
  echo "#define NPW_LIBDIR \"$pkglibdir\"" >> $config_h
++# check if we want to install files in ARCH/OS specific locations
++if echo ":$viewer_paths" | $EGREP -q ":$pkglibdir/%(ARCH|OS)%"; then
++    npw_common_libdir="$pkglibdir/noarch"
++    npw_host_libdir="$pkglibdir/$host_cpu/$host_os"
++    npw_target_libdir="$pkglibdir/$target_cpu/$target_os"
++    npw_target_libdir_var="$pkglibdir/\\\$\$TARGET_ARCH/\\\$\$TARGET_OS"
++else
++    npw_common_libdir="$pkglibdir"
++    npw_host_libdir="$npw_common_libdir"
++    npw_target_libdir="$npw_common_libdir"
++    npw_target_libdir_var="$npw_common_libdir"
++fi
++echo "npcommondir=$npw_common_libdir" >> $config_mak
++echo "nphostdir=$npw_host_libdir" >> $config_mak
++echo "nptargetdir=$npw_target_libdir" >> $config_mak
++echo "nptargetdir_var=$npw_target_libdir_var" >> $config_mak
++echo "#define NPW_HOST_LIBDIR \"$npw_host_libdir\"" >> $config_h
++echo "#define NPW_TARGET_LIBDIR \"$npw_target_libdir\"" >> $config_h
++echo "#define NPW_VIEWER_PATHS \"$viewer_paths\"" >> $config_h
++
  echo "#define RPC_INIT_TIMEOUT $rpc_init_timeout" >> $config_h
  for mh in $malloc_hooks; do
@@ -832,11 +920,29 @@
  else
      echo "#undef TARGET_LIBC_PROVIDES_SSP" >> $config_h
  fi
--if test "$use_pid_check" = "yes"; then
--    echo "#define USE_PID_CHECK 1" >> $config_h
--else
--    echo "#define USE_PID_CHECK 0" >> $config_h
--fi
++if test "$enable_thread_check" = "yes"; then
++    echo "#define ENABLE_THREAD_CHECK 1" >> $config_h
++else
++    echo "#undef ENABLE_THREAD_CHECK" >> $config_h
++fi
++if test "$enable_malloc_check" = "yes"; then
++    echo "#define ENABLE_MALLOC_CHECK 1" >> $config_h
++else
++    echo "#undef ENABLE_MALLOC_CHECK" >> $config_h
++fi
++
++# check for functions in <glib.h>
++for func in g_hash_table_remove_all g_hash_table_find; do
++    cat > $TMPC << EOF
++extern void $func(void);
++int main(void) { $func(); return 0; }
++EOF
++    if $cc $TMPC -o $TMPE $GLIB_CFLAGS $GLIB_LDFLAGS > /dev/null 2>&1; then
++        func_def=`echo "$func" | tr '[:lower:]./-' '[:upper:]___'`
++        echo "#define HAVE_$func_def 1" >> $config_h
++    fi
++    rm -f $TMPC $TMPE
++done
  config_mak="config.mak"
  echo "# Automatically generated by configure - do not modify" > $config_mak
@@ -846,8 +952,10 @@
  echo "/* Automatically generated by configure - do not modify */" > $config_h
  echo "#include \"config-host.h\"" >> $config_h
--if test "$linux_only" = "yes"; then
--    echo "#define BUILD_LINUX_ONLY 1" >> $config_h
++if test "$build_generic" = "yes"; then
++    echo "#define BUILD_GENERIC 1" >> $config_h
++else
++    echo "#undef BUILD_GENERIC" >> $config_h
  fi
  if test "$target_os" = "linux"; then
 === modified file 'debian/changelog'
 --- debian/changelog	2009-04-08 18:38:27 +0000
 +++ debian/changelog	2009-08-11 01:50:22 +0000
@@ -1,3 +1,30 @@
++nspluginwrapper (1.3.0-0ubuntu1) karmic; urgency=low
++
++  * New upstream release 1.3.0 (LP: #411740)
++  * Update Maintainer field in debian/control, as proposed by
++    DebianMaintainerField spec
++  * Update debian/patches/000_debian_make_symlinks.diff
++    - change short option for "nosymlinks" from "n" to "x" to avoid collision
++      with option "native"
++    - add option "nosymlinks" to print_usage()
++  * Update debian/patches/003_update_help_info.diff because of change in
++    debian/patches/000_debian_make_symlinks.diff
++  * Update debian/patches/use_syslsb.patch because of different Makefile
++  * Add patch debian/patches/004_system_only_update.diff from Debian
++    version 1.2.2-1
++  * Refresh patches
++
++ -- Sasa Bodiroza <jazzva@gmail.com>  Tue, 11 Aug 2009 03:49:59 +0200
++
++nspluginwrapper (1.2.2-0ubuntu6) karmic; urgency=low
++
++  * debian/patches/use_syslsb.patch; dont build LSB libs on our own;
++    this should unbreak flash+nspluginwrapper after latest ia32-libs
++    update
++    + use USE_SYSTEM_LSB accordingly in debian/rules
++
++ -- Alexander Sack <asac@ubuntu.com>  Sun, 09 Aug 2009 14:31:49 +0200
++
  nspluginwrapper (1.2.2-0ubuntu5) jaunty; urgency=low
    * Add iceweasel dir to debian/nspluginwrapper.postinst for removal of
 === modified file 'debian/control'
 --- debian/control	2008-08-27 17:19:36 +0000
 +++ debian/control	2009-08-11 00:41:22 +0000
@@ -1,7 +1,7 @@
  Source: nspluginwrapper
  Section: utils
  Priority: optional
--Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
++Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
  XSBC-Original-Maintainer: Rob Andrews <rob@choralone.org>
  Build-Depends: debhelper (>= 5), quilt, autotools-dev, libc6-dev-i386 [ amd64 ], libxt-dev, x11proto-core-dev, x11proto-xext-dev, libx11-dev, libatk1.0-dev, libfontconfig1-dev, libgtk2.0-dev, libglib2.0-dev, libpango1.0-dev, ia32-libs [ amd64 ], gcc-multilib [ amd64 ], g++-multilib [ amd64 ], libcurl4-gnutls-dev
  Standards-Version: 3.8.0
 === modified file 'debian/patches/000_debian_make_symlinks.diff'
 --- debian/patches/000_debian_make_symlinks.diff	2009-03-07 17:43:52 +0000
 +++ debian/patches/000_debian_make_symlinks.diff	2009-08-11 01:31:54 +0000
@@ -7,10 +7,10 @@
   -- Rob Andrews <rob@choralone.org>  Fri, 29 Jun 2007 21:59:49 +0100
--Index: ubuntu.1.2.2-0ubuntu1/src/npw-config.c
++Index: ubuntu/src/npw-config.c
  ===================================================================
----- ubuntu.1.2.2-0ubuntu1.orig/src/npw-config.c	2009-01-03 16:26:07.000000000 +0100
--+++ ubuntu.1.2.2-0ubuntu1/src/npw-config.c	2009-03-07 18:38:14.000000000 +0100
++--- ubuntu.orig/src/npw-config.c	2009-08-11 01:53:50.000000000 +0200
+++++ ubuntu/src/npw-config.c	2009-08-11 01:59:54.000000000 +0200
@@ -44,6 +44,16 @@
   static bool g_allow_native = false;
   static const char NPW_CONFIG[] = "nspluginwrapper";
@@ -28,7 +28,7 @@
   static void error(const char *format, ...)
+  {
     va_list args;
--@@ -161,7 +171,7 @@
++@@ -226,7 +236,7 @@
+  	}
   	else if (access("/etc/debian_version", F_OK) == 0) {
   	  static const char *debian_dirs[] = {
@@ -37,7 +37,7 @@
   	  };
   	  dirs = debian_dirs;
+  	}
--@@ -812,6 +822,49 @@
++@@ -941,6 +951,49 @@
   	printf("  into %s\n", d_plugin_path);
     free(plugin_data);
@@ -87,7 +87,7 @@
     return 0;
+  }
--@@ -871,6 +924,48 @@
++@@ -1000,6 +1053,48 @@
     if (unlink(plugin_path) < 0)
   	return 1;
@@ -136,7 +136,15 @@
     return 0;
+  }
--@@ -1033,6 +1128,12 @@
++@@ -1141,6 +1236,7 @@
++   printf("   -a --auto               flag: set automatic mode for plugins discovery\n");
++   printf("   -n --native             flag: allow native plugin(s) to be wrapped\n");
++   printf("   -l --list               list plugins currently installed\n");
+++  printf("   -x --nosymlinks         do not create symlinks to the installed plugin\n");
++   printf("   -u --update             update plugin(s) currently installed\n");
++   printf("   -i --install [FILE(S)]  install plugin(s)\n");
++   printf("   -r --remove [FILE(S)]   remove plugin(s)\n");
++@@ -1171,6 +1267,12 @@
     return 0;
+  }
@@ -149,11 +157,11 @@
   static int process_list(int argvc, char *argv[])
+  {
     const char **plugin_dirs = get_mozilla_plugin_dirs();
--@@ -1152,6 +1253,7 @@
++@@ -1294,6 +1396,7 @@
   	{ 'a', "auto",		process_auto,		0 },
   	{ 'n', "native",	process_native,		0 },
   	{ 'l', "list",		process_list,		1 },
--+	{ 'n', "nosymlinks",	process_nolink,		0 },
+++	{ 'x', "nosymlinks",	process_nolink,		0 },
   	{ 'u', "update",	process_update,		1 },
   	{ 'i', "install",	process_install,	1 },
   	{ 'r', "remove",	process_remove,		1 },
 === modified file 'debian/patches/001_remove_bashisms.diff'
 --- debian/patches/001_remove_bashisms.diff	2009-03-07 17:43:52 +0000
 +++ debian/patches/001_remove_bashisms.diff	2009-08-11 01:00:52 +0000
@@ -3,10 +3,10 @@
   -- Rob Andrews <rob@choralone.org>  Thu, 28 Jun 2007 18:08:54 +0100
--Index: ubuntu.1.2.2-0ubuntu1/utils/mkruntime.sh
++Index: nspluginwrapper/utils/mkruntime.sh
  ===================================================================
----- ubuntu.1.2.2-0ubuntu1.orig/utils/mkruntime.sh	2009-01-02 11:19:18.000000000 +0100
--+++ ubuntu.1.2.2-0ubuntu1/utils/mkruntime.sh	2009-03-07 18:38:19.000000000 +0100
++--- nspluginwrapper.orig/utils/mkruntime.sh	2009-08-11 02:41:59.000000000 +0200
+++++ nspluginwrapper/utils/mkruntime.sh	2009-08-11 02:45:41.000000000 +0200
@@ -12,15 +12,15 @@
   # - Check acroread5, something is missing while loading a PDF
   # - Enough for Flash Player & PluginSDK npsimple.so
 === modified file 'debian/patches/002_install_to_NSPLUGINDIR.diff'
 --- debian/patches/002_install_to_NSPLUGINDIR.diff	2009-03-19 20:47:09 +0000
 +++ debian/patches/002_install_to_NSPLUGINDIR.diff	2009-08-11 01:00:52 +0000
@@ -5,11 +5,11 @@
   -- Rob Andrews <rob@choralone.org>  Sat, 14 Jul 2007 18:45:00 +0100
--Index: ubuntu.1.2.2-0ubuntu2/src/npw-config.c
++Index: nspluginwrapper/src/npw-config.c
  ===================================================================
----- ubuntu.1.2.2-0ubuntu2.orig/src/npw-config.c	2009-03-19 21:33:48.000000000 +0100
--+++ ubuntu.1.2.2-0ubuntu2/src/npw-config.c	2009-03-19 21:34:02.000000000 +0100
--@@ -124,6 +124,10 @@
++--- nspluginwrapper.orig/src/npw-config.c	2009-08-11 02:45:38.000000000 +0200
+++++ nspluginwrapper/src/npw-config.c	2009-08-11 02:45:50.000000000 +0200
++@@ -189,6 +189,10 @@
     static const char default_dir[] = LIBDIR "/mozilla/plugins";
     static const char *dir = NULL;
@@ -20,7 +20,7 @@
     if (dir == NULL) {
   	const char **dirs = NULL;
--@@ -826,7 +830,8 @@
++@@ -955,7 +959,8 @@
     /* Install symlinks on Debian systems */
     if (has_system_wide_wrapper_plugin(plugin_path, true)
   	  && (access("/etc/debian_version", F_OK) == 0)
 === modified file 'debian/patches/003_update_help_info.diff'
 --- debian/patches/003_update_help_info.diff	2009-03-07 17:43:52 +0000
 +++ debian/patches/003_update_help_info.diff	2009-08-11 01:31:54 +0000
@@ -2,14 +2,14 @@
   -- Rob Andrews <rob@choralone.org>  Sun, 02 Sep 2007 11:58:27 +0100
--Index: ubuntu.1.2.2-0ubuntu1/src/npw-config.c
++Index: nspluginwrapper/src/npw-config.c
  ===================================================================
----- ubuntu.1.2.2-0ubuntu1.orig/src/npw-config.c	2009-03-07 18:38:23.000000000 +0100
--+++ ubuntu.1.2.2-0ubuntu1/src/npw-config.c	2009-03-07 18:38:28.000000000 +0100
--@@ -1102,7 +1102,7 @@
--   printf("   -a --auto               flag: set automatic mode for plugins discovery\n");
++--- nspluginwrapper.orig/src/npw-config.c	2009-08-11 02:46:48.000000000 +0200
+++++ nspluginwrapper/src/npw-config.c	2009-08-11 02:47:57.000000000 +0200
++@@ -1242,7 +1242,7 @@
     printf("   -n --native             flag: allow native plugin(s) to be wrapped\n");
     printf("   -l --list               list plugins currently installed\n");
++   printf("   -x --nosymlinks         do not create symlinks to the installed plugin\n");
  -  printf("   -u --update             update plugin(s) currently installed\n");
  +  printf("   -u --update [FILE(S)]   update plugin(s) currently installed\n");
     printf("   -i --install [FILE(S)]  install plugin(s)\n");
 === modified file 'debian/patches/004_fix_threading.diff'
 --- debian/patches/004_fix_threading.diff	2009-03-07 17:43:52 +0000
 +++ debian/patches/004_fix_threading.diff	2009-08-11 01:00:52 +0000
@@ -2,10 +2,10 @@
   -- Rob Andrews <rob@choralone.org>  Sat, 26 Jan 2008 03:01:31 +0000
--Index: ubuntu.1.2.2-0ubuntu1/Makefile
++Index: nspluginwrapper/Makefile
  ===================================================================
----- ubuntu.1.2.2-0ubuntu1.orig/Makefile	2009-01-02 11:19:18.000000000 +0100
--+++ ubuntu.1.2.2-0ubuntu1/Makefile	2009-03-07 18:38:33.000000000 +0100
++--- nspluginwrapper.orig/Makefile	2009-08-11 02:41:59.000000000 +0200
+++++ nspluginwrapper/Makefile	2009-08-11 02:49:12.000000000 +0200
@@ -120,7 +120,7 @@
   npviewer_CFLAGS += -I$(LSB_INC_DIR)/glib-2.0
   npviewer_CFLAGS += -I$(LSB_INC_DIR)/gtk-2.0
 === added file 'debian/patches/004_system_only_update.diff'
 --- debian/patches/004_system_only_update.diff	1970-01-01 00:00:00 +0000
 +++ debian/patches/004_system_only_update.diff	2009-08-11 01:31:54 +0000
@@ -0,0 +1,63 @@
++Force npconfig to only update system mozilla plugin dir if requested.
++
++ -- Rob Andrews <rob@choralone.org>  Mon, 09 Mar 2009 22:59:45 +0000
++
++Index: nspluginwrapper/src/npw-config.c
++===================================================================
++--- nspluginwrapper.orig/src/npw-config.c	2009-08-11 03:22:31.000000000 +0200
+++++ nspluginwrapper/src/npw-config.c	2009-08-11 03:22:31.000000000 +0200
++@@ -42,6 +42,7 @@
++ static bool g_auto = false;
++ static bool g_verbose = false;
++ static bool g_allow_native = false;
+++static bool g_systemonly = false;
++ static const char NPW_CONFIG[] = "nspluginwrapper";
++
++ /* On Debian systems, we install/remove symlinks from these paths.
++@@ -1239,6 +1240,7 @@
++   printf("   -h --help               print this message\n");
++   printf("   -v --verbose            flag: set verbose mode\n");
++   printf("   -a --auto               flag: set automatic mode for plugins discovery\n");
+++  printf("   -s --systemonly         when auto updating, only process the system plugin directory\n");
++   printf("   -n --native             flag: allow native plugin(s) to be wrapped\n");
++   printf("   -l --list               list plugins currently installed\n");
++   printf("   -x --nosymlinks         do not create symlinks to the installed plugin\n");
++@@ -1298,9 +1300,16 @@
++ {
++   int i;
++
++-  if (g_auto)
+++  if (g_auto && !g_systemonly)
++ 	return auto_update_plugins();
++
+++  if (g_auto && g_systemonly)
+++  {
+++	if (g_verbose)
+++	  printf("Auto-updating system plugin path.\n");
+++	return process_plugin_dir(get_system_mozilla_plugin_dir(), (is_plugin_cb)is_wrapper_plugin_0, (process_plugin_cb)update_plugin);
+++  }
+++
++   if (argc < 1)
++ 	error("expected plugin(s) file name to update");
++
++@@ -1371,6 +1380,12 @@
++   return 0;
++ }
++
+++static int process_system_only(int argc, char *argv[])
+++{
+++  g_systemonly = true;
+++  return 0;
+++}
+++
++ int main(int argc, char *argv[])
++ {
++   char **args;
++@@ -1399,6 +1414,7 @@
++ 	{ 'h', "help",		process_help,		1 },
++ 	{ 'v', "verbose",	process_verbose,	0 },
++ 	{ 'a', "auto",		process_auto,		0 },
+++	{ 's', "systemonly",	process_system_only,	0 },
++ 	{ 'n', "native",	process_native,		0 },
++ 	{ 'l', "list",		process_list,		1 },
++ 	{ 'x', "nosymlinks",	process_nolink,		0 },
 === modified file 'debian/patches/005_process_env_dirs.diff'
 --- debian/patches/005_process_env_dirs.diff	2009-04-02 14:37:55 +0000
 +++ debian/patches/005_process_env_dirs.diff	2009-08-11 01:28:09 +0000
@@ -4,10 +4,10 @@
  Adjust npconfig_CFLAGS in Makefile to include glib during compile.
   -- Sasa Bodiroza <jazzva@gmail.com>  Wed, 01 Apr 2009 21:50:00 +0200
--Index: ubuntu.1.2.2-0ubuntu3/src/npw-config.c
++Index: nspluginwrapper/src/npw-config.c
  ===================================================================
----- ubuntu.1.2.2-0ubuntu3.orig/src/npw-config.c	2009-04-02 16:29:55.000000000 +0200
--+++ ubuntu.1.2.2-0ubuntu3/src/npw-config.c	2009-04-02 16:32:56.000000000 +0200
++--- nspluginwrapper.orig/src/npw-config.c	2009-08-11 03:22:49.000000000 +0200
+++++ nspluginwrapper/src/npw-config.c	2009-08-11 03:22:49.000000000 +0200
@@ -38,6 +38,7 @@
   #include <pwd.h>
   #include <dirent.h>
@@ -16,7 +16,7 @@
   static bool g_auto = false;
   static bool g_verbose = false;
--@@ -213,6 +214,21 @@
++@@ -279,6 +280,21 @@
     return plugin_path;
+  }
@@ -38,7 +38,7 @@
   static const char **get_mozilla_plugin_dirs(void)
+  {
     static const char *default_dirs[] = {
--@@ -257,13 +273,23 @@
++@@ -323,13 +339,23 @@
     };
     const int n_default_dirs = (sizeof(default_dirs) / sizeof(default_dirs[0]));
@@ -63,10 +63,10 @@
     dirs[j++] = get_user_mozilla_plugin_dir();
     dirs[j] = NULL;
     return dirs;
--Index: ubuntu.1.2.2-0ubuntu3/Makefile
++Index: nspluginwrapper/Makefile
  ===================================================================
----- ubuntu.1.2.2-0ubuntu3.orig/Makefile	2009-04-02 16:29:55.000000000 +0200
--+++ ubuntu.1.2.2-0ubuntu3/Makefile	2009-04-02 16:29:55.000000000 +0200
++--- nspluginwrapper.orig/Makefile	2009-08-11 03:22:48.000000000 +0200
+++++ nspluginwrapper/Makefile	2009-08-11 03:22:49.000000000 +0200
@@ -174,7 +174,8 @@
   npconfig_RAWSRCS = npw-config.c
   npconfig_SOURCES = $(npconfig_RAWSRCS:%.c=$(SRC_PATH)/src/%.c)
@@ -77,7 +77,7 @@
   ifneq (,$(findstring $(OS),netbsd dragonfly))
   # We will try to dlopen() the native plugin library. If that lib is
   # linked against libpthread, then so must our program too.
--@@ -410,7 +411,7 @@
++@@ -402,7 +403,7 @@
   	$(CC) -o $@ $(npconfig_OBJECTS) $(npconfig_LDFLAGS)
   npconfig-%.o: $(SRC_PATH)/src/%.c
@@ -85,4 +85,4 @@
  +	$(CC) -o $@ -c $< $(CPPFLAGS) $(CFLAGS) $(npconfig_CFLAGS)
   $(nploader_PROGRAM): $(nploader_SOURCES)
-- 	sed -e "s|%NPW_LIBDIR%|$(pkglibdir)|" $< > $@
++ 	sed -e 's|%NPW_VIEWER_DIR%|$(nptargetdir_var)|' $< > $@
 === modified file 'debian/patches/series'
 --- debian/patches/series	2009-04-01 20:10:03 +0000
 +++ debian/patches/series	2009-08-11 01:28:09 +0000
@@ -3,4 +3,6 @@
 _install_to_NSPLUGINDIR.diff
 _update_help_info.diff
 _fix_threading.diff
++004_system_only_update.diff
 _process_env_dirs.diff
++use_syslsb.patch
 === added file 'debian/patches/use_syslsb.patch'
 --- debian/patches/use_syslsb.patch	1970-01-01 00:00:00 +0000
 +++ debian/patches/use_syslsb.patch	2009-08-11 01:11:02 +0000
@@ -0,0 +1,126 @@
++---
++ Makefile |   36 ++++++++++++++++++++++++++++++++++++
++ 1 file changed, 36 insertions(+)
++
++Index: nspluginwrapper/Makefile
++===================================================================
++--- nspluginwrapper.orig/Makefile	2009-08-11 03:03:59.000000000 +0200
+++++ nspluginwrapper/Makefile	2009-08-11 03:10:00.000000000 +0200
++@@ -79,11 +79,13 @@
++ ARCH_32 = $(ARCH)
++ ifeq ($(build_biarch), yes)
++ ARCH_32 = $(TARGET_ARCH)
+++ifeq (,$(USE_SYSTEM_LSB))
++ LSB_LIBS = $(LSB_OBJ_DIR)/libc.so $(LSB_OBJ_DIR)/libgcc_s_32.so
++ LSB_LIBS += $(LSB_CORE_STUBS:%=$(LSB_OBJ_DIR)/%.so)
++ LSB_LIBS += $(LSB_CORE_STATIC_STUBS:%=$(LSB_OBJ_DIR)/%.a)
++ LSB_LIBS += $(LSB_DESKTOP_STUBS:%=$(LSB_OBJ_DIR)/%.so)
++ endif
+++endif
++
++ LSB_TOP_DIR = $(SRC_PATH)/lsb-build
++ LSB_INC_DIR = $(LSB_TOP_DIR)/headers
++@@ -119,7 +121,11 @@
++ npviewer_CFLAGS += -I$(LSB_INC_DIR)
++ npviewer_CFLAGS += -I$(LSB_INC_DIR)/glib-2.0
++ npviewer_CFLAGS += -I$(LSB_INC_DIR)/gtk-2.0
+++ifeq (,$(USE_SYSTEM_LSB))
++ npviewer_LDFLAGS = $(LDFLAGS_32) -L$(LSB_OBJ_DIR)
+++else
+++npviewer_LDFLAGS = $(LDFLAGS_32) -L/usr/lib32/
+++endif
++ npviewer_LDFLAGS += -lgtk-x11-2.0 -lgdk-x11-2.0 -lgobject-2.0 -ldl -lglib-2.0 -lgthread-2.0 -lX11 -lXt
++ else
++ npviewer_CFLAGS += $(GTK_CFLAGS)
++@@ -157,7 +163,11 @@
++ libxpcom_CFLAGS  = $(PIC_CFLAGS)
++ ifeq ($(build_biarch),yes)
++ libxpcom_CFLAGS += -I$(LSB_INC_DIR)
+++ifeq (,$(USE_SYSTEM_LSB))
++ libxpcom_LDFLAGS = $(LDFLAGS_32) -L$(LSB_OBJ_DIR)
+++else
+++libxpcom_LDFLAGS = $(LDFLAGS_32) -L/usr/lib32/
+++endif
++ endif
++
++ libnoxshm_LIBRARY = libnoxshm.so
++@@ -167,7 +177,11 @@
++ libnoxshm_CFLAGS  = $(PIC_CFLAGS)
++ ifeq ($(biarch),yes)
++ libnoxshm_CFLAGS += -I$(LSB_INC_DIR)
+++ifeq (,$(USE_SYSTEM_LSB))
++ libnoxshm_LDFLAGS = $(LDFLAGS_32) -L$(LSB_OBJ_DIR)
+++else
+++libxpcom_LDFLAGS = $(LDFLAGS_32) -L/usr/lib32/
+++endif
++ endif
++
++ npconfig_PROGRAM = npconfig
++@@ -235,6 +249,7 @@
++ FILES		+= $(addprefix $(LSB_TOP_DIR)/headers/,$(shell cat $(LSB_TOP_DIR)/headers/core_filelist))
++ FILES		+= $(LSB_TOP_DIR)/headers/desktop_filelist
++ FILES		+= $(addprefix $(LSB_TOP_DIR)/headers/,$(shell cat $(LSB_TOP_DIR)/headers/desktop_filelist))
+++ifeq (,$(USE_SYSTEM_LSB))
++ FILES		+= $(LSB_SRC_DIR)/LibNameMap.txt
++ FILES		+= $(LSB_SRC_DIR)/core_filelist
++ FILES		+= $(LSB_SRC_DIR)/core_static_filelist
++@@ -244,6 +259,7 @@
++ FILES		+= $(patsubst %,$(LSB_SRC_DIR)/%.c,$(LSB_CORE_STATIC_STUBS))
++ FILES		+= $(patsubst %,$(LSB_SRC_DIR)/%.c,$(LSB_DESKTOP_STUBS))
++ FILES		+= $(patsubst %,$(LSB_SRC_DIR)/%.Version,$(LSB_DESKTOP_STUBS))
+++endif
++
++ all: $(TARGETS)
++
++@@ -370,8 +386,13 @@
++ npwrapper-%.os: $(SRC_PATH)/src/%.c
++ 	$(CC) -o $@ -c $< $(PIC_CFLAGS) $(CPPFLAGS) $(npwrapper_CFLAGS) -DBUILD_WRAPPER
++
+++ifeq (,$(USE_SYSTEM_LSB))
++ $(npviewer_PROGRAM): $(npviewer_OBJECTS) $(npviewer_MAPFILE) $(LSB_OBJ_DIR) $(LSB_LIBS)
++ 	$(CC) $(LDFLAGS_32) -o $@ $(npviewer_OBJECTS) $(npviewer_LDFLAGS)
+++else
+++$(npviewer_PROGRAM): $(npviewer_OBJECTS) $(npviewer_MAPFILE)
+++	$(CC) $(LDFLAGS_32) -o $@ $(npviewer_OBJECTS) $(npviewer_LDFLAGS)
+++endif
++
++ npviewer-%.o: $(SRC_PATH)/src/%.c
++ 	$(CC) $(CFLAGS_32) -o $@ -c $< $(CPPFLAGS) $(npviewer_CFLAGS) -DBUILD_VIEWER
++@@ -379,22 +400,37 @@
++ npviewer-%.o: $(SRC_PATH)/src/%.cpp
++ 	$(CXX) $(CFLAGS_32) -o $@ -c $< $(CPPFLAGS) $(npviewer_CFLAGS) -DBUILD_VIEWER
++
+++ifeq (,$(USE_SYSTEM_LSB))
++ $(npplayer_PROGRAM): $(npplayer_OBJECTS) $(npplayer_MAPFILE) $(LSB_OBJ_DIR) $(LSB_LIBS)
++ 	$(CC) $(LDFLAGS) -o $@ $(npplayer_OBJECTS) $(npplayer_LDFLAGS)
+++else
+++$(npplayer_PROGRAM): $(npplayer_OBJECTS) $(npplayer_MAPFILE)
+++	$(CC) $(LDFLAGS) -o $@ $(npplayer_OBJECTS) $(npplayer_LDFLAGS)
+++endif
++
++ npplayer-%.o: $(SRC_PATH)/src/%.c
++ 	$(CC) $(CFLAGS) -o $@ -c $< $(CPPFLAGS) $(npplayer_CFLAGS) -DBUILD_PLAYER
++ npplayer-%.o: $(SRC_PATH)/src/tidy/%.c
++ 	$(CC) $(CFLAGS) -o $@ -c $< $(CPPFLAGS) $(npplayer_CFLAGS) -DBUILD_PLAYER
++
+++ifeq (,$(USE_SYSTEM_LSB))
++ $(libxpcom_LIBRARY): $(libxpcom_OBJECTS) $(LSB_OBJ_DIR) $(LSB_LIBS)
++ 	$(CC) $(LDFLAGS_32) $(DSO_LDFLAGS) -o $@ $(libxpcom_OBJECTS) $(libxpcom_LDFLAGS) -Wl,$(LD_soname),libxpcom.so
+++else
+++$(libxpcom_LIBRARY): $(libxpcom_OBJECTS)
+++	$(CC) $(LDFLAGS_32) $(DSO_LDFLAGS) -o $@ $(libxpcom_OBJECTS) $(libxpcom_LDFLAGS) -Wl,$(LD_soname),libxpcom.so
+++endif
++
++ libxpcom-%.o: $(SRC_PATH)/src/%.c
++ 	$(CC) $(CFLAGS_32) -o $@ -c $< $(CPPFLAGS) $(libxpcom_CFLAGS) -DBUILD_XPCOM
++
+++ifeq (,$(USE_SYSTEM_LSB))
++ $(libnoxshm_LIBRARY): $(libnoxshm_OBJECTS) $(LSB_OBJ_DIR) $(LSB_LIBS)
++ 	$(CC) $(LDFLAGS_32) $(DSO_LDFLAGS) -o $@ $(libnoxshm_OBJECTS) $(libnoxshm_LDFLAGS) -Wl,$(LD_soname),libnoxshm.so
+++else
+++$(libnoxshm_LIBRARY): $(libnoxshm_OBJECTS)
+++	$(CC) $(LDFLAGS_32) $(DSO_LDFLAGS) -o $@ $(libnoxshm_OBJECTS) $(libnoxshm_LDFLAGS) -Wl,$(LD_soname),libnoxshm.so
+++endif
++
++ libnoxshm-%.o: $(SRC_PATH)/src/%.c
++ 	$(CC) $(CFLAGS_32) -o $@ -c $< $(CPPFLAGS) $(libnoxshm_CFLAGS)
 === modified file 'debian/rules' (properties changed: +x to -x)
 --- debian/rules	2008-08-27 01:07:14 +0000
 +++ debian/rules	2009-08-11 00:37:05 +0000
@@ -49,7 +49,7 @@
  build: configure build-stamp
  build-stamp:
  	dh_testdir
--	$(MAKE)
++	$(MAKE) USE_SYSTEM_LSB=1
  	touch $@
  clean: clean-patched unpatch
@@ -65,7 +65,7 @@
  	dh_testroot
  	dh_clean -k
  	dh_installdirs
--	$(MAKE) DESTDIR=$(CURDIR)/debian/nspluginwrapper install
++	$(MAKE) USE_SYSTEM_LSB=1 DESTDIR=$(CURDIR)/debian/nspluginwrapper install
  # Build architecture-independent files here.
 === modified file 'lsb-build/headers/glib-2.0/glib.h'
 --- lsb-build/headers/glib-2.0/glib.h	2008-10-15 15:29:08 +0000
 +++ lsb-build/headers/glib-2.0/glib.h	2009-08-11 00:38:42 +0000
@@ -2642,6 +2642,7 @@
      extern GHashTable *g_hash_table_new(GHashFunc, GEqualFunc);
      extern const gchar *g_dir_read_name(GDir *);
      extern gboolean g_hash_table_remove(GHashTable *, gconstpointer);
++    extern void g_hash_table_remove_all(GHashTable *);
      extern gchar *g_utf8_strdown(const gchar *, gssize);
      extern GIOCondition g_io_channel_get_buffer_condition(GIOChannel *);
      extern GSource *g_child_watch_source_new(GPid);
 === modified file 'lsb-build/stub_libs/libglib-2.0.c'
 --- lsb-build/stub_libs/libglib-2.0.c	2008-10-15 15:29:08 +0000
 +++ lsb-build/stub_libs/libglib-2.0.c	2009-08-11 00:38:42 +0000
@@ -195,6 +195,7 @@
  void g_hash_table_new() {} ;
  void g_hash_table_new_full() {} ;
  void g_hash_table_remove() {} ;
++void g_hash_table_remove_all() {} ;
  void g_hash_table_replace() {} ;
  void g_hash_table_size() {} ;
  void g_hash_table_steal() {} ;
 === modified file 'nspluginwrapper.spec'
 --- nspluginwrapper.spec	2009-01-02 10:07:27 +0000
 +++ nspluginwrapper.spec	2009-08-11 00:38:42 +0000
@@ -1,7 +1,7 @@
  %define name	nspluginwrapper
--%define version	1.2.2
++%define version	1.3.0
  %define release	1
--#define svndate	DATE
++#define svndate 20090102
  # define 32-bit arch of multiarch platforms
  %define arch_32 %{nil}
@@ -159,7 +159,7 @@
  %{plugindir}/npwrapper.so
  %dir %{pkglibdir}
  %dir %{pkglibdir}/noarch
--%{pkglibdir}/noarch/npviewer
++%{pkglibdir}/noarch/npviewer.sh
  %dir %{pkglibdir}/%{_arch}
  %dir %{pkglibdir}/%{_arch}/%{_os}
  %{pkglibdir}/%{_arch}/%{_os}/npconfig
@@ -191,6 +191,14 @@
  %endif
  %changelog
++* Fri Jan 02 2009 Gwenole Beauchesne <gb.public@free.fr> 1.3.0-1
++- don't poll for Xt events in Gtk (XEMBED) plug-ins
++- use 40 Hz timer for Xt events only when necessary (Xt input sources)
++- add NPIdentifier and NPClass::HasMethod caches, i.e. lower RPC traffic
++- add support for multiple viewer paths, see --viewer-paths=PATH-EXPR
++- add basic checks for malloc()'ed buffer underflow/overflow
++- add checks for single-threaded calls into the browser (NPN_*() functions)
++
  * Fri Jan 02 2009 Gwenole Beauchesne <gb.public@free.fr> 1.2.2-1
  - fix support for the VLC plug-in
  - fix memory deallocation in NPN_GetStringIdentifiers()
 === modified file 'src/npruntime-impl.h'
 --- src/npruntime-impl.h	2009-01-02 10:07:27 +0000
 +++ src/npruntime-impl.h	2009-08-11 00:38:42 +0000
@@ -27,6 +27,7 @@
    uint32_t npobj_id;
    bool is_valid;
    void *plugin;
++  void *hasMethod_cache;
  } NPObjectInfo;
  extern NPObjectInfo *npobject_info_new(NPObject *npobj) attribute_hidden;
@@ -59,6 +60,10 @@
  extern void print_npvariant_args(const struct _NPVariant *args, uint32_t nargs) attribute_hidden;
  // Deactivate all NPObject instances
--extern void npruntime_deactivate(void);
++extern void npruntime_deactivate(void) attribute_hidden;
++
++// Check whether to use NPRuntime data caching
++// (on by default, disabled with NPW_NPRUNTIME_CACHE=0|no)
++extern bool npruntime_use_cache(void) attribute_hidden;
  #endif /* NPRUNTIME_IMPL_H */
 === modified file 'src/npruntime.c'
 --- src/npruntime.c	2009-01-02 10:07:27 +0000
 +++ src/npruntime.c	2009-08-11 00:38:42 +0000
@@ -30,15 +30,55 @@
  #include "debug.h"
++// Define to enable NPClass::HasMethod cache
++#define USE_NPCLASS_HAS_METHOD_CACHE 1
++
++// Define to enable NPClass::HasProperty cache (derived from ::HasMethod cache)
++#define USE_NPCLASS_HAS_PROPERTY_CACHE 1
++
  // Defined in npw-{wrapper,viewer}.c
  extern rpc_connection_t *g_rpc_connection attribute_hidden;
  // Defined in npw-viewer.c
--#if USE_PID_CHECK && NPW_IS_PLUGIN
--extern bool pid_check(void);
--#else
--#define pid_check() true
--#endif
++#if defined(ENABLE_THREAD_CHECK) && NPW_IS_PLUGIN
++extern bool thread_check(void);
++#else
++#define thread_check() true
++#endif
++
++
++/* ====================================================================== */
++/* === Helpers                                                        === */
++/* ====================================================================== */
++
++static inline bool get_use_npruntime_cache_env(void)
++{
++  const gchar *env = getenv("NPW_NPRUNTIME_CACHE");
++  return env == NULL || (strcmp(env, "no") != 0 && strcmp(env, "0") != 0);
++}
++
++bool npruntime_use_cache(void)
++{
++  static int use_cache = -1;
++  if (G_UNLIKELY(use_cache < 0))
++	use_cache = get_use_npruntime_cache_env();
++  return use_cache;
++}
++
++static inline bool use_npclass_has_method_cache(void)
++{
++#if USE_NPCLASS_HAS_METHOD_CACHE
++  return npruntime_use_cache();
++#else
++  return false;
++#endif
++}
++
++static inline bool use_npclass_has_property_cache(void)
++{
++  /* this depends on the NPClass::HasMethod cache */
++  return use_npclass_has_method_cache();
++}
  /* ====================================================================== */
@@ -131,8 +171,8 @@
    if (!is_valid_npobject_class(npobj))
  	return;
--  if (!pid_check()) {
--	npw_printf("WARNING: NPClass::Invalidate called from the wrong process\n");
++  if (!thread_check()) {
++	npw_printf("WARNING: NPClass::Invalidate not called from the main thread\n");
  	return;
+   }
@@ -196,18 +236,34 @@
    return ret;
+ }
++static bool npclass_cached_HasMethod(NPObject *npobj, NPIdentifier name)
++{
++  NPObjectInfo *npobj_info = npobject_info_lookup(npobj);
++  if (use_npclass_has_method_cache() && npobj_info) {
++	if (G_UNLIKELY(npobj_info->hasMethod_cache == NULL))
++	  npobj_info->hasMethod_cache = g_hash_table_new(NULL, NULL);
++	gpointer hasMethod = NULL;
++	if (g_hash_table_lookup_extended(npobj_info->hasMethod_cache, name, NULL, &hasMethod))
++	  return GPOINTER_TO_UINT(hasMethod);
++  }
++  bool hasMethod = npclass_invoke_HasMethod(npobj, name);
++  if (use_npclass_has_method_cache() && npobj_info)
++	g_hash_table_insert(npobj_info->hasMethod_cache, name, GUINT_TO_POINTER(hasMethod));
++  return hasMethod;
++}
++
  bool g_NPClass_HasMethod(NPObject *npobj, NPIdentifier name)
+ {
    if (!is_valid_npobject_class(npobj))
  	return false;
--  if (!pid_check()) {
--	npw_printf("WARNING: NPClass::HasMethod called from the wrong process\n");
++  if (!thread_check()) {
++	npw_printf("WARNING: NPClass::HasMethod not called from the main thread\n");
  	return false;
+   }
    D(bugiI("NPClass::HasMethod(npobj %p, name id %p)\n", npobj, name));
--  bool ret = npclass_invoke_HasMethod(npobj, name);
++  bool ret = npclass_cached_HasMethod(npobj, name);
    D(bugiD("NPClass::HasMethod return: %d\n", ret));
    return ret;
+ }
@@ -300,8 +356,8 @@
    if (!is_valid_npobject_class(npobj))
  	return false;
--  if (!pid_check()) {
--	npw_printf("WARNING: NPClass::Invoke called from the wrong process\n");
++  if (!thread_check()) {
++	npw_printf("WARNING: NPClass::Invoke not called from the main thread\n");
  	return false;
+   }
@@ -399,8 +455,8 @@
    if (!is_valid_npobject_class(npobj))
  	return false;
--  if (!pid_check()) {
--	npw_printf("WARNING: NPClass::InvokeDefault called from the wrong process\n");
++  if (!thread_check()) {
++	npw_printf("WARNING: NPClass::InvokeDefault not called from the main thread\n");
  	return false;
+   }
@@ -468,18 +524,29 @@
    return ret;
+ }
++static bool npclass_cached_HasProperty(NPObject *npobj, NPIdentifier name)
++{
++  NPObjectInfo *npobj_info = npobject_info_lookup(npobj);
++  if (use_npclass_has_property_cache() && npobj_info && npobj_info->hasMethod_cache) {
++	/* If the NPIdentifier references a method, it can't be a property */
++	if (g_hash_table_lookup_extended(npobj_info->hasMethod_cache, name, NULL, NULL))
++	  return false;
++  }
++  return npclass_invoke_HasProperty(npobj, name);
++}
++
  bool g_NPClass_HasProperty(NPObject *npobj, NPIdentifier name)
+ {
    if (!is_valid_npobject_class(npobj))
  	return false;
--  if (!pid_check()) {
--	npw_printf("WARNING: NPClass::HasProperty called from the wrong process\n");
++  if (!thread_check()) {
++	npw_printf("WARNING: NPClass::HasProperty not called from the main thread\n");
  	return false;
+   }
    D(bugiI("NPClass::HasProperty(npobj %p, name id %p)\n", npobj, name));
--  bool ret = npclass_invoke_HasProperty(npobj, name);
++  bool ret = npclass_cached_HasProperty(npobj, name);
    D(bugiD("NPClass::HasProperty return: %d\n", ret));
    return ret;
+ }
@@ -559,8 +626,8 @@
    if (!is_valid_npobject_class(npobj))
  	return false;
--  if (!pid_check()) {
--	npw_printf("WARNING: NPClass::GetProperty called from the wrong process\n");
++  if (!thread_check()) {
++	npw_printf("WARNING: NPClass::GetProperty not called from the main thread\n");
  	return false;
+   }
@@ -645,8 +712,8 @@
    if (!is_valid_npobject_class(npobj))
  	return false;
--  if (!pid_check()) {
--	npw_printf("WARNING: NPClass::SetProperty called from the wrong process\n");
++  if (!thread_check()) {
++	npw_printf("WARNING: NPClass::SetProperty not called from the main thread\n");
  	return false;
+   }
@@ -716,8 +783,8 @@
    if (!is_valid_npobject_class(npobj))
  	return false;
--  if (!pid_check()) {
--	npw_printf("WARNING: NPClass::RemoveProperty called from the wrong process\n");
++  if (!thread_check()) {
++	npw_printf("WARNING: NPClass::RemoveProperty not called from the main thread\n");
  	return false;
+   }
@@ -734,22 +801,31 @@
  NPObjectInfo *npobject_info_new(NPObject *npobj)
+ {
--  NPObjectInfo *npobj_info = NPW_MemNew0(NPObjectInfo, 1);
++  NPObjectInfo *npobj_info = NPW_MemNew(NPObjectInfo, 1);
    if (npobj_info) {
  	static uint32_t id;
  	npobj_info->npobj = npobj;
  	npobj_info->npobj_id = ++id;
  	npobj_info->is_valid = true;
++	npobj_info->plugin = NULL;
++	npobj_info->hasMethod_cache = NULL;
+   }
    return npobj_info;
+ }
  void npobject_info_destroy(NPObjectInfo *npobj_info)
+ {
--  if (npobj_info) {
--	npw_plugin_instance_unref(npobj_info->plugin);
--	NPW_MemFree(npobj_info);
++  if (npobj_info == NULL)
++	return;
++
++  npw_plugin_instance_unref(npobj_info->plugin);
++
++  if (npobj_info->hasMethod_cache) {
++	g_hash_table_destroy(npobj_info->hasMethod_cache);
++	npobj_info->hasMethod_cache = NULL;
+   }
++
++  NPW_MemFree(npobj_info);
+ }
 === modified file 'src/npw-config.c'
 --- src/npw-config.c	2009-01-02 10:12:06 +0000
 +++ src/npw-config.c	2009-08-11 00:40:05 +0000
@@ -71,6 +71,71 @@
    return 1;
+ }
++static const char *strnstr(const char *str, int len, const char *substr)
++{
++  const char *match = strstr(str, substr);
++  if (len > 0 && (match + strlen(substr) > str + len))
++	match = NULL;
++  return match;
++}
++
++typedef struct {
++  const char *name;
++  const char *value;
++} Var;
++
++static int strexpand(char *dst, int dstlen, const char *src, int srclen, const Var *vars)
++{
++  if (dst == NULL || dstlen < 1 || src == NULL)
++	return -1;
++
++  if (srclen <= 0)
++	srclen = strlen(src);
++
++  int n = 0;
++  for (int i = 0; i < srclen; i++) {
++	char ch = src[i];
++	if (ch != '%') {
++	  dst[n++] = ch;
++	  if (n >= dstlen - 1)
++		return -1;
++	}
++	else {
++	  char var[16];
++	  const char *str = &src[i + 1];
++	  const char *end = strchr(str, '%');
++	  if (end == NULL)
++		error("unterminated var '%s'", str);
++
++	  int len = end - str;
++	  if (len >= sizeof(var) - 1) {
++		len = sizeof(var) - 1;
++		memcpy(var, str, len);
++		var[len] = '\0';
++		error("unsupported var '%s...'", var);
++	  }
++	  memcpy(var, str, len);
++	  var[len] = '\0';
++
++	  str = NULL;
++	  for (int j = 0; vars[j].name != NULL; j++) {
++		if (strcmp(vars[j].name, var) == 0) {
++		  str = vars[j].value;
++		  break;
++		}
++	  }
++	  if (str == NULL)
++		error("could not expand var '%s'", var);
++	  i += len + 1;
++	  len = strlen(str);
++	  memcpy(&dst[n], str, len);
++	  n += len;
++	}
++  }
++  dst[n] = '\0';
++  return 0;
++}
++
  /* Implement mkdir -p with default permissions (derived from busybox code) */
  static int mkdir_p(const char *path)
+ {
@@ -489,6 +554,30 @@
    EXIT_VIEWER_NATIVE	= 20
  };
++static bool is_plugin_viewer_ok(const char *viewer_path, const char *filename)
++{
++  int pid = fork();
++  if (pid < 0)
++	return false;
++  if (pid == 0) {
++	if (!g_verbose) {
++	  // don't spit out errors in non-verbose mode, we only need
++	  // to know whether there is a valid viewer or not
++	  freopen("/dev/null", "w", stderr);
++	}
++	execl(viewer_path, NPW_VIEWER, "--test", "--plugin", filename, NULL);
++	exit(1);
++  }
++  else {
++	int status;
++	while (waitpid(pid, &status, 0) != pid)
++	  ;
++	if (WIFEXITED(status) && WEXITSTATUS(status) == 0)
++	  return true;
++  }
++  return false;
++}
++
  static int detect_plugin_viewer(const char *filename, NPW_PluginInfo *out_plugin_info)
+ {
    static const char *target_arch_table[] = {
@@ -522,52 +611,60 @@
  	  && out_plugin_info->target_os && strcmp(out_plugin_info->target_os, HOST_OS) == 0)
  	return EXIT_VIEWER_NATIVE;
--  for (int i = 0; i < target_arch_table_size; i++) {
--	const char *target_arch = target_arch_table[i];
--	if (target_arch == NULL)
--	  continue;
--	char viewer_arch_path[PATH_MAX];
--	sprintf(viewer_arch_path, "%s/%s", NPW_LIBDIR, target_arch);
--	if (access(viewer_arch_path, F_OK) != 0) {
--	  target_arch_table[i] = NULL;		// this target ARCH is not available, skip it for good
--	  continue;
--	}
--	for (int j = 0; j < target_os_table_size; j++) {
--	  const char *target_os = target_os_table[j];
--	  if (target_os == NULL)
--		continue;
--	  char viewer_path[PATH_MAX];
--	  sprintf(viewer_path, "%s/%s/%s", viewer_arch_path, target_os, NPW_VIEWER);
--	  if (access(viewer_path, F_OK) != 0)
--		continue;
--	  int pid = fork();
--	  if (pid < 0)
--		continue;
--	  else if (pid == 0) {
--		if (!g_verbose) {
--		  // don't spit out errors in non-verbose mode, we only need
--		  // to know whether there is a valid viewer or not
--		  freopen("/dev/null", "w", stderr);
--		}
--		execl(viewer_path, NPW_VIEWER, "--test", "--plugin", filename, NULL);
--		exit(1);
--	  }
--	  else {
--		int status;
--		while (waitpid(pid, &status, 0) != pid)
--		  ;
--		if (WIFEXITED(status)) {
--		  status = WEXITSTATUS(status);
--		  if (status == EXIT_VIEWER_OK && out_plugin_info) {
--			strcpy(out_plugin_info->target_arch, target_arch);
--			strcpy(out_plugin_info->target_os, target_os);
--		  }
--		  return status;
--		}
--		return EXIT_VIEWER_ERROR;
--	  }
--	}
--  }
++  enum { VAR_ARCH, VAR_OS, VAR_COUNT };
++  Var vars[VAR_COUNT+1];
++  vars[VAR_ARCH].name = "ARCH";
++  vars[VAR_OS].name = "OS";
++  vars[VAR_COUNT].name = NULL;
++  vars[VAR_COUNT].value = NULL;
++
++  char viewer_path[sizeof(out_plugin_info->viewer_path)];
++  const int viewer_path_len = sizeof(viewer_path) - strlen(NPW_VIEWER) - 1;
++  const char viewer_paths[] = NPW_VIEWER_PATHS;
++  const char *viewer_path_spec_end, *viewer_path_spec = viewer_paths;
++  do {
++	int len;
++	if ((viewer_path_spec_end = strchr(viewer_path_spec, ':')) != NULL)
++	  len = viewer_path_spec_end - viewer_path_spec;
++	else
++	  len = strchr(viewer_path_spec, '\0') - viewer_path_spec;
++
++	for (int i = 0; i < target_arch_table_size; i++) {
++	  const char *target_arch = target_arch_table[i];
++	  if (target_arch == NULL)
++		continue;
++	  vars[VAR_ARCH].value = target_arch;
++
++	  for (int j = 0; j < target_os_table_size; j++) {
++		const char *target_os = target_os_table[j];
++		if (target_os == NULL)
++		  continue;
++		vars[VAR_OS].value = target_os;
++
++		if (strexpand(viewer_path, viewer_path_len, viewer_path_spec, len, vars) < 0)
++		  continue;
++		strcat(viewer_path, "/" NPW_VIEWER);
++		if (access(viewer_path, F_OK) != 0)
++		  continue;
++
++		if (is_plugin_viewer_ok(viewer_path, filename)) {
++		  strcpy(out_plugin_info->target_arch, target_arch);
++		  strcpy(out_plugin_info->target_os, target_os);
++		  strcpy(out_plugin_info->viewer_path, viewer_path);
++		  return EXIT_VIEWER_OK;
++		}
++
++		if (strnstr(viewer_path_spec, len, "%OS%") == NULL)
++		  break; // don't iterate over OS table if there is no "%OS%" pattern
++	  }
++
++	  if (strnstr(viewer_path_spec, len, "%ARCH%") == NULL)
++		break; // don't iterate over ARCH table if there is no "%ARCH%" pattern
++	}
++
++	viewer_path_spec += len + 1;
++  } while (viewer_path_spec_end != NULL);
++
    return EXIT_VIEWER_NOT_FOUND;
+ }
@@ -604,15 +701,27 @@
    if ((pi = (NPW_PluginInfo *)dlsym(handle, "NPW_Plugin")) == NULL)
  	return false;
    if (out_plugin_info) {
++	int plugin_info_version = 0;
++	if (strncmp(pi->ident, "NPW:0.9.90", 10) != 0)
++	  plugin_info_version = 1;
++	if (strncmp(pi->ident, "NPW:X:", 6) == 0)
++	  plugin_info_version = pi->struct_version;
++	out_plugin_info->struct_version = plugin_info_version;
  	strcpy(out_plugin_info->ident, pi->ident);
  	strcpy(out_plugin_info->path, pi->path);
  	out_plugin_info->mtime = pi->mtime;
--	out_plugin_info->target_arch[0] = '\0';
--	out_plugin_info->target_os[0] = '\0';
--	if (strncmp(pi->ident, "NPW:0.9.90", 10) != 0) {					// additional members in 0.9.91+
++	if (plugin_info_version >= 1) {		// additional members in 0.9.91+
  	  strcpy(out_plugin_info->target_arch, pi->target_arch);
  	  strcpy(out_plugin_info->target_os, pi->target_os);
+ 	}
++	else {
++	  out_plugin_info->target_arch[0] = '\0';
++	  out_plugin_info->target_os[0] = '\0';
++	}
++	if (plugin_info_version >= 2)		// additional members in 1.3.0+
++	  strcpy(out_plugin_info->viewer_path, pi->viewer_path);
++	else
++	  out_plugin_info->viewer_path[0] = '\0';
+   }
    return true;
+ }
@@ -628,12 +737,26 @@
    return ret;
+ }
++static bool is_master_wrapper_plugin(const char *plugin_path)
++{
++  static const char *master_plugin_paths[] = {
++	NPW_LIBDIR "/" HOST_ARCH "/" NPW_WRAPPER,
++	NPW_LIBDIR "/" HOST_ARCH "/" HOST_OS "/" NPW_WRAPPER,
++	NPW_DEFAULT_PLUGIN_PATH,
++	NULL
++  };
++  for (int i = 0; master_plugin_paths[i] != NULL; i++) {
++	if (strcmp(master_plugin_paths[i], plugin_path) == 0)
++	  return true;
++  }
++  return false;
++}
++
  static bool is_wrapper_plugin_0(const char *plugin_path)
+ {
    NPW_PluginInfo plugin_info;
    return is_wrapper_plugin(plugin_path, &plugin_info)
--	&& strcmp(plugin_info.path, NPW_DEFAULT_PLUGIN_PATH) != 0			// exclude OS/ARCH npwrapper.so
--	&& strcmp(plugin_info.path, NPW_OLD_DEFAULT_PLUGIN_PATH) != 0;		// exclude ARCH npwrapper.so
++	&& !is_master_wrapper_plugin(plugin_path);
+ }
  static bool has_system_wide_wrapper_plugin(const char *plugin_path, bool check_ident)
@@ -789,11 +912,17 @@
  	if (!is_plugin_viewer_available(plugin_path, plugin_info))
  	  return 15;
+   }
++  if (plugin_info->viewer_path[0] == '\0') {
++	if (!is_plugin_viewer_available(plugin_path, plugin_info))
++	  return 16;
++  }
    NPW_PluginInfo *pi = (NPW_PluginInfo *)(plugin_data + ofs - NPW_PLUGIN_IDENT_SIZE);
    pi->mtime = st.st_mtime;
    strcpy(pi->target_arch, plugin_info->target_arch);
    strcpy(pi->target_os, plugin_info->target_os);
++  pi->struct_version = w_plugin_info.struct_version;
++  strcpy(pi->viewer_path, plugin_info->viewer_path);
    int mode = 0700;
    if (!is_user_home_path(d_plugin_path) &&
@@ -902,6 +1031,7 @@
    int ret = 0;
    NPW_PluginInfo plugin_info;
++  memset(&plugin_info, 0, sizeof(plugin_info));
    is_wrapper_plugin(plugin_path, &plugin_info);
    struct stat st;
@@ -968,13 +1098,21 @@
  static int list_plugin(const char *plugin_path)
+ {
    NPW_PluginInfo plugin_info;
++  memset(&plugin_info, 0, sizeof(plugin_info));
    is_wrapper_plugin(plugin_path, &plugin_info);
    printf("%s\n", plugin_path);
    printf("  Original plugin: %s\n", plugin_info.path);
++  if (plugin_info.struct_version >= 2 && plugin_info.viewer_path[0] != '\0')
++	printf("  Plugin viewer: %s\n", plugin_info.viewer_path);
    char *str = strtok(plugin_info.ident, ":");
    if (str && strcmp(str, "NPW") == 0) {
  	str = strtok(NULL, ":");
++	if (plugin_info.struct_version >= 2) { /* skip 'X' */
++	  if (str[0] != 'X')
++		error("invalid NPW_PluginInfo format");
++	  str = strtok(NULL, ":");
++	}
  	if (str) {
  	  printf("  Wrapper version string: %s", str);
  	  str = strtok(NULL, ":");
@@ -1083,15 +1221,19 @@
    for (i = 0; i < argc; i++) {
  	NPW_PluginInfo plugin_info;
++	memset(&plugin_info, 0, sizeof(plugin_info));
++
  	const char *plugin_path = argv[i];
  	if (!is_plugin(plugin_path, &plugin_info))
  	  error("%s is not a valid NPAPI plugin", plugin_path);
++
  	ret = detect_plugin_viewer(plugin_path, &plugin_info);
  	if (ret != EXIT_VIEWER_OK) {
  	  if (ret == EXIT_VIEWER_NATIVE)
  		return 0; /* silently ignore exit status */
  	  error("no appropriate viewer found for %s", plugin_path);
+ 	}
++
  	ret = install_plugin(plugin_path, &plugin_info);
  	if (ret != 0)
  	  return ret;
 === modified file 'src/npw-malloc.c'
 --- src/npw-malloc.c	2009-01-02 10:07:27 +0000
 +++ src/npw-malloc.c	2009-08-11 00:38:42 +0000
@@ -23,17 +23,33 @@
  #define DEBUG 1
  #include "debug.h"
--typedef void *(*NPW_MemAllocProcPtr)  (uint32_t);
--typedef void *(*NPW_MemAlloc0ProcPtr) (uint32_t);
--typedef void  (*NPW_MemFreeProcPtr)   (void *);
++typedef void *(*NPW_MemAllocProcPtr) (uint32_t);
++typedef void  (*NPW_MemFreeProcPtr)  (void *, uint32_t);
  typedef struct _NPW_MallocHooks NPW_MallocHooks;
  struct _NPW_MallocHooks
+ {
--  NPW_MemAllocProcPtr  memalloc;
--  NPW_MemAlloc0ProcPtr memalloc0;
--  NPW_MemFreeProcPtr   memfree;
--};
++  NPW_MemAllocProcPtr memalloc;
++  NPW_MemAllocProcPtr memalloc0;
++  NPW_MemFreeProcPtr  memfree;
++};
++
++#define NPW_MALLOC_MAGIC 0x4e50574d /* 'NPWM' */
++
++typedef struct _NPW_MemBlock NPW_MemBlock;
++struct _NPW_MemBlock
++{
++  uint32_t    magic;
++  uint32_t    real_size;
++  uint32_t    alloc_size;
++  uint32_t    alloc_lineno;
++  const char *alloc_file;
++};
++
++static void *npw_mem_alloc      (uint32_t size, const char *file, int lineno);
++static void *npw_mem_alloc0     (uint32_t size, const char *file, int lineno);
++static void *npw_mem_alloc_copy (uint32_t size, const void *ptr, const char *file, int lineno);
++static void npw_mem_free        (void *ptr, const char *file, int lineno);
  /* ====================================================================== */
  /* === Standard C library                                             === */
@@ -59,7 +75,7 @@
+ }
  static void
--NPW_Libc_MemFree (void *ptr)
++NPW_Libc_MemFree (void *ptr, uint32_t size)
+ {
    free (ptr);
+ }
@@ -82,57 +98,22 @@
  #if USE_MALLOC_GLIB
  #include <glib.h>
--#define NPW_GLIB_MALLOC_MAGIC 0x476c6962 /* 'Glib' */
--
--typedef struct _NPW_Glib_MemBlock NPW_Glib_MemBlock;
--struct _NPW_Glib_MemBlock
--{
--  uint32_t magic;
--  uint32_t real_size;
--  char     data[];
--};
--
  static void *
  NPW_Glib_MemAlloc (uint32_t size)
+ {
--  uint32_t real_size;
--  NPW_Glib_MemBlock *mem;
--
--  real_size = sizeof (*mem) + size;
--  if ((mem = g_slice_alloc (real_size)) == NULL)
--    return NULL;
--  mem->magic     = NPW_GLIB_MALLOC_MAGIC;
--  mem->real_size = real_size;
--  return &mem->data[0];
++  return g_slice_alloc (size);
+ }
  static void *
  NPW_Glib_MemAlloc0 (uint32_t size)
+ {
--  uint32_t real_size;
--  NPW_Glib_MemBlock *mem;
--
--  real_size = sizeof (*mem) + size;
--  if ((mem = g_slice_alloc0 (real_size)) == NULL)
--    return NULL;
--  mem->magic     = NPW_GLIB_MALLOC_MAGIC;
--  mem->real_size = real_size;
--  return &mem->data[0];
++  return g_slice_alloc0 (size);
+ }
  static void
--NPW_Glib_MemFree (void *ptr)
++NPW_Glib_MemFree (void *ptr, uint32_t size)
+ {
--  if (ptr == NULL)
--    return;
--  NPW_Glib_MemBlock *mem = (NPW_Glib_MemBlock *)((char *)ptr - sizeof (*mem));
--  if (mem->magic == NPW_GLIB_MALLOC_MAGIC)
--    g_slice_free1 (mem->real_size, mem);
--  else
--    {
--      D(bug("WARNING: block %p was not allocated with NPN_MemAlloc(), reverting to libc free()\n", ptr));
--      free (ptr);
--    }
++  g_slice_free1 (size, ptr);
+ }
  static const NPW_MallocHooks g_glib_hooks = {
@@ -190,26 +171,200 @@
  void *
  NPW_MemAlloc (uint32_t size)
+ {
--  return get_malloc_hooks ()->memalloc (size);
++  return npw_mem_alloc (size, NULL, 0);
+ }
  void *
  NPW_MemAlloc0 (uint32_t size)
+ {
--  return get_malloc_hooks ()->memalloc0 (size);
--}
--
--void *
--NPW_MemAllocCopy (uint32_t size, const void *src)
--{
--  void *ptr = NPW_MemAlloc (size);
++  return npw_mem_alloc0 (size, NULL, 0);
++}
++
++void *
++NPW_MemAllocCopy (uint32_t size, const void *ptr)
++{
++  return npw_mem_alloc_copy (size, ptr, NULL, 0);
++}
++
++void
++NPW_MemFree (void *ptr)
++{
++  npw_mem_free (ptr, NULL, 0);
++}
++
++void *
++NPW_Debug_MemAlloc (uint32_t size, const char *file, int lineno)
++{
++  return npw_mem_alloc (size, file, lineno);
++}
++
++void *
++NPW_Debug_MemAlloc0 (uint32_t size, const char *file, int lineno)
++{
++  return npw_mem_alloc0 (size, file, lineno);
++}
++
++void *
++NPW_Debug_MemAllocCopy (uint32_t size, const void *ptr, const char *file, int lineno)
++{
++  return npw_mem_alloc_copy (size, ptr, file, lineno);
++}
++
++void
++NPW_Debug_MemFree (void *ptr, const char *file, int lineno)
++{
++  npw_mem_free (ptr, file, lineno);
++}
++
++/* ====================================================================== */
++/* === Implementation allowing basic underflow/overflow checks        === */
++/* ====================================================================== */
++
++#ifdef ENABLE_MALLOC_CHECK
++static bool
++is_malloc_check_enabled_1 (void)
++{
++  const char *malloc_check_str;
++  if ((malloc_check_str =  getenv ("NPW_MALLOC_CHECK")) != NULL)
++    return ((strcmp (malloc_check_str, "yes") == 0) ||
++	    (strcmp (malloc_check_str, "1") == 0));
++
++  /* enable malloc-checks by default for all builds from snapshots */
++  return NPW_SNAPSHOT > 0;
++}
++#endif
++
++#define MALLOC_CHECK_GUARD_MARK 'E'
++#define MALLOC_CHECK_GUARD_SIZE malloc_check_guards_size ()
++
++static inline bool
++is_malloc_check_enabled (void)
++{
++#ifdef ENABLE_MALLOC_CHECK
++  static int malloc_check = -1;
++  if (malloc_check < 0)
++    malloc_check = is_malloc_check_enabled_1 ();
++  return malloc_check;
++#else
++  return false;
++#endif
++}
++
++static inline uint32_t
++malloc_check_guards_size (void)
++{
++  return is_malloc_check_enabled () ? 16 : 0;
++}
++
++static void
++malloc_check_guards_init (uint8_t *ptr, uint32_t size)
++{
++  if (!is_malloc_check_enabled ())
++    return;
++
++  memset (ptr - MALLOC_CHECK_GUARD_SIZE,
++	  MALLOC_CHECK_GUARD_MARK,
++	  MALLOC_CHECK_GUARD_SIZE);
++  memset (ptr + size,
++	  MALLOC_CHECK_GUARD_MARK,
++	  MALLOC_CHECK_GUARD_SIZE);
++}
++
++static bool
++malloc_check_guards_ok (uint8_t *ptr, uint32_t size, int *punderflow, int *poverflow)
++{
++  if (!is_malloc_check_enabled ())
++    return true;
++
++  int i, underflow = 0, overflow = 0;
++  for (i = 0; i < MALLOC_CHECK_GUARD_SIZE; i++)
++    {
++      if (ptr[-(1 + i)] != MALLOC_CHECK_GUARD_MARK)
++	++underflow;
++      if (ptr[size + i] != MALLOC_CHECK_GUARD_MARK)
++	++overflow;
++    }
++  if (punderflow)
++    *punderflow = underflow;
++  if (poverflow)
++    *poverflow = overflow;
++  return !underflow && !overflow;
++}
++
++static inline void *
++npw_do_mem_alloc (NPW_MemAllocProcPtr mem_alloc_func, uint32_t size, const char *file, int lineno)
++{
++  uint32_t      real_size;
++  NPW_MemBlock *mem;
++
++  real_size = sizeof (*mem) + size + 2 * MALLOC_CHECK_GUARD_SIZE;
++  if ((mem = mem_alloc_func (real_size)) == NULL)
++    return NULL;
++
++  mem->magic        = NPW_MALLOC_MAGIC;
++  mem->real_size    = real_size;
++  mem->alloc_size   = size;
++  mem->alloc_file   = file;
++  mem->alloc_lineno = lineno;
++
++  uint8_t *ptr = (uint8_t *)mem + sizeof (*mem) + MALLOC_CHECK_GUARD_SIZE;
++  malloc_check_guards_init (ptr, size);
++  return ptr;
++}
++
++static void *
++npw_mem_alloc (uint32_t size, const char *file, int lineno)
++{
++  return npw_do_mem_alloc (get_malloc_hooks ()->memalloc, size, file, lineno);
++}
++
++static void *
++npw_mem_alloc0 (uint32_t size, const char *file, int lineno)
++{
++  return npw_do_mem_alloc (get_malloc_hooks ()->memalloc0, size, file, lineno);
++}
++
++static void *
++npw_mem_alloc_copy (uint32_t size, const void *src, const char *file, int lineno)
++{
++  void *ptr = npw_mem_alloc (size, file, lineno);
    if (ptr)
      memcpy (ptr, src, size);
    return ptr;
+ }
--void
--NPW_MemFree (void *ptr)
++static void
++npw_mem_free (void *ptr, const char *file, int lineno)
+ {
--  get_malloc_hooks ()->memfree (ptr);
++  if (ptr == NULL)
++    return;
++
++  NPW_MemBlock *mem = (NPW_MemBlock *)((char *)ptr - (sizeof (*mem) + MALLOC_CHECK_GUARD_SIZE));
++  if (mem->magic == NPW_MALLOC_MAGIC)
++    {
++      int underflow, overflow;
++      if (!malloc_check_guards_ok (ptr, mem->alloc_size, &underflow, &overflow))
++	{
++	  if (underflow)
++	    npw_printf ("ERROR: detected underflow of %d bytes\n"
++			"  for block allocated at %s:%d\n"
++			"  and released at %s:%d\n",
++			underflow,
++			mem->alloc_file, mem->alloc_lineno,
++			file, lineno);
++	  if (overflow)
++	    npw_printf ("ERROR: detected overflow of %d bytes\n"
++			"  for block allocated at %s:%d\n"
++			"  and released at %s:%d\n",
++			overflow,
++			mem->alloc_file, mem->alloc_lineno,
++			file, lineno);
++	}
++      get_malloc_hooks ()->memfree (mem, mem->real_size);
++    }
++  else
++    {
++      npw_printf("ERROR: block %p was not allocated with NPW_MemAlloc(), reverting to libc free()\n", ptr);
++      free (ptr);
++    }
+ }
 === modified file 'src/npw-malloc.h'
 --- src/npw-malloc.h	2009-01-02 10:07:27 +0000
 +++ src/npw-malloc.h	2009-08-11 00:38:42 +0000
@@ -33,6 +33,18 @@
  void
  NPW_MemFree (void *ptr);
++void *
++NPW_Debug_MemAlloc (uint32_t size, const char *file, int lineno);
++
++void *
++NPW_Debug_MemAlloc0 (uint32_t size, const char *file, int lineno);
++
++void *
++NPW_Debug_MemAllocCopy (uint32_t size, const void *ptr, const char *file, int lineno);
++
++void
++NPW_Debug_MemFree (void *ptr, const char *file, int lineno);
++
  #define NPW_MemNew(type, n) \
    ((type *) NPW_MemAlloc ((n) * sizeof (type)))
@@ -42,4 +54,11 @@
  #define NPW_MemClone(type, ptr) \
    ((type *) NPW_MemAllocCopy (sizeof (type), ptr))
++#ifdef ENABLE_MALLOC_CHECK
++# define NPW_MemAlloc(SIZE)		NPW_Debug_MemAlloc(SIZE, __FILE__, __LINE__)
++# define NPW_MemAlloc0(SIZE)		NPW_Debug_MemAlloc0(SIZE, __FILE__, __LINE__)
++# define NPW_MemAllocCopy(SIZE, PTR)	NPW_Debug_MemAllocCopy(SIZE, PTR, __FILE__, __LINE__)
++# define NPW_MemFree(PTR)		NPW_Debug_MemFree(PTR, __FILE__, __LINE__)
++#endif
++
  #endif /* NPW_MALLOC_H */
 === modified file 'src/npw-viewer.c'
 --- src/npw-viewer.c	2009-01-02 10:07:27 +0000
 +++ src/npw-viewer.c	2009-08-11 00:38:42 +0000
@@ -28,6 +28,8 @@
  #include <dlfcn.h>
  #include <unistd.h>
  #include <errno.h>
++#include <pthread.h>
++#include <fcntl.h>
  #include <X11/X.h>
  #include <X11/Xlib.h>
@@ -58,11 +60,15 @@
  // Define to allow windowless plugins
  #define ALLOW_WINDOWLESS_PLUGINS 1
++// Define to use NPIdentifier cache
++#define USE_NPIDENTIFIER_CACHE 1
++#define NPIDENTIFIER_CACHE_SIZE 256
++
  // RPC global connections
  rpc_connection_t *g_rpc_connection attribute_hidden = NULL;
--// Viewer orignal pid - check against incorrect plugins
--static pid_t g_viewer_pid = 0;
++// Viewer main thread - make sure we call into the browser from the main thread
++static pthread_t g_main_thread = 0;
  // Instance state information about the plugin
  typedef struct _PluginInstance {
@@ -101,6 +107,8 @@
  // Prototypes
  static void destroy_window(PluginInstance *plugin);
++static int xt_source_create(void);
++static void xt_source_destroy(void);
  /* ====================================================================== */
@@ -162,16 +170,38 @@
+   }
+ }
--// Pid support routines
--static void pid_init(void)
--{
--  g_viewer_pid = getpid();
--}
--
--bool pid_check(void)
--{
--#if USE_PID_CHECK
--  return (g_viewer_pid == getpid());
++// Thread support routines
++static void thread_check_init(void)
++{
++  g_main_thread = pthread_self();
++}
++
++#ifdef ENABLE_THREAD_CHECK
++static bool is_thread_check_enabled_1(void)
++{
++  const char *thread_check_str;
++  if ((thread_check_str =  getenv("NPW_THREAD_CHECK")) != NULL)
++    return ((strcmp(thread_check_str, "yes") == 0) ||
++			(strcmp(thread_check_str, "1") == 0));
++
++  /* enable main-thread checks by default for all builds from snapshots */
++  return NPW_SNAPSHOT > 0;
++}
++
++static inline bool is_thread_check_enabled(void)
++{
++  static int thread_check = -1;
++  if (thread_check < 0)
++    thread_check = is_thread_check_enabled_1();
++  return thread_check;
++}
++#endif
++
++bool thread_check(void)
++{
++#ifdef ENABLE_THREAD_CHECK
++  if (is_thread_check_enabled())
++	return (g_main_thread == pthread_self());
  #endif
    return true;
+ }
@@ -180,8 +210,7 @@
  // XXX: use a pipe, this should be faster (avoids GSource creation and
  // explicit memory allocation)
  enum {
--  RPC_DELAYED_NPN_RELEASE_OBJECT = 1,
--  RPC_DELAYED_NPN_INVALIDATE_RECT,
++  RPC_DELAYED_NPN_RELEASE_OBJECT = 1
  };
  typedef struct _DelayedCall {
@@ -251,6 +280,200 @@
    return delayed_calls_process(NULL, FALSE);
+ }
++// NPIdentifier cache
++static inline bool use_npidentifier_cache(void)
++{
++  return USE_NPIDENTIFIER_CACHE && npruntime_use_cache();
++}
++
++#if USE_NPIDENTIFIER_CACHE
++/* XXX: NPIdentifierInfo could become the NPIdentifier, thus avoiding
++   the global hash table, if there is a garbage collector. Otherwise,
++   we will be leaking memory since there is no function that kills an
++   NPIdentifier. */
++typedef struct _NPIdentifierInfo {
++  guint string_len; /* >0 implies 1+strlen(string), =0 implies an integer */
++  union {
++	gchar *string;
++	int32_t value;
++  } u;
++} NPIdentifierInfo;
++
++static GHashTable *g_npidentifier_cache = NULL;
++
++
++static inline NPIdentifierInfo *npidentifier_info_new(void)
++{
++  return NPW_MemNew(NPIdentifierInfo, 1);
++}
++
++static inline void npidentifier_info_destroy(NPIdentifierInfo *npi)
++{
++  if (G_UNLIKELY(npi == NULL))
++	return;
++  if (npi->string_len > 0) {
++	NPW_MemFree(npi->u.string);
++	npi->u.string = NULL;
++  }
++  NPW_MemFree(npi);
++}
++
++static inline void npidentifier_cache_create(void)
++{
++  g_npidentifier_cache =
++	g_hash_table_new_full(NULL, NULL, NULL,
++						  (GDestroyNotify)npidentifier_info_destroy);
++}
++
++static inline void npidentifier_cache_destroy(void)
++{
++  if (g_npidentifier_cache) {
++	g_hash_table_destroy(g_npidentifier_cache);
++	g_npidentifier_cache = NULL;
++  }
++}
++
++static void npidentifier_cache_invalidate(void)
++{
++#if defined(HAVE_G_HASH_TABLE_REMOVE_ALL) && !defined(BUILD_GENERIC)
++  if (g_npidentifier_cache)
++	g_hash_table_remove_all(g_npidentifier_cache);
++#else
++  npidentifier_cache_destroy();
++  npidentifier_cache_create();
++#endif
++}
++
++static void npidentifier_cache_reserve(int n_entries)
++{
++  if (G_UNLIKELY(g_npidentifier_cache == NULL))
++	npidentifier_cache_create();
++  if (g_hash_table_size(g_npidentifier_cache) + n_entries > NPIDENTIFIER_CACHE_SIZE)
++	npidentifier_cache_invalidate();
++}
++
++static inline NPIdentifierInfo *npidentifier_cache_lookup(NPIdentifier ident)
++{
++  if (G_UNLIKELY(g_npidentifier_cache == NULL))
++	return NULL;
++  return g_hash_table_lookup(g_npidentifier_cache, ident);
++}
++
++static void npidentifier_cache_add_int(NPIdentifier ident, int32_t value)
++{
++  if (G_UNLIKELY(g_npidentifier_cache == NULL))
++	return;
++  NPIdentifierInfo *npi = npidentifier_info_new();
++  if (G_UNLIKELY(npi == NULL))
++	return;
++  npi->string_len = 0;
++  npi->u.value = value;
++  g_hash_table_insert(g_npidentifier_cache, ident, npi);
++}
++
++typedef struct _NPIdentifierFindArgs {
++  NPIdentifierInfo info; /* in */
++  NPIdentifier ident;    /* out */
++} NPIdentifierFindArgs;
++
++static gboolean npidentifier_cache_find_info(gpointer key, gpointer value, gpointer user_data)
++{
++  NPIdentifier *ident = (NPIdentifier)key;
++  NPIdentifierInfo *npi = (NPIdentifierInfo *)value;
++  NPIdentifierFindArgs *args = (NPIdentifierFindArgs *)user_data;
++#if !defined(HAVE_G_HASH_TABLE_FIND) || defined(BUILD_GENERIC)
++  if (args->ident)
++	return FALSE;
++#endif
++  if (npi->string_len != args->info.string_len)
++	return FALSE;
++  if (args->info.string_len > 0) {		/* a string */
++	if (memcmp(args->info.u.string, npi->u.string, args->info.string_len) == 0) {
++	  args->ident = ident;
++	  return TRUE;
++	}
++  }
++  else {								/* an integer */
++	if (args->info.u.value == npi->u.value) {
++	  args->ident = ident;
++	  return TRUE;
++	}
++  }
++  return FALSE;
++}
++
++static inline bool npidentifier_cache_find(NPIdentifierFindArgs *args, NPIdentifier *pident)
++{
++  args->ident = NULL;
++#if defined(HAVE_G_HASH_TABLE_FIND) && !defined(BUILD_GENERIC)
++  if (!g_hash_table_find(g_npidentifier_cache, npidentifier_cache_find_info, args))
++	return false;
++#else
++  g_hash_table_foreach(g_npidentifier_cache, (GHFunc)npidentifier_cache_find_info, args);
++  if (args->ident == NULL)
++	return false;
++#endif
++
++  if (pident)
++	*pident = args->ident;
++  return true;
++}
++
++static inline bool npidentifier_cache_has_int(int32_t value, NPIdentifier *pident)
++{
++  if (G_UNLIKELY(g_npidentifier_cache == NULL))
++	return false;
++
++  NPIdentifierFindArgs args;
++  args.info.string_len = 0;
++  args.info.u.value = value;
++  return npidentifier_cache_find(&args, pident);
++}
++
++static inline int32_t npidentifier_cache_get_int(NPIdentifier ident)
++{
++  NPIdentifierInfo *npi = npidentifier_cache_lookup(ident);
++  if (G_UNLIKELY(npi == NULL || npi->string_len > 0))
++	return 0;
++  return npi->u.value;
++}
++
++static void npidentifier_cache_add_string(NPIdentifier ident, const gchar *str)
++{
++  if (G_UNLIKELY(g_npidentifier_cache == NULL))
++	return;
++  NPIdentifierInfo *npi = npidentifier_info_new();
++  if (G_UNLIKELY(npi == NULL))
++	return;
++  npi->string_len = strlen(str) + 1;
++  if ((npi->u.string = NPW_MemAlloc(npi->string_len)) == NULL) {
++	npidentifier_info_destroy(npi);
++	return;
++  }
++  memcpy(npi->u.string, str, npi->string_len);
++  g_hash_table_insert(g_npidentifier_cache, ident, npi);
++}
++
++static inline bool npidentifier_cache_has_string(const gchar *str, NPIdentifier *pident)
++{
++  if (G_UNLIKELY(g_npidentifier_cache == NULL))
++	return false;
++
++  NPIdentifierFindArgs args;
++  args.info.string_len = strlen(str) + 1;
++  args.info.u.string = (gchar *)str;
++  return npidentifier_cache_find(&args, pident);
++}
++
++static inline NPUTF8 *npidentifier_cache_get_string_copy(NPIdentifier ident)
++{
++  NPIdentifierInfo *npi = npidentifier_cache_lookup(ident);
++  if (G_UNLIKELY(npi == NULL || npi->string_len == 0))
++	return NULL;
++  return NPW_MemAllocCopy(npi->string_len, npi->u.string);
++}
++#endif
++
  /* ====================================================================== */
  /* === X Toolkit glue                                                 === */
@@ -302,6 +525,57 @@
      CorePart    core;
  } WidgetRec, CoreRec;
++typedef struct _TimerEventRec {
++    struct timeval        te_timer_value;
++    struct _TimerEventRec *te_next;
++    XtTimerCallbackProc   te_proc;
++    XtAppContext          app;
++    XtPointer             te_closure;
++} TimerEventRec;
++
++typedef struct _InputEvent {
++    XtInputCallbackProc   ie_proc;
++    XtPointer             ie_closure;
++    struct _InputEvent    *ie_next;
++    struct _InputEvent    *ie_oq;
++    XtAppContext          app;
++    int                   ie_source;
++    XtInputMask           ie_condition;
++} InputEvent;
++
++typedef struct _SignalEventRec {
++    XtSignalCallbackProc  se_proc;
++    XtPointer             se_closure;
++    struct _SignalEventRec *se_next;
++    XtAppContext          app;
++    Boolean               se_notice;
++} SignalEventRec;
++
++struct _XtAppStruct {
++    XtAppContext next;          /* link to next app in process context */
++    void *process;              /* back pointer to our process context */
++    void *destroy_callbacks;
++    Display **list;
++    TimerEventRec *timerQueue;
++    void *workQueue;
++    InputEvent **input_list;
++    InputEvent *outstandingQueue;
++    SignalEventRec *signalQueue;
++    XrmDatabase errorDB;
++    XtErrorMsgHandler errorMsgHandler, warningMsgHandler;
++    XtErrorHandler errorHandler, warningHandler;
++    struct _ActionListRec *action_table;
++    void *converterTable;
++    unsigned long selectionTimeout;
++    char  __maxed__nfds[3*sizeof(fd_set)+4];
++    short __maybe__count;       /* num of assigned entries in list */
++    short __maybe__max;         /* allocate size of list */
++    short __maybe__last;
++    short __maybe__input_count;
++    short __maybe__input_max;   /* elts input_list init'd with */
++    /* ... don't care about other members */
++};
++
  extern void XtResizeWidget(
      Widget              /* widget */,
      _XtDimension        /* width */,
@@ -780,8 +1054,8 @@
  static NPError
  g_NPN_GetURL(NPP instance, const char *url, const char *target)
+ {
--  if (!pid_check()) {
--	npw_printf("WARNING: NPN_GetURL called from the wrong process\n");
++  if (!thread_check()) {
++	npw_printf("WARNING: NPN_GetURL not called from the main thread\n");
  	return NPERR_INVALID_INSTANCE_ERROR;
+   }
@@ -834,8 +1108,8 @@
  static NPError
  g_NPN_GetURLNotify(NPP instance, const char *url, const char *target, void *notifyData)
+ {
--  if (!pid_check()) {
--	npw_printf("WARNING: NPN_GetURLNotify called from the wrong process\n");
++  if (!thread_check()) {
++	npw_printf("WARNING: NPN_GetURLNotify not called from the main thread\n");
  	return NPERR_INVALID_INSTANCE_ERROR;
+   }
@@ -933,8 +1207,8 @@
+ {
    D(bug("NPN_GetValue instance=%p, variable=%d [%s]\n", instance, variable, string_of_NPNVariable(variable)));
--  if (!pid_check()) {
--	npw_printf("WARNING: NPN_GetValue called from the wrong process\n");
++  if (!thread_check()) {
++	npw_printf("WARNING: NPN_GetValue not called from the main thread\n");
  	return NPERR_INVALID_INSTANCE_ERROR;
+   }
@@ -1038,8 +1312,8 @@
  static void
  g_NPN_InvalidateRect(NPP instance, NPRect *invalidRect)
+ {
--  if (!pid_check()) {
--	npw_printf("WARNING: NPN_InvalidateRect called from the wrong process\n");
++  if (!thread_check()) {
++	npw_printf("WARNING: NPN_InvalidateRect not called from the main thread\n");
  	return;
+   }
@@ -1132,8 +1406,8 @@
  static NPError
  g_NPN_PostURL(NPP instance, const char *url, const char *target, uint32 len, const char *buf, NPBool file)
+ {
--  if (!pid_check()) {
--	npw_printf("WARNING: NPN_PostURL called from the wrong process\n");
++  if (!thread_check()) {
++	npw_printf("WARNING: NPN_PostURL not called from the main thread\n");
  	return NPERR_INVALID_INSTANCE_ERROR;
+   }
@@ -1188,8 +1462,8 @@
  static NPError
  g_NPN_PostURLNotify(NPP instance, const char *url, const char *target, uint32 len, const char *buf, NPBool file, void *notifyData)
+ {
--  if (!pid_check()) {
--	npw_printf("WARNING: NPN_PostURLNotify called from the wrong process\n");
++  if (!thread_check()) {
++	npw_printf("WARNING: NPN_PostURLNotify not called from the main thread\n");
  	return NPERR_INVALID_INSTANCE_ERROR;
+   }
@@ -1267,8 +1541,8 @@
  static NPError
  g_NPN_RequestRead(NPStream *stream, NPByteRange *rangeList)
+ {
--  if (!pid_check()) {
--	npw_printf("WARNING: NPN_RequestRead called from the wrong process\n");
++  if (!thread_check()) {
++	npw_printf("WARNING: NPN_RequestRead not called from the main thread\n");
  	return NPERR_INVALID_INSTANCE_ERROR;
+   }
@@ -1320,8 +1594,8 @@
  static NPError
  g_NPN_SetValue(NPP instance, NPPVariable variable, void *value)
+ {
--  if (!pid_check()) {
--	npw_printf("WARNING: NPN_SetValue called from the wrong process\n");
++  if (!thread_check()) {
++	npw_printf("WARNING: NPN_SetValue not called from the main thread\n");
  	return NPERR_INVALID_INSTANCE_ERROR;
+   }
@@ -1368,8 +1642,8 @@
  static void
  g_NPN_Status(NPP instance, const char *message)
+ {
--  if (!pid_check()) {
--	npw_printf("WARNING: NPN_Status called from the wrong process\n");
++  if (!thread_check()) {
++	npw_printf("WARNING: NPN_Status not called from the main thread\n");
  	return;
+   }
@@ -1415,8 +1689,8 @@
  static const char *
  g_NPN_UserAgent(NPP instance)
+ {
--  if (!pid_check()) {
--	npw_printf("WARNING: NPN_UserAgent called from the wrong process\n");
++  if (!thread_check()) {
++	npw_printf("WARNING: NPN_UserAgent not called from the main thread\n");
  	return NULL;
+   }
@@ -1505,8 +1779,8 @@
  static NPError
  g_NPN_NewStream(NPP instance, NPMIMEType type, const char *target, NPStream **stream)
+ {
--  if (!pid_check()) {
--	npw_printf("WARNING: NPN_NewStream called from the wrong process\n");
++  if (!thread_check()) {
++	npw_printf("WARNING: NPN_NewStream not called from the main thread\n");
  	return NPERR_INVALID_INSTANCE_ERROR;
+   }
@@ -1564,8 +1838,8 @@
  static NPError
  g_NPN_DestroyStream(NPP instance, NPStream *stream, NPError reason)
+ {
--  if (!pid_check()) {
--	npw_printf("WARNING: NPN_DestroyStream called from the wrong process\n");
++  if (!thread_check()) {
++	npw_printf("WARNING: NPN_DestroyStream not called from the main thread\n");
  	return NPERR_INVALID_INSTANCE_ERROR;
+   }
@@ -1634,8 +1908,8 @@
  static int32
  g_NPN_Write(NPP instance, NPStream *stream, int32 len, void *buf)
+ {
--  if (!pid_check()) {
--	npw_printf("WARNING: NPN_Write called from the wrong process\n");
++  if (!thread_check()) {
++	npw_printf("WARNING: NPN_Write not called from the main thread\n");
  	return -1;
+   }
@@ -1683,8 +1957,8 @@
  static void
  g_NPN_PushPopupsEnabledState(NPP instance, NPBool enabled)
+ {
--  if (!pid_check()) {
--	npw_printf("WARNING: NPN_PushPopupsEnabledState called from the wrong process\n");
++  if (!thread_check()) {
++	npw_printf("WARNING: NPN_PushPopupsEnabledState not called from the main thread\n");
  	return;
+   }
@@ -1727,8 +2001,8 @@
  static void
  g_NPN_PopPopupsEnabledState(NPP instance)
+ {
--  if (!pid_check()) {
--	npw_printf("WARNING: NPN_PophPopupsEnabledState called from the wrong process\n");
++  if (!thread_check()) {
++	npw_printf("WARNING: NPN_PophPopupsEnabledState not called from the main thread\n");
  	return;
+   }
@@ -1783,8 +2057,8 @@
  static NPObject *
  g_NPN_CreateObject(NPP instance, NPClass *class)
+ {
--  if (!pid_check()) {
--	npw_printf("WARNING: NPN_CreateObject called from the wrong process\n");
++  if (!thread_check()) {
++	npw_printf("WARNING: NPN_CreateObject not called from the main thread\n");
  	return NULL;
+   }
@@ -1839,8 +2113,8 @@
  static NPObject *
  g_NPN_RetainObject(NPObject *npobj)
+ {
--  if (!pid_check()) {
--	npw_printf("WARNING: NPN_RetainObject called from the wrong process\n");
++  if (!thread_check()) {
++	npw_printf("WARNING: NPN_RetainObject not called from the main thread\n");
  	return NULL;
+   }
@@ -1902,8 +2176,8 @@
  static void
  g_NPN_ReleaseObject(NPObject *npobj)
+ {
--  if (!pid_check()) {
--	npw_printf("WARNING: NPN_ReleaseObject called from the wrong process\n");
++  if (!thread_check()) {
++	npw_printf("WARNING: NPN_ReleaseObject not called from the main thread\n");
  	return;
+   }
@@ -1958,8 +2232,8 @@
  g_NPN_Invoke(NPP instance, NPObject *npobj, NPIdentifier methodName,
  			 const NPVariant *args, uint32_t argCount, NPVariant *result)
+ {
--  if (!pid_check()) {
--	npw_printf("WARNING: NPN_Invoke called from the wrong process\n");
++  if (!thread_check()) {
++	npw_printf("WARNING: NPN_Invoke not called from the main thread\n");
  	return false;
+   }
@@ -2021,8 +2295,8 @@
  g_NPN_InvokeDefault(NPP instance, NPObject *npobj,
  					const NPVariant *args, uint32_t argCount, NPVariant *result)
+ {
--  if (!pid_check()) {
--	npw_printf("WARNING: NPN_InvokeDefault called from the wrong process\n");
++  if (!thread_check()) {
++	npw_printf("WARNING: NPN_InvokeDefault not called from the main thread\n");
  	return false;
+   }
@@ -2082,8 +2356,8 @@
  static bool
  g_NPN_Evaluate(NPP instance, NPObject *npobj, NPString *script, NPVariant *result)
+ {
--  if (!pid_check()) {
--	npw_printf("WARNING: NPN_Evaluate called from the wrong process\n");
++  if (!thread_check()) {
++	npw_printf("WARNING: NPN_Evaluate not called from the main thread\n");
  	return false;
+   }
@@ -2147,8 +2421,8 @@
  g_NPN_GetProperty(NPP instance, NPObject *npobj, NPIdentifier propertyName,
  				  NPVariant *result)
+ {
--  if (!pid_check()) {
--	npw_printf("WARNING: NPN_GetProperty called from the wrong process\n");
++  if (!thread_check()) {
++	npw_printf("WARNING: NPN_GetProperty not called from the main thread\n");
  	return false;
+   }
@@ -2209,8 +2483,8 @@
  g_NPN_SetProperty(NPP instance, NPObject *npobj, NPIdentifier propertyName,
  				  const NPVariant *value)
+ {
--  if (!pid_check()) {
--	npw_printf("WARNING: NPN_SetProperty called from the wrong process\n");
++  if (!thread_check()) {
++	npw_printf("WARNING: NPN_SetProperty not called from the main thread\n");
  	return false;
+   }
@@ -2266,8 +2540,8 @@
  static bool
  g_NPN_RemoveProperty(NPP instance, NPObject *npobj, NPIdentifier propertyName)
+ {
--  if (!pid_check()) {
--	npw_printf("WARNING: NPN_RemoveProperty called from the wrong process\n");
++  if (!thread_check()) {
++	npw_printf("WARNING: NPN_RemoveProperty not called from the main thread\n");
  	return false;
+   }
@@ -2323,8 +2597,8 @@
  static bool
  g_NPN_HasProperty(NPP instance, NPObject *npobj, NPIdentifier propertyName)
+ {
--  if (!pid_check()) {
--	npw_printf("WARNING: NPN_HasProperty called from the wrong process\n");
++  if (!thread_check()) {
++	npw_printf("WARNING: NPN_HasProperty not called from the main thread\n");
  	return false;
+   }
@@ -2380,8 +2654,8 @@
  static bool
  g_NPN_HasMethod(NPP instance, NPObject *npobj, NPIdentifier methodName)
+ {
--  if (!pid_check()) {
--	npw_printf("WARNING: NPN_HasMethod called from the wrong process\n");
++  if (!thread_check()) {
++	npw_printf("WARNING: NPN_HasMethod not called from the main thread\n");
  	return false;
+   }
@@ -2431,8 +2705,8 @@
  static void
  g_NPN_SetException(NPObject *npobj, const NPUTF8 *message)
+ {
--  if (!pid_check()) {
--	npw_printf("WARNING: NPN_SetException called from the wrong process\n");
++  if (!thread_check()) {
++	npw_printf("WARNING: NPN_SetException not called from the main thread\n");
  	return;
+   }
@@ -2480,10 +2754,26 @@
+ }
  static NPIdentifier
++cached_NPN_GetStringIdentifier(const NPUTF8 *name)
++{
++  NPIdentifier ident;
++  if (!use_npidentifier_cache())
++	ident = invoke_NPN_GetStringIdentifier(name);
++#if USE_NPIDENTIFIER_CACHE
++  else if (!npidentifier_cache_has_string(name, &ident)) {
++	ident = invoke_NPN_GetStringIdentifier(name);
++	npidentifier_cache_reserve(1);
++	npidentifier_cache_add_string(ident, name);
++  }
++#endif
++  return ident;
++}
++
++static NPIdentifier
  g_NPN_GetStringIdentifier(const NPUTF8 *name)
+ {
--  if (!pid_check()) {
--	npw_printf("WARNING: NPN_GetStringIdentifier called from the wrong process\n");
++  if (!thread_check()) {
++	npw_printf("WARNING: NPN_GetStringIdentifier not called from the main thread\n");
  	return NULL;
+   }
@@ -2491,7 +2781,7 @@
  	return NULL;
    D(bugiI("NPN_GetStringIdentifier name='%s'\n", name));
--  NPIdentifier ret = invoke_NPN_GetStringIdentifier(name);
++  NPIdentifier ret = cached_NPN_GetStringIdentifier(name);
    D(bugiD("NPN_GetStringIdentifier return: %p\n", ret));
    return ret;
+ }
@@ -2536,10 +2826,29 @@
+ }
  static void
++cached_NPN_GetStringIdentifiers(const NPUTF8 **names, uint32_t nameCount, NPIdentifier *identifiers)
++{
++  /* XXX: could be optimized further */
++  invoke_NPN_GetStringIdentifiers(names, nameCount, identifiers);
++
++#if USE_NPIDENTIFIER_CACHE
++  if (use_npidentifier_cache()) {
++	for (int i = 0; i < nameCount; i++) {
++	  NPIdentifier ident = identifiers[i];
++	  if (npidentifier_cache_lookup(ident) == NULL) {
++		npidentifier_cache_reserve(1);
++		npidentifier_cache_add_string(ident, names[i]);
++	  }
++	}
++  }
++#endif
++}
++
++static void
  g_NPN_GetStringIdentifiers(const NPUTF8 **names, uint32_t nameCount, NPIdentifier *identifiers)
+ {
--  if (!pid_check()) {
--	npw_printf("WARNING: NPN_GetStringIdentifiers called from the wrong process\n");
++  if (!thread_check()) {
++	npw_printf("WARNING: NPN_GetStringIdentifiers not called from the main thread\n");
  	return;
+   }
@@ -2550,7 +2859,7 @@
  	return;
    D(bugiI("NPN_GetStringIdentifiers names=%p\n", names));
--  invoke_NPN_GetStringIdentifiers(names, nameCount, identifiers);
++  cached_NPN_GetStringIdentifiers(names, nameCount, identifiers);
    D(bugiD("NPN_GetStringIdentifiers done\n"));
+ }
@@ -2584,15 +2893,31 @@
+ }
  static NPIdentifier
++cached_NPN_GetIntIdentifier(int32_t intid)
++{
++  NPIdentifier ident;
++  if (!use_npidentifier_cache())
++	ident = invoke_NPN_GetIntIdentifier(intid);
++#if USE_NPIDENTIFIER_CACHE
++  else if (!npidentifier_cache_has_int(intid, &ident)) {
++	ident = invoke_NPN_GetIntIdentifier(intid);
++	npidentifier_cache_reserve(1);
++	npidentifier_cache_add_int(ident, intid);
++  }
++#endif
++  return ident;
++}
++
++static NPIdentifier
  g_NPN_GetIntIdentifier(int32_t intid)
+ {
--  if (!pid_check()) {
--	npw_printf("WARNING: NPN_GetIntIdentifier called from the wrong process\n");
++  if (!thread_check()) {
++	npw_printf("WARNING: NPN_GetIntIdentifier not called from the main thread\n");
  	return NULL;
+   }
    D(bugiI("NPN_GetIntIdentifier intid=%d\n", intid));
--  NPIdentifier ret = invoke_NPN_GetIntIdentifier(intid);
++  NPIdentifier ret = cached_NPN_GetIntIdentifier(intid);
    D(bugiD("NPN_GetIntIdentifier return: %p\n", ret));
    return ret;
+ }
@@ -2627,10 +2952,25 @@
+ }
  static bool
++cached_NPN_IdentifierIsString(NPIdentifier ident)
++{
++#if USE_NPIDENTIFIER_CACHE
++  if (use_npidentifier_cache()) {
++	NPIdentifierInfo *npi = npidentifier_cache_lookup(ident);
++	if (npi)
++	  return npi->string_len > 0;
++  }
++#endif
++  /* cache update is postponed to actual NPN_UTF8FromIdentifier() or
++	 NPN_IntFromIdentifier() */
++  return invoke_NPN_IdentifierIsString(ident);
++}
++
++static bool
  g_NPN_IdentifierIsString(NPIdentifier identifier)
+ {
--  if (!pid_check()) {
--	npw_printf("WARNING: NPN_IdentifierIsString called from the wrong process\n");
++  if (!thread_check()) {
++	npw_printf("WARNING: NPN_IdentifierIsString not called from the main thread\n");
  	return false;
+   }
@@ -2670,15 +3010,34 @@
+ }
  static NPUTF8 *
++cached_NPN_UTF8FromIdentifier(NPIdentifier identifier)
++{
++  NPUTF8 *str;
++  if (!use_npidentifier_cache())
++	str = invoke_NPN_UTF8FromIdentifier(identifier);
++  else {
++#if USE_NPIDENTIFIER_CACHE
++	str = npidentifier_cache_get_string_copy(identifier);
++	if (str == NULL) {
++	  str = invoke_NPN_UTF8FromIdentifier(identifier);
++	  npidentifier_cache_reserve(1);
++	  npidentifier_cache_add_string(identifier, str);
++	}
++#endif
++  }
++  return str;
++}
++
++static NPUTF8 *
  g_NPN_UTF8FromIdentifier(NPIdentifier identifier)
+ {
--  if (!pid_check()) {
--	npw_printf("WARNING: NPN_UTF8FromIdentifier called from the wrong process\n");
++  if (!thread_check()) {
++	npw_printf("WARNING: NPN_UTF8FromIdentifier not called from the main thread\n");
  	return NULL;
+   }
    D(bugiI("NPN_UTF8FromIdentifier identifier=%p\n", identifier));
--  NPUTF8 *ret = invoke_NPN_UTF8FromIdentifier(identifier);
++  NPUTF8 *ret = cached_NPN_UTF8FromIdentifier(identifier);
    D(bugiD("NPN_UTF8FromIdentifier return: '%s'\n", ret));
    return ret;
+ }
@@ -2714,15 +3073,38 @@
+ }
  static int32_t
++cached_NPN_IntFromIdentifier(NPIdentifier identifier)
++{
++  int32_t value;
++  if (!use_npidentifier_cache())
++	value = invoke_NPN_IntFromIdentifier(identifier);
++  else {
++#if USE_NPIDENTIFIER_CACHE
++	NPIdentifierInfo *npi = npidentifier_cache_lookup(identifier);
++	if (npi) {
++	  assert(npi->string_len == 0);
++	  value = npi->u.value;
++	}
++	else {
++	  value = invoke_NPN_IntFromIdentifier(identifier);
++	  npidentifier_cache_reserve(1);
++	  npidentifier_cache_add_int(identifier, value);
++	}
++#endif
++  }
++  return value;
++}
++
++static int32_t
  g_NPN_IntFromIdentifier(NPIdentifier identifier)
+ {
--  if (!pid_check()) {
--	npw_printf("WARNING: NPN_IntFromIdentifier called from the wrong process\n");
++  if (!thread_check()) {
++	npw_printf("WARNING: NPN_IntFromIdentifier not called from the main thread\n");
  	return 0;
+   }
    D(bugiI("NPN_IntFromIdentifier identifier=%p\n", identifier));
--  int32_t ret = invoke_NPN_IntFromIdentifier(identifier);
++  int32_t ret = cached_NPN_IntFromIdentifier(identifier);
    D(bugiD("NPN_IntFromIdentifier return: %d\n", ret));
    return ret;
+ }
@@ -3006,6 +3388,13 @@
  		plugin->use_xembed = supports_XEmbed && needs_XEmbed;
+ 	}
+   }
++
++  // assume Gtk plugin (no Xt event loop) if XEMBED is used
++  if (!plugin->use_xembed) {
++	if (xt_source_create() < 0)
++	  return NPERR_GENERIC_ERROR;
++  }
++
    return ret;
+ }
@@ -3075,6 +3464,9 @@
    NPError ret = plugin_funcs.destroy(instance, sdata);
    D(bugiD("NPP_Destroy return: %d [%s]\n", ret, string_of_NPError(ret)));
++  if (!plugin->use_xembed)
++	xt_source_destroy();
++
    npw_plugin_instance_invalidate(plugin);
    npw_plugin_instance_unref(plugin);
    return ret;
@@ -3723,19 +4115,205 @@
  typedef void (*GSourceFinalizeFunc)(GSource *);
  // Xt events
++static GSource *xt_source = NULL;
++static int xt_source_count = 0;
  static GPollFD xt_event_poll_fd;
++static const int XT_DEFAULT_TIMEOUT = 25;
++static const int XT_MAX_DISPATCH_EVENTS = 10;
++
++static void xt_dummy_timeout_cb(XtPointer closure, XtIntervalId *id)
++{
++  /* dummy function, never called */
++  npw_printf("ERROR: xt_dummy_timeout_cb() should never be called\n");
++}
++
++static int xt_has_compatible_appcontext_timerQueue(void)
++{
++  int is_compatible;
++  XtIntervalId id;
++  TimerEventRec *tq, *tq_probe;
++
++  /* Try to determine where is the pointer to the next allocated
++	 TimerEventRec.
++
++	 Besides, XtAppAddTimeOut() shall not have been called already
++	 because we want to be sure any (libXt internal) "free"
++	 TimerEventRec pointer cache is empty. */
++  tq = XtNew(TimerEventRec);
++  XtFree((char *)tq);
++  tq_probe = XtNew(TimerEventRec);
++  XtFree((char *)tq_probe);
++  if (tq != tq_probe)
++	return 0;
++
++  id = XtAppAddTimeOut(x_app_context, 0,
++					   xt_dummy_timeout_cb,
++					   GUINT_TO_POINTER(0xdeadbeef));
++
++  tq = x_app_context->timerQueue;
++  is_compatible = tq == tq_probe
++	&& tq->app == x_app_context
++	&& tq->te_proc == xt_dummy_timeout_cb
++	&& tq->te_closure == GUINT_TO_POINTER(0xdeadbeef)
++	;
++
++  XtRemoveTimeOut(id);
++  return is_compatible;
++}
++
++static void xt_dummy_input_cb(XtPointer closure, int *source, XtInputId *id)
++{
++  /* dummy function, never called */
++  npw_printf("ERROR: xt_dummy_input_cb() should never be called\n");
++}
++
++static inline int get_appcontext_input_count_at(int offset)
++{
++  return *((short *)((char *)x_app_context + offset));
++}
++
++static inline int add_appcontext_input(int fd, int n)
++{
++  return XtAppAddInput(x_app_context,
++					   fd,
++					   GUINT_TO_POINTER(XtInputWriteMask),
++					   xt_dummy_input_cb,
++					   GUINT_TO_POINTER(0xdead0000));
++}
++
++static int get_appcontext_input_count_offset(void)
++{
++#define low_offset		offsetof(struct _XtAppStruct, __maxed__nfds)
++#define high_offset		offsetof(struct _XtAppStruct, __maybe__input_max)
++#define n_offsets_max	(high_offset - low_offset)/2
++  int i, ofs, n_offsets = 0;
++  int offsets[n_offsets_max] = { 0, };
++
++#define n_inputs_max	4 /* number of refinements/input sources */
++  int fd, id, n_inputs = 0;
++  struct { int fd, id; } inputs[n_inputs_max] = { 0, };
++
++  if ((fd = open("/dev/null", O_WRONLY)) < 0)
++	return 0;
++  if ((id = add_appcontext_input(fd, 0)) < 0) {
++	close(fd);
++	return 0;
++  }
++  inputs[n_inputs].fd = fd;
++  inputs[n_inputs].id = id;
++  n_inputs++;
++
++  for (ofs = low_offset; ofs < high_offset; ofs += 2) {
++	if (get_appcontext_input_count_at(ofs) == 1)
++	  offsets[n_offsets++] = ofs;
++  }
++
++  while (n_inputs < n_inputs_max) {
++	if ((fd = open("/dev/null", O_WRONLY)) < 0)
++	  break;
++	if ((id = add_appcontext_input(fd, n_inputs)) < 0) {
++	  close(fd);
++	  break;
++	}
++	inputs[n_inputs].fd = fd;
++	inputs[n_inputs].id = id;
++	n_inputs++;
++
++	int n = 0;
++	for (i = 0; i < n_offsets; i++) {
++	  if (get_appcontext_input_count_at(offsets[i]) == n_inputs)
++		offsets[n++] = offsets[i];
++	}
++	for (i = n; i < n_offsets; i++)
++	  offsets[i] = 0;
++	n_offsets = n;
++  }
++
++  for (i = 0; i < n_inputs; i++) {
++	XtRemoveInput(inputs[i].id);
++	close(inputs[i].fd);
++  }
++
++  if (n_offsets == 1)
++	return offsets[0];
++
++#undef n_fds_max
++#undef n_offsets_max
++#undef high_offset
++#undef low_offset
++  return 0;
++}
++
++static int get_appcontext_input_count(void)
++{
++  static int input_count_offset = -1;
++  if (input_count_offset < 0)
++	input_count_offset = get_appcontext_input_count_offset();
++  if (input_count_offset == 0)
++	return 1; /* fake we have input to trigger timeout */
++  return get_appcontext_input_count_at(input_count_offset);
++}
++
++static int xt_has_compatible_appcontext(void)
++{
++  return xt_has_compatible_appcontext_timerQueue();
++}
++
++static int xt_get_next_timeout(GSource *source)
++{
++  static int has_compatible_appcontext = -1;
++  if (has_compatible_appcontext < 0) {
++	if ((has_compatible_appcontext = xt_has_compatible_appcontext()) == 0)
++	  npw_printf("WARNING: xt_get_next_timeout() is not optimizable\n");
++  }
++  int timeout = XT_DEFAULT_TIMEOUT;
++  if (has_compatible_appcontext) {
++	int input_timeout, timer_timeout;
++	/* Check there is any input source to process */
++	if (get_appcontext_input_count() > 0)
++	  input_timeout = XT_DEFAULT_TIMEOUT;
++	else
++	  input_timeout = -1;
++	/* Check there is any timer to process */
++	if (x_app_context->timerQueue == NULL)
++	  timer_timeout = -1;
++	else {
++	  /* Determine delay to next timeout. Zero means timeout already expired */
++	  struct timeval *next = &x_app_context->timerQueue->te_timer_value;
++	  GTimeVal now;
++	  int64_t diff;
++	  g_source_get_current_time(source, &now);
++	  if ((diff = (int64_t)next->tv_sec - (int64_t)now.tv_sec) < 0)
++		timer_timeout = 0;
++	  else if ((diff = diff*1000 + ((int64_t)next->tv_usec - (int64_t)now.tv_usec)/1000) <= 0)
++		timer_timeout = 0;
++	  else
++		timer_timeout = diff;
++	}
++	if (input_timeout < 0)
++	  timeout = timer_timeout;
++	else if (timer_timeout < 0)
++	  timeout = input_timeout;
++	else
++	  timeout = MIN(input_timeout, timer_timeout);
++  }
++  return timeout;
++}
  static gboolean xt_event_prepare(GSource *source, gint *timeout)
+ {
    int mask = XtAppPending(x_app_context);
--  return mask & XtIMXEvent;
++  if (mask)
++	return TRUE;
++  /* XXX: create new GPollFD for input sources? */
++  return (*timeout = xt_get_next_timeout(source)) == 0;
+ }
  static gboolean xt_event_check(GSource *source)
+ {
    if (xt_event_poll_fd.revents & G_IO_IN) {
  	int mask = XtAppPending(x_app_context);
--	if (mask & XtIMXEvent)
++	if (mask)
  	  return TRUE;
+   }
    return FALSE;
@@ -3744,11 +4322,11 @@
  static gboolean xt_event_dispatch(GSource *source, GSourceFunc callback, gpointer user_data)
+ {
    int i;
--  for (i = 0; i < 5; i++) {
++  for (i = 0; i < XT_MAX_DISPATCH_EVENTS; i++) {
  	int mask = XtAppPending(x_app_context);
--	if ((mask & XtIMXEvent) == 0)
++	if (mask == 0)
  	  break;
--	XtAppProcessEvent(x_app_context, XtIMXEvent);
++	XtAppProcessEvent(x_app_context, XtIMAll);
+   }
    return TRUE;
+ }
@@ -3762,15 +4340,31 @@
    (GSourceDummyMarshal)NULL
  };
--static gboolean xt_event_polling_timer_callback(gpointer user_data)
--{
--  int i;
--  for (i = 0; i < 5; i++) {
--	if ((XtAppPending(x_app_context) & (XtIMAll & ~XtIMXEvent)) == 0)
--	  break;
--	XtAppProcessEvent(x_app_context, XtIMAll & ~XtIMXEvent);
--  }
--  return TRUE;
++static int xt_source_create(void)
++{
++  if (++xt_source_count > 1 && xt_source != NULL)
++	return 0;
++
++  if ((xt_source = g_source_new(&xt_event_funcs, sizeof(GSource))) == NULL) {
++	npw_printf("ERROR: failed to initialize Xt events listener\n");
++	return -1;
++  }
++  g_source_set_priority(xt_source, GDK_PRIORITY_EVENTS);
++  g_source_set_can_recurse(xt_source, TRUE);
++  g_source_attach(xt_source, NULL);
++  xt_event_poll_fd.fd = ConnectionNumber(x_display);
++  xt_event_poll_fd.events = G_IO_IN;
++  xt_event_poll_fd.revents = 0;
++  g_source_add_poll(xt_source, &xt_event_poll_fd);
++  return 0;
++}
++
++static void xt_source_destroy(void)
++{
++  if (--xt_source_count < 1 && xt_source) {
++	g_source_destroy(xt_source);
++	xt_source = NULL;
++  }
+ }
  // RPC events
@@ -3825,10 +4419,11 @@
  	return 1;
+   }
    D(bug("  Plugin connection: %s\n", connection_path));
--
--  pid_init();
--  D(bug("  Plugin viewer pid: %d\n", g_viewer_pid));
--
++  D(bug("  Plugin viewer pid: %d\n", getpid()));
++
++  thread_check_init();
++  D(bug("  Plugin main thread: %p\n", g_main_thread));
++
    // Cleanup environment, the program may fork/exec a native shell
    // script and having 32-bit libraries in LD_PRELOAD is not right,
    // though not a fatal error
@@ -3886,24 +4481,6 @@
    id_init();
--  // Initialize Xt events listener (integrate X events into GTK events loop)
--  GSource *xt_source = g_source_new(&xt_event_funcs, sizeof(GSource));
--  if (xt_source == NULL) {
--	npw_printf("ERROR: failed to initialize Xt events listener\n");
--	return 1;
--  }
--  g_source_set_priority(xt_source, GDK_PRIORITY_EVENTS);
--  g_source_set_can_recurse(xt_source, TRUE);
--  g_source_attach(xt_source, NULL);
--  xt_event_poll_fd.fd = ConnectionNumber(x_display);
--  xt_event_poll_fd.events = G_IO_IN;
--  xt_event_poll_fd.revents = 0;
--  g_source_add_poll(xt_source, &xt_event_poll_fd);
--
--  gint xt_polling_timer_id = g_timeout_add(25,
--										   xt_event_polling_timer_callback,
--										   NULL);
--
    // Initialize RPC events listener
    GSource *rpc_source = g_source_new(&rpc_event_funcs, sizeof(GSource));
    if (rpc_source == NULL) {
@@ -3924,9 +4501,13 @@
    gtk_main();
    D(bug("--- EXIT ---\n"));
--  g_source_remove(xt_polling_timer_id);
++#if USE_NPIDENTIFIER_CACHE
++  npidentifier_cache_destroy();
++#endif
++
    g_source_destroy(rpc_source);
--  g_source_destroy(xt_source);
++  if (xt_source)
++	g_source_destroy(xt_source);
    if (g_user_agent)
  	free(g_user_agent);
 === modified file 'src/npw-viewer.sh'
 --- src/npw-viewer.sh	2008-12-27 02:10:20 +0000
 +++ src/npw-viewer.sh	2009-08-11 00:38:42 +0000
@@ -2,9 +2,8 @@
+ #
  #  nsplugin viewer wrapper script (C) 2005-2006 Gwenole Beauchesne
+ #
--OS="`uname -s`"
++OS="`uname -s | tr '[A-Z]' '[a-z]'`"
  ARCH="`uname -m`"
--NPW_LIBDIR="%NPW_LIBDIR%"
  if test -z "$TARGET_OS"; then
      echo "*** NSPlugin Viewer *** error, TARGET_OS not initialized"
@@ -16,7 +15,54 @@
      exit 1
  fi
--NPW_VIEWER_DIR=$NPW_LIBDIR/$TARGET_ARCH/$TARGET_OS
++normalize_cpu() {
++local cpu="$1"
++case "$cpu" in
++arm*)
++    cpu="arm"
++    ;;
++i[3456]86|k[678]|i86pc|BePC)
++    cpu="i386"
++    ;;
++ia64)
++    cpu="ia64"
++    ;;
++"Power Macintosh"|ppc)
++    cpu="ppc"
++    ;;
++ppc64)
++    cpu="ppc64"
++    ;;
++sparc)
++    cpu="sparc"
++    ;;
++sparc64)
++    cpu="sparc64"
++    ;;
++x86_64|amd64)
++    cpu="x86_64"
++    ;;
++esac
++echo "$cpu"
++}
++
++normalize_os() {
++local os="$1"
++case "$os" in
++sunos*)
++    os="solaris"
++    ;;
++esac
++echo "$os"
++}
++
++ARCH=`normalize_cpu "$ARCH"`
++OS=`normalize_os "$OS"`
++TARGET_ARCH=`normalize_cpu "$TARGET_ARCH"`
++TARGET_OS=`normalize_os "$TARGET_OS"`
++
++# Define where npviewer.bin is located
++NPW_VIEWER_DIR="%NPW_VIEWER_DIR%"
  # Set a new LD_LIBRARY_PATH that is TARGET specific
  export LD_LIBRARY_PATH=$NPW_VIEWER_DIR
@@ -31,24 +77,15 @@
  NPW_USE_VALGRIND=${NPW_USE_VALGRIND:-no}
  can_use_valgrind="no"
--case $ARCH in
--i?86|i86pc)
--    ARCH=i386
--    ;;
--amd64)
--    ARCH=x86_64
--    ;;
--esac
--
  if test "$ARCH" != "$TARGET_ARCH"; then
      case $TARGET_ARCH in
      i386)
  	if test "$ARCH" = "x86_64"; then
  	    case "$OS" in
--	    Linux)
++	    linux)
  		LOADER=`which linux32`
  		;;
--	    FreeBSD | NetBSD)
++	    freebsd | netbsd)
  		# XXX check that COMPAT_LINUX is enabled or fail otherwise
  		LOADER="none"
  	        ;;
@@ -66,7 +103,7 @@
      ppc)
  	if test "$ARCH" = "ppc64"; then
  	    case "$OS" in
--	    Linux)
++	    linux)
  		LOADER=`which linux32`
  	        ;;
  	    esac
@@ -98,7 +135,7 @@
  fi
  # Expand PATH for RealPlayer package on NetBSD (realplay)
--if test "$OS" = "NetBSD"; then
++if test "$OS" = "netbsd"; then
      REALPLAYER_HOME="/usr/pkg/lib/RealPlayer"
      if test -x "$REALPLAYER_HOME/realplay"; then
  	export PATH=$PATH:$REALPLAYER_HOME
@@ -114,7 +151,7 @@
      # XXX: detect QEMU target soundwrapper differently
      case "$LOADER" in
      *linux32)
--	if test "$OS" = "Linux"; then
++	if test "$OS" = "linux"; then
  	    soundwrapper=`which soundwrapper 2>/dev/null`
  	    if test -x "$soundwrapper"; then
  		LOADER="$LOADER $soundwrapper"
 === modified file 'src/npw-wrapper.c'
 --- src/npw-wrapper.c	2009-01-02 10:07:27 +0000
 +++ src/npw-wrapper.c	2009-08-11 00:38:42 +0000
@@ -21,7 +21,6 @@
  #define _GNU_SOURCE 1 /* RTLD_DEFAULT */
  #include "sysdeps.h"
--#include <assert.h>
  #include <stdio.h>
  #include <stdlib.h>
  #include <string.h>
@@ -61,12 +60,17 @@
    NPW_DEFAULT_PLUGIN_PATH,
 ,
    HOST_OS,
--  HOST_ARCH
++  HOST_ARCH,
++  NPW_PLUGIN_INFO_VERSION,
++  ""
  };
  // Path to plugin to use
  static const char *plugin_path = NPW_Plugin.path;
++// Path to associated plugin viewer
++static const char *plugin_viewer_path = NPW_Plugin.viewer_path;
++
  // Netscape exported functions
  static NPNetscapeFuncs mozilla_funcs;
@@ -2607,7 +2611,7 @@
  	  str =
  		"<a href=\"http://gwenole.beauchesne.info/projects/nspluginwrapper/\">nspluginwrapper</a> "
  		" is a cross-platform NPAPI plugin viewer, in particular for linux/i386 plugins.<br>"
--		"This software is available under the terms of the GNU General Public License.<br>"
++		"This <b>beta</b> software is available under the terms of the GNU General Public License.<br>"
+ 		;
  	  ret = NPERR_NO_ERROR;
+ 	}
@@ -3348,15 +3352,13 @@
    static int init_count = 0;
    ++init_count;
--  char viewer_path[PATH_MAX];
--  sprintf(viewer_path, "%s/%s/%s/%s", NPW_LIBDIR, NPW_Plugin.target_arch, NPW_Plugin.target_os, NPW_VIEWER);
    char connection_path[128];
    sprintf(connection_path, "%s/%s/%d-%d", NPW_CONNECTION_PATH, plugin_file_name, getpid(), init_count);
    // Cache MIME info and plugin name/description
    if (g_plugin.name == NULL && g_plugin.description == NULL && g_plugin.formats == NULL) {
  	char command[1024];
--	if (snprintf(command, sizeof(command), "%s --info --plugin %s", viewer_path, plugin_path) >= sizeof(command))
++	if (snprintf(command, sizeof(command), "%s --info --plugin %s", plugin_viewer_path, plugin_path) >= sizeof(command))
  	  return;
  	FILE *viewer_fp = popen(command, "r");
  	if (viewer_fp == NULL)
@@ -3416,7 +3418,7 @@
  	npw_close_all_open_files();
--	execv(viewer_path, argv);
++	execv(plugin_viewer_path, argv);
  	npw_printf("ERROR: failed to execute NSPlugin viewer\n");
  	_Exit(255);
+   }
 === modified file 'src/rpc.c'
 --- src/rpc.c	2009-01-02 10:07:27 +0000
 +++ src/rpc.c	2009-08-11 00:38:42 +0000
@@ -60,9 +60,11 @@
  // build of the viewer can interoperate with non-Linux wrappers. Linux
  // distributions can use this code though.
  // XXX better clean-up dead sockets properly on failure...
--#ifdef BUILD_LINUX_ONLY
++#ifndef BUILD_GENERIC
++#if defined(__linux__)
  #define USE_ANONYMOUS_SOCKETS 1
  #endif
++#endif
  // Define the maximum amount of time (in seconds) to wait for a message
  #ifndef RPC_MESSAGE_TIMEOUT
@@ -459,6 +461,8 @@
    int status;
    int socket;
    char *socket_path;
++  struct sockaddr_un socket_addr;
++  socklen_t socket_addr_len;
    int server_socket;
    int server_thread_active;
    pthread_t server_thread;
@@ -663,59 +667,131 @@
    return n;
+ }
++// Create a new RPC connection (initialize common structure members)
++static rpc_connection_t *rpc_connection_new(int type, const char *ident)
++{
++  rpc_connection_t *connection;
++
++  if (ident == NULL)
++	return NULL;
++
++  if ((connection = (rpc_connection_t *)calloc(1, sizeof(*connection))) == NULL)
++	return NULL;
++
++  connection->type = type;
++  connection->refcnt = 1;
++  connection->status = RPC_STATUS_CLOSED;
++  connection->socket = -1;
++  connection->server_socket = -1;
++  connection->server_thread_active = 0;
++  connection->error_callback = NULL;
++  connection->error_callback_data = NULL;
++  connection->dispatch_depth = 0;
++  connection->invoke_depth = 0;
++  connection->handle_depth = 0;
++  connection->sync_depth = 0;
++  connection->pending_sync_depth = 0;
++
++  if ((connection->types = rpc_map_new_full((free))) == NULL) {
++	rpc_exit(connection);
++	return NULL;
++  }
++
++  if ((connection->methods = rpc_map_new()) == NULL) {
++	rpc_exit(connection);
++	return NULL;
++  }
++
++  int fd = socket(AF_UNIX, SOCK_STREAM|SOCK_CLOEXEC, 0);
++  if (fd < 0) {
++	perror("socket");
++	rpc_exit(connection);
++	return NULL;
++  }
++
++  if (type == RPC_CONNECTION_SERVER)
++	connection->server_socket = fd;
++  else {
++	connection->socket = fd;
++
++	if (rpc_set_non_blocking_io(fd) < 0) {
++	  perror("socket set non-blocking");
++	  rpc_exit(connection);
++	  return NULL;
++	}
++  }
++
++  memset(&connection->socket_addr, 0, sizeof(connection->socket_addr));
++  connection->socket_addr.sun_family = AF_UNIX;
++  connection->socket_path = NULL;
++  connection->socket_addr_len = _rpc_socket_path(&connection->socket_path, ident);
++  memcpy(&connection->socket_addr.sun_path[0], connection->socket_path, connection->socket_addr_len);
++  connection->socket_addr_len += offsetof(struct sockaddr_un, sun_path); /* though POSIX says size of the actual sockaddr structure */
++#ifdef HAVE_SOCKADDR_UN_SUN_LEN
++  connection->socket_addr.sun_len = connection->socket_addr_len;
++#endif
++
++  return connection;
++}
++
++// Destroy an RPC connection
++static void rpc_connection_destroy(rpc_connection_t *connection)
++{
++  if (connection == NULL)
++	return;
++
++  if (connection->socket_path) {
++	if (connection->socket_path[0])
++	  unlink(connection->socket_path);
++	free(connection->socket_path);
++	connection->socket_path = NULL;
++  }
++
++  if (connection->type == RPC_CONNECTION_SERVER) {
++	if (connection->server_thread_active) {
++	  pthread_cancel(connection->server_thread);
++	  pthread_join(connection->server_thread, NULL);
++	  connection->server_thread = 0;
++	}
++	if (connection->socket != -1) {
++	  close(connection->socket);
++	  connection->socket = -1;
++	}
++	if (connection->server_socket != -1) {
++	  close(connection->server_socket);
++	  connection->server_socket = -1;
++	}
++  }
++  else {
++	if (connection->socket != -1) {
++	  close(connection->socket);
++	  connection->socket = -1;
++	}
++  }
++
++  if (connection->types) {
++	rpc_map_destroy(connection->types);
++	connection->types = NULL;
++  }
++  if (connection->methods) {
++	rpc_map_destroy(connection->methods);
++	connection->methods = NULL;
++  }
++
++  free(connection);
++}
++
  // Initialize server-side RPC system
  rpc_connection_t *rpc_init_server(const char *ident)
+ {
    D(bug("rpc_init_server ident='%s'\n", ident));
    rpc_connection_t *connection;
--  struct sockaddr_un addr;
--  socklen_t addr_len;
--
--  if (ident == NULL)
--	return NULL;
--
--  connection = (rpc_connection_t *)calloc(1, sizeof(*connection));
--  if (connection == NULL)
--	return NULL;
--  connection->type = RPC_CONNECTION_SERVER;
--  connection->refcnt = 1;
--  connection->status = RPC_STATUS_CLOSED;
--  connection->socket = -1;
--  connection->server_thread_active = 0;
--  connection->error_callback = NULL;
--  connection->error_callback_data = NULL;
--  connection->dispatch_depth = 0;
--  connection->invoke_depth = 0;
--  connection->handle_depth = 0;
--  connection->sync_depth = 0;
--  connection->pending_sync_depth = 0;
--  if ((connection->types = rpc_map_new_full((free))) == NULL) {
--	rpc_exit(connection);
--	return NULL;
--  }
--  if ((connection->methods = rpc_map_new()) == NULL) {
--	rpc_exit(connection);
--	return NULL;
--  }
--
--  if ((connection->server_socket = socket(AF_UNIX, SOCK_STREAM|SOCK_CLOEXEC, 0)) < 0) {
--	perror("server socket");
--	rpc_exit(connection);
--	return NULL;
--  }
--
--  memset(&addr, 0, sizeof(addr));
--  addr.sun_family = AF_UNIX;
--  connection->socket_path = NULL;
--  addr_len = _rpc_socket_path(&connection->socket_path, ident);
--  memcpy(&addr.sun_path[0], connection->socket_path, addr_len);
--  addr_len += offsetof(struct sockaddr_un, sun_path); /* though POSIX says size of the actual sockaddr structure */
--#ifdef HAVE_SOCKADDR_UN_SUN_LEN
--  addr.sun_len = addr_len;
--#endif
--
--  if (bind(connection->server_socket, (struct sockaddr *)&addr, addr_len) < 0) {
++
++  if ((connection = rpc_connection_new(RPC_CONNECTION_SERVER, ident)) == NULL)
++	return NULL;
++
++  if (bind(connection->server_socket, (struct sockaddr *)&connection->socket_addr, connection->socket_addr_len) < 0) {
  	perror("server bind");
  	rpc_exit(connection);
  	return NULL;
@@ -737,56 +813,9 @@
    D(bug("rpc_init_client ident='%s'\n", ident));
    rpc_connection_t *connection;
--  struct sockaddr_un addr;
--  socklen_t addr_len;
--
--  if (ident == NULL)
--	return NULL;
--
--  connection = (rpc_connection_t *)calloc(1, sizeof(*connection));
--  if (connection == NULL)
--	return NULL;
--  connection->type = RPC_CONNECTION_CLIENT;
--  connection->refcnt = 1;
--  connection->status = RPC_STATUS_CLOSED;
--  connection->server_socket = -1;
--  connection->error_callback = NULL;
--  connection->error_callback_data = NULL;
--  connection->dispatch_depth = 0;
--  connection->invoke_depth = 0;
--  connection->handle_depth = 0;
--  connection->sync_depth = 0;
--  connection->pending_sync_depth = 0;
--  if ((connection->types = rpc_map_new_full((free))) == NULL) {
--	rpc_exit(connection);
--	return NULL;
--  }
--  if ((connection->methods = rpc_map_new()) == NULL) {
--	rpc_exit(connection);
--	return NULL;
--  }
--
--  if ((connection->socket = socket(AF_UNIX, SOCK_STREAM|SOCK_CLOEXEC, 0)) < 0) {
--	perror("client socket");
--	rpc_exit(connection);
--	return NULL;
--  }
--
--  if (rpc_set_non_blocking_io(connection->socket) < 0) {
--	perror("client socket set non-blocking");
--	rpc_exit(connection);
--	return NULL;
--  }
--
--  memset(&addr, 0, sizeof(addr));
--  addr.sun_family = AF_UNIX;
--  connection->socket_path = NULL;
--  addr_len = _rpc_socket_path(&connection->socket_path, ident);
--  memcpy(&addr.sun_path[0], connection->socket_path, addr_len);
--  addr_len += offsetof(struct sockaddr_un, sun_path); /* though POSIX says size of the actual sockaddr structure */
--#ifdef HAVE_SOCKADDR_UN_SUN_LEN
--  addr.sun_len = addr_len;
--#endif
++
++  if ((connection = rpc_connection_new(RPC_CONNECTION_CLIENT, ident)) == NULL)
++	return NULL;
    // Wait at most RPC_INIT_TIMEOUT seconds for server to initialize
    const int N_CONNECT_WAIT_DELAY = 10;
@@ -794,7 +823,7 @@
    if (n_connect_attempts == 0)
  	n_connect_attempts = 1;
    while (n_connect_attempts > 0) {
--	if (connect(connection->socket, (struct sockaddr *)&addr, addr_len) == 0)
++	if (connect(connection->socket, (struct sockaddr *)&connection->socket_addr, connection->socket_addr_len) == 0)
  	  break;
  	if (n_connect_attempts > 1 && errno != ECONNREFUSED && errno != ENOENT) {
  	  perror("client_connect");
@@ -821,45 +850,7 @@
    if (connection == NULL)
  	return RPC_ERROR_CONNECTION_NULL;
--  if (connection->socket_path) {
--	if (connection->socket_path[0])
--	  unlink(connection->socket_path);
--	free(connection->socket_path);
--	connection->socket_path = NULL;
--  }
--
--  if (connection->type == RPC_CONNECTION_SERVER) {
--	if (connection->server_thread_active) {
--	  pthread_cancel(connection->server_thread);
--	  pthread_join(connection->server_thread, NULL);
--	  connection->server_thread = 0;
--	}
--	if (connection->socket != -1) {
--	  close(connection->socket);
--	  connection->socket = -1;
--	}
--	if (connection->server_socket != -1) {
--	  close(connection->server_socket);
--	  connection->server_socket = -1;
--	}
--  }
--  else {
--	if (connection->socket != -1) {
--	  close(connection->socket);
--	  connection->socket = -1;
--	}
--  }
--
--  if (connection->types) {
--	rpc_map_destroy(connection->types);
--	connection->types = NULL;
--  }
--  if (connection->methods) {
--	rpc_map_destroy(connection->methods);
--	connection->methods = NULL;
--  }
--
--  free(connection);
++  rpc_connection_destroy(connection);
    return RPC_ERROR_NO_ERROR;
+ }
 === modified file 'src/sysdeps.h'
 --- src/sysdeps.h	2009-01-02 10:07:27 +0000
 +++ src/sysdeps.h	2009-08-11 00:38:42 +0000
@@ -45,9 +45,9 @@
  #define NPW_VIEWER NPW_VIEWER_BASE
  #define NPW_WRAPPER_BASE "npwrapper"
  #define NPW_WRAPPER NPW_WRAPPER_BASE ".so"
--#define NPW_OLD_DEFAULT_PLUGIN_PATH NPW_LIBDIR "/" HOST_ARCH "/" NPW_WRAPPER
--#define NPW_DEFAULT_PLUGIN_PATH NPW_LIBDIR "/" HOST_ARCH "/" HOST_OS "/" NPW_WRAPPER
--#define NPW_PLUGIN_IDENT "NPW:" NPW_VERSION
++#define NPW_DEFAULT_PLUGIN_PATH NPW_HOST_LIBDIR "/" NPW_WRAPPER
++#define NPW_PLUGIN_INFO_VERSION 2
++#define NPW_PLUGIN_IDENT "NPW:X:" NPW_VERSION
  #define NPW_PLUGIN_IDENT_SIZE 32
  typedef struct __attribute__((packed)) {
    char ident[NPW_PLUGIN_IDENT_SIZE];
@@ -55,6 +55,8 @@
    time_t mtime;
    char target_arch[65];
    char target_os[65];
++  char struct_version; /* extended format "NPW:X:VERSION" */
++  char viewer_path[PATH_MAX];
  } NPW_PluginInfo;
  #if defined(BUILD_XPCOM)