From 102603be13d3cb9e6a410653042b581df7233dc9 Mon Sep 17 00:00:00 2001
From: Marco Pesenti Gritti <mpg@redhat.com>
Date: Wed, 22 Aug 2007 00:11:20 +0000
Subject: Adapt to latest xulrunner 1.9

---
(limited to 'src')

diff --git a/src/Makefile.am b/src/Makefile.am
index 15e63e7..6cd5d59 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,28 +1,17 @@
-INCLUDES =					                        \
-	$(DEPS_CFLAGS)				                    \
-	$(PYTHON_INCLUDES)			                    \
-	$(MOZILLA_CFLAGS)			                    \
-	-I$(MOZILLA_INCLUDE_ROOT)/docshell	            \
-	-I$(MOZILLA_INCLUDE_ROOT)/dom		            \
-	-I$(MOZILLA_INCLUDE_ROOT)/js		            \
-	-I$(MOZILLA_INCLUDE_ROOT)/xulapp	            \
-	-I$(MOZILLA_INCLUDE_ROOT)/nspr		            \
-	-I$(MOZILLA_INCLUDE_ROOT)/pyxpcom	            \
-	-I$(MOZILLA_INCLUDE_ROOT)/string	            \
-	-I$(MOZILLA_INCLUDE_ROOT)/webbrwsr	            \
-	-I$(MOZILLA_INCLUDE_ROOT)/widget	            \
-	-I$(MOZILLA_INCLUDE_ROOT)/xpcom		            \
-	-I$(MOZILLA_INCLUDE_ROOT)/xpconnect	            \
-	-DMOZILLA_HOME=\"$(MOZILLA_HOME)\"              \
-    -DPLUGIN_PATH=\"$(libdir)/mozilla/plugins\"     \
+INCLUDES =						\
+	$(DEPS_CFLAGS)				  	\
+	$(PYTHON_INCLUDES)			 	\
+	$(LIBXUL_CFLAGS)				\
+	-DPLUGIN_PATH=\"$(libdir)/mozilla/plugins\"     \
+	-DLIBXUL_DIR=\"$(LIBXUL_DIR)\"			\
 	-DDATA_DIR=\"$(pkgdatadir)\"
 
 noinst_LTLIBRARIES = libhulahop.la
 
-libhulahop_la_SOURCES = 		    \
+libhulahop_la_SOURCES = 		\
 	HulahopDirectoryProvider.cpp	\
-	HulahopDirectoryProvider.h	    \
-	hulahop.cpp			            \
-	hulahop.h			            \
-	hulahop-web-view.cpp		    \
+	HulahopDirectoryProvider.h	\
+	hulahop.cpp			\
+	hulahop.h			\
+	hulahop-web-view.cpp		\
 	hulahop-web-view.h
diff --git a/src/hulahop.cpp b/src/hulahop.cpp
index 8448a5b..e34b282 100644
--- a/src/hulahop.cpp
+++ b/src/hulahop.cpp
@@ -49,12 +49,12 @@ hulahop_startup()
     setup_plugin_path();
 
     nsCOMPtr<nsILocalFile> greDir;
-    rv = NS_NewNativeLocalFile(nsCString(MOZILLA_HOME), PR_TRUE,
+    rv = NS_NewNativeLocalFile(nsCString(LIBXUL_DIR), PR_TRUE,
                                getter_AddRefs(greDir));
     NS_ENSURE_SUCCESS(rv, FALSE);
 
     nsCOMPtr<nsILocalFile> binDir;
-    rv = NS_NewNativeLocalFile(nsCString(MOZILLA_HOME"/components"), PR_TRUE,
+    rv = NS_NewNativeLocalFile(nsCString(LIBXUL_DIR"/components"), PR_TRUE,
                                getter_AddRefs(binDir));
     NS_ENSURE_SUCCESS(rv, FALSE);
 
--
cgit v0.9.1