diff options
| -rw-r--r-- | browser-plugin/glue.cpp | 10 | ||||
| -rw-r--r-- | libdocument/ev-init.c | 6 | ||||
| -rw-r--r-- | libdocument/ev-init.h | 2 |
3 files changed, 11 insertions, 7 deletions
diff --git a/browser-plugin/glue.cpp b/browser-plugin/glue.cpp index 18713d7..ebce5f7 100644 --- a/browser-plugin/glue.cpp +++ b/browser-plugin/glue.cpp @@ -39,7 +39,9 @@ static char *mimeDescription = NULL; char * NP_GetMIMEDescription (void) { - ev_init (); + if (!ev_is_initialized()) { + ev_init (); + } if (mimeDescription == NULL) { GString *desc = g_string_new (NULL); @@ -77,13 +79,15 @@ NP_Initialize (NPNetscapeFuncs *aNPNFuncs, NPPluginFuncs *aNPPFuncs) g_module_close (module); #endif - ev_init (); + if (!ev_is_initialized()) { + ev_init (); + } if (aNPNFuncs == NULL || aNPPFuncs == NULL) { return NPERR_INVALID_FUNCTABLE_ERROR; } - if ((aNPNFuncs->version >> 8) > NP_VERSION_MAJOR) { + if (HIBYTE(aNPNFuncs->version) > NP_VERSION_MAJOR) { return NPERR_INCOMPATIBLE_VERSION_ERROR; } diff --git a/libdocument/ev-init.c b/libdocument/ev-init.c index 8876a23..d15379c 100644 --- a/libdocument/ev-init.c +++ b/libdocument/ev-init.c @@ -67,7 +67,7 @@ ev_init (void) void ev_shutdown (void) { - g_assert (_ev_is_initialized ()); + g_assert (ev_is_initialized ()); if (--ev_init_count > 0) return; @@ -78,12 +78,12 @@ ev_shutdown (void) } /* - * _ev_is_initialized: + * ev_is_initialized: * * Returns: %TRUE if the evince document library has been initialized */ gboolean -_ev_is_initialized (void) +ev_is_initialized (void) { return ev_init_count > 0; } diff --git a/libdocument/ev-init.h b/libdocument/ev-init.h index 80b64d4..20a2a91 100644 --- a/libdocument/ev-init.h +++ b/libdocument/ev-init.h @@ -32,7 +32,7 @@ gboolean ev_init (void); void ev_shutdown (void); -gboolean _ev_is_initialized (void); +gboolean ev_is_initialized (void); G_END_DECLS |