Release versions 1.2.11 and 1.2.11-1

[videolink.git] / browser_widget.cpp

diff --git a/browser_widget.cpp b/browser_widget.cpp
index baa0748b36eafb9863cfceb7fda2ccbdbb506664..cff4a7dab2b52f8fb9362d0f74bc701036497686 100644 (file)
--- a/browser_widget.cpp
+++ b/browser_widget.cpp
@@ -8,9 +8,10 @@
 
 #include <limits.h>
 
+#include "videolink.hpp"
 #include "wchar_t_short.h"
 #include <gtkmozembed_internal.h>
-#if MOZ_VERSION_MAJOR == 1 && MOZ_VERSION_MINOR == 9
+#if MOZ_VERSION_GE(1,9,0)
 #include <gtkmozembed_glue.cpp>
 #endif
 #include "wchar_t_default.h"
@@ -530,10 +531,23 @@ Glib::ObjectBase * browser_widget::wrap_new(GObject * gobject)
 
 browser_widget::initialiser::initialiser()
 {
-#if MOZ_VERSION_MAJOR == 1 && MOZ_VERSION_MINOR == 9
+#if MOZ_VERSION_GE(1,9,0)
     static const GREVersionRange gre_versions = {
+#if MOZ_VERSION_EQ(1,9,0)
        "1.9a", PR_TRUE,
-       "1.9.*", PR_TRUE
+       "1.9.1", PR_FALSE
+#elif MOZ_VERSION_EQ(1,9,1)
+       "1.9.1", PR_TRUE,
+       "1.9.2", PR_FALSE
+#elif MOZ_VERSION_EQ(2,0,-1) || MOZ_VERSION_EQ(2,0,0)
+       "2.0b", PR_TRUE,
+       "2.0.1", PR_FALSE
+#elif MOZ_VERSION_EQ(2,0,1)
+       "2.0.1", PR_TRUE,
+       "2.0.2", PR_FALSE
+#else
+#error "version is unsupported, but you could try continuing the pattern above"
+#endif
     };
     char path[PATH_MAX];
     check(GRE_GetGREPathWithProperties(&gre_versions, 1, 0, 0,
@@ -560,7 +574,7 @@ browser_widget::initialiser::~initialiser()
 {
     gtk_moz_embed_pop_startup();
 
-#if MOZ_VERSION_MAJOR == 1 && MOZ_VERSION_MINOR == 9
+#if MOZ_VERSION_GE(1,9,0)
     XPCOMGlueShutdown();
 #endif
 }