Bug 561831 - Build bustage on qt in exthandler. r=ted
authorDoug Turner <dougt@dougt.org>
Wed, 28 Apr 2010 13:33:28 -0700
changeset 41497 4ba95e0e3aeeac815f3dfc3f5a36a45148d7f209
parent 41496 4cef662b70cc1b1e2bf8d48fad81b552b9d4977d
child 41498 5721ed62dfbca41a19a223411d3b116ce983babc
push id1
push userroot
push dateTue, 26 Apr 2011 22:38:44 +0000
treeherdermozilla-beta@bfdb6e623a36 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted
bugs561831
milestone1.9.3a5pre
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
Bug 561831 - Build bustage on qt in exthandler. r=ted
uriloader/exthandler/Makefile.in
uriloader/exthandler/nsDBusHandlerApp.cpp
--- a/uriloader/exthandler/Makefile.in
+++ b/uriloader/exthandler/Makefile.in
@@ -157,17 +157,17 @@ EXTRA_COMPONENTS = \
   nsWebHandlerApp.js \
   $(NULL)
 
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
 SRCS_IN_OBJDIR	= 1
 include $(topsrcdir)/config/rules.mk
 
-ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
-CXXFLAGS += $(TK_CFLAGS)
+ifneq (,$(filter qt gtk2, $(MOZ_WIDGET_TOOLKIT))))
+CXXFLAGS += $(TK_CFLAGS) $(MOZ_DBUS_GLIB_CFLAGS)
 endif
 
 # the use of multiple VPATH dirs is broken in cygwin make
 ifeq ($(OS_ARCH),WINNT WINCE)
 export:: $(OSDIR)/nsOSHelperAppService.cpp $(OSDIR)/nsMIMEInfoWin.cpp
 	$(INSTALL) $^ .
 endif
--- a/uriloader/exthandler/nsDBusHandlerApp.cpp
+++ b/uriloader/exthandler/nsDBusHandlerApp.cpp
@@ -40,18 +40,16 @@
 #include  <dbus/dbus.h>
 #include "nsDBusHandlerApp.h"
 #include "nsIURI.h"
 #include "nsIGenericFactory.h"
 #include "nsIClassInfoImpl.h"
 #include "nsCOMPtr.h"
 
 #if (MOZ_PLATFORM_MAEMO == 5)
-#include <libosso.h>
-
 #define APP_LAUNCH_BANNER_SERVICE           "com.nokia.hildon-desktop"
 #define APP_LAUNCH_BANNER_METHOD_INTERFACE  "com.nokia.hildon.hdwm.startupnotification"
 #define APP_LAUNCH_BANNER_METHOD_PATH       "/com/nokia/hildon/hdwm"
 #define APP_LAUNCH_BANNER_METHOD            "starting"
 #endif
 
 
 // XXX why does nsMIMEInfoImpl have a threadsafe nsISupports?  do we need one