Bug 536745 - Fix GConf related build error for certain build configurations. r=ted
authorWolfgang Rosenauer <wr@rosenauer.org>
Tue, 12 Jan 2010 11:23:53 +0100
changeset 37092 a43e2f7eda8f
parent 37091 cea14ad20b61
child 37093 27c48ab51c3a
push idunknown
push userunknown
push dateunknown
reviewersted
bugs536745
milestone1.9.3a1pre
Bug 536745 - Fix GConf related build error for certain build configurations. r=ted
toolkit/system/gnome/nsGnomeModule.cpp
--- a/toolkit/system/gnome/nsGnomeModule.cpp
+++ b/toolkit/system/gnome/nsGnomeModule.cpp
@@ -31,36 +31,33 @@
  * use your version of this file under the terms of the MPL, indicate your
  * decision by deleting the provisions above and replace them with the notice
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include "nsGConfService.h"
-#include "nsGnomeVFSService.h"
-#include "nsGIOService.h"
 #include "nsToolkitCompsCID.h"
 #include "nsIGenericFactory.h"
 
-#ifdef MOZ_ENABLE_LIBNOTIFY
-#include "nsAlertsService.h"
-#endif
-
 #ifdef MOZ_ENABLE_GCONF
+#include "nsGConfService.h"
 NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGConfService, Init)
 #endif
 #ifdef MOZ_ENABLE_GNOMEVFS
+#include "nsGnomeVFSService.h"
 NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGnomeVFSService, Init)
 #endif
 #ifdef MOZ_ENABLE_GIO
+#include "nsGIOService.h"
 NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGIOService, Init)
 #endif
 #ifdef MOZ_ENABLE_LIBNOTIFY
+#include "nsAlertsService.h"
 NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsAlertsService, Init)
 #endif
 
 static const nsModuleComponentInfo components[] = {
 #ifdef MOZ_ENABLE_GCONF
   { "GConf Service",
     NS_GCONFSERVICE_CID,
     NS_GCONFSERVICE_CONTRACTID,