Index: configure.in
===================================================================
RCS file: /cvs/gnome/beagle/configure.in,v
retrieving revision 1.192
diff -u -B -p -r1.192 configure.in
--- configure.in	15 Nov 2005 20:49:02 -0000	1.192
+++ configure.in	19 Nov 2005 13:55:37 -0000
@@ -278,6 +278,11 @@ dnl changed from nsIXULChromeRegistry in
                                                                                 
 AC_CHECK_FILE([$MOZILLA_INCLUDE_ROOT/chrome/nsIChromeRegistrySea.h],
         [AC_DEFINE([HAVE_CHROME_NSICHROMEREGISTRYSEA_H], [1], [Define if nsIChromeRegistrySea.h exists])])
+
+dnl do_GetService moved here in firefox 1.5
+
+AC_CHECK_FILE([$MOZILLA_INCLUDE_ROOT/xpcom/nsServiceManagerUtils.h],
+		[AC_DEFINE([HAVE_XPCOM_NSSERVICEMANAGERUTILS_H], [1], [Define if nsServiceManagerUtils.h exists])])
                                                                                 
 MOZILLA_WARN_CXXFLAGS="-Wall -Wconversion -Wpointer-arith -Wcast-align -Woverloaded-virtual -Wsynth -Wno-ctor-dtor-privacy -Wno-non-virtual-dtor"
 AC_SUBST(MOZILLA_WARN_CXXFLAGS)
Index: Tiles/TileCanvas.cs
===================================================================
RCS file: /cvs/gnome/beagle/Tiles/TileCanvas.cs,v
retrieving revision 1.23
diff -u -B -p -r1.23 TileCanvas.cs
--- Tiles/TileCanvas.cs	16 May 2005 16:05:48 -0000	1.23
+++ Tiles/TileCanvas.cs	19 Nov 2005 13:55:37 -0000
@@ -134,7 +134,6 @@ namespace Beagle.Tile {
 			set {
 				root = value; 
 				root.SetChangedHandler (new TileChangedHandler (OnTileChanged));
-				Render ();
 			}
 		}
 
Index: glue/Makefile.am
===================================================================
RCS file: /cvs/gnome/beagle/glue/Makefile.am,v
retrieving revision 1.16
diff -u -B -p -r1.16 Makefile.am
--- glue/Makefile.am	17 Oct 2005 19:24:01 -0000	1.16
+++ glue/Makefile.am	19 Nov 2005 13:55:38 -0000
@@ -11,6 +11,7 @@ INCLUDES= \
 	-I$(MOZILLA_INCLUDE_ROOT)/gfx			\
 	-I$(MOZILLA_INCLUDE_ROOT)/embedstring		\
 	-I$(MOZILLA_INCLUDE_ROOT)/chrome		\
+	-I$(MOZILLA_INCLUDE_ROOT)/nspr		\
 	-DALLOW_PRIVATE_API				\
 	-DMOZILLA_HOME=\""$(MOZILLA_HOME)\""		\
 	-include $(MOZILLA_INCLUDE_ROOT)/mozilla-config.h
Index: glue/gecko-utils.cpp
===================================================================
RCS file: /cvs/gnome/beagle/glue/gecko-utils.cpp,v
retrieving revision 1.1
diff -u -B -p -r1.1 gecko-utils.cpp
--- glue/gecko-utils.cpp	28 Oct 2004 22:14:41 -0000	1.1
+++ glue/gecko-utils.cpp	19 Nov 2005 13:55:38 -0000
@@ -32,6 +32,11 @@
 #include <nsEmbedString.h>
 #include <nsIPrefService.h>
 #include <nsIServiceManager.h>
+#include <nsCOMPtr.h>
+
+#if defined(HAVE_XPCOM_NSSERVICEMANAGERUTILS_H)
+#include <nsServiceManagerUtils.h>
+#endif
 
 #if defined (HAVE_CHROME_NSICHROMEREGISTRYSEA_H)
 #include <chrome/nsIChromeRegistrySea.h>