Fix compilation in qgeckoglobals.cpp; also fix 429272
authorVladimir Vukicevic <vladimir@pobox.com>
Sun, 20 Apr 2008 00:50:41 -0700
changeset 16883 93c820a60cb1af9acee9087c487d10befa850c07
parent 16882 37b42c2ed5c24b465f6a488ac36052b0350a8b7f
child 16885 8f68aab12dfbe97219e6019c998cdd53d2550951
push idunknown
push userunknown
push dateunknown
bugs429272
milestone2.0a1pre
Fix compilation in qgeckoglobals.cpp; also fix 429272
configure.in
embedding/browser/qt/src/qgeckoglobals.cpp
--- a/configure.in
+++ b/configure.in
@@ -7215,21 +7215,17 @@ if test -n "$CROSS_COMPILE"; then
     else
         HOST_LIBIDL_CFLAGS="$LIBIDL_CFLAGS"
         HOST_LIBIDL_LIBS="$LIBIDL_LIBS"
     fi
 fi
 
 if test -z "$SKIP_PATH_CHECKS"; then
 if test -z "${GLIB_CFLAGS}" || test -z "${GLIB_LIBS}" ; then
-    if test "$MOZ_ENABLE_GTK2"; then
-        PKG_CHECK_MODULES(GLIB, glib-2.0 >= 1.3.7 gobject-2.0)
-    else
-        AM_PATH_GLIB(${GLIB_VERSION})
-    fi
+    PKG_CHECK_MODULES(GLIB, glib-2.0 >= 1.3.7 gobject-2.0)
 fi
 fi
 
 if test -z "${GLIB_GMODULE_LIBS}" -a -n "${GLIB_CONFIG}"; then
     GLIB_GMODULE_LIBS=`$GLIB_CONFIG gmodule --libs`
 fi
 
 AC_SUBST(LIBIDL_CFLAGS)
--- a/embedding/browser/qt/src/qgeckoglobals.cpp
+++ b/embedding/browser/qt/src/qgeckoglobals.cpp
@@ -148,23 +148,27 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(QtPromptS
 static const nsModuleComponentInfo defaultAppComps[] = {
   {
     "Prompt Service",
     NS_PROMPTSERVICE_CID,
     "@mozilla.org/embedcomp/prompt-service;1",
     QtPromptServiceConstructor
   }
 };
-#else
-static const nsModuleComponentInfo defaultAppComps[] = {};
-#endif
 
 const nsModuleComponentInfo *QGeckoGlobals::sAppComps = defaultAppComps;
 int   QGeckoGlobals::sNumAppComps = sizeof(defaultAppComps) / sizeof(nsModuleComponentInfo);
 
+#else
+static const nsModuleComponentInfo defaultAppComps[] = { { NULL } };
+const nsModuleComponentInfo *QGeckoGlobals::sAppComps = defaultAppComps;
+int   QGeckoGlobals::sNumAppComps = 0;
+#endif
+
+
 void
 QGeckoGlobals::pushStartup()
 {
     // increment the number of widgets
     sWidgetCount++;
 
     // if this is the first widget, fire up xpcom
     if (sWidgetCount != 1) return;