Open changelog entry for 1.2.11

[videolink.git] / browser_widget.cpp

diff --git a/browser_widget.cpp b/browser_widget.cpp
index 07df0d0e86250c72957526144c57b27f1b23b769..01ce4cbfe308f4da068a96c0b47c448b46d5233d 100644 (file)
--- a/browser_widget.cpp
+++ b/browser_widget.cpp
@@ -8,10 +8,12 @@
 
 #include <limits.h>
 
+#include "wchar_t_short.h"
 #include <gtkmozembed_internal.h>
 #if MOZ_VERSION_MAJOR == 1 && MOZ_VERSION_MINOR == 9
 #include <gtkmozembed_glue.cpp>
 #endif
+#include "wchar_t_default.h"
 
 #include "xpcom_support.hpp"
 
@@ -530,8 +532,15 @@ browser_widget::initialiser::initialiser()
 {
 #if MOZ_VERSION_MAJOR == 1 && MOZ_VERSION_MINOR == 9
     static const GREVersionRange gre_versions = {
+#if MOZ_VERSION_MICRO == 0
        "1.9a", PR_TRUE,
-       "1.9.*", PR_TRUE
+       "1.9.1", PR_FALSE
+#elif MOZ_VERSION_MICRO == 1
+       "1.9.1", PR_TRUE,
+       "1.9.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,
@@ -539,6 +548,7 @@ browser_widget::initialiser::initialiser()
 
     check(XPCOMGlueStartup(path));
     check(GTKEmbedGlueStartup());
+    check(GTKEmbedGlueStartupInternal());
 
     char * last_slash = std::strrchr(path, '/');
     if (last_slash != path)