fix bustage, on machines with older libgnomeui, and on systems whose test doesn't support ==

configure.in

@@ -93,7 +93,7 @@ MAKE_VERSION=3.78
 WINDRES_VERSION=2.14.90
 W32API_VERSION=2.4
 GNOMEVFS_VERSION=2.0
-GNOMEUI_VERSION=2.0
+GNOMEUI_VERSION=2.1.0
 
 dnl Set various checks
 dnl ========================================================
@@ -3528,7 +3528,7 @@ then
     then
         PKG_CHECK_MODULES(MOZ_GNOMEUI, libgnomeui-2.0 >= $GNOMEUI_VERSION,
         [MOZ_ENABLE_GNOMEUI=1], [
-            if test "$MOZ_ENABLE_GNOMEUI" == "force"
+            if test "$MOZ_ENABLE_GNOMEUI" = "force"
             then
                 AC_MSG_ERROR([* * * Could not find libgnomeui-2.0 >= $GNOMEUI_VERSION])
             fi

modules/libpr0n/decoders/icon/gtk/nsIconChannel.cpp

@@ -38,6 +38,8 @@
 #include <stdlib.h>
 #include <unistd.h>
 
+// Older versions of these headers seem to be missing an extern "C"
+extern "C" {
 #include <libgnome/libgnome.h>
 #include <libgnomeui/gnome-icon-theme.h>
 #include <libgnomeui/gnome-icon-lookup.h>
@@ -45,6 +47,7 @@
 
 #include <libgnomevfs/gnome-vfs-file-info.h>
 #include <libgnomevfs/gnome-vfs-ops.h>
+}
 
 #include "nsIMIMEService.h"