From 4a2b6946c2aa722efafa3152c5f53579a5396b1e Mon Sep 17 00:00:00 2001
From: Marco Pesenti Gritti <marcopg@litl.com>
Date: Mon, 16 Mar 2009 16:45:24 +0000
Subject: Fix evince initialization. Use HIBYTE macro.

---
(limited to 'browser-plugin/glue.cpp')

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;
 	}
 
--
cgit v0.9.1