Backed out changeset 00a76d6b935c (bug 978147) for apparently breaking linux mochitests on an already CLOSED TREE

This commit is contained in:
Wes Kocher 2014-03-06 13:52:24 -08:00
parent 813a5a6742
commit 879600bd51
3 changed files with 18 additions and 1 deletions

View File

@ -106,6 +106,9 @@ nsDownloadManager::GetSingleton()
gDownloadManagerService = new nsDownloadManager();
if (gDownloadManagerService) {
#if defined(MOZ_WIDGET_GTK)
g_type_init();
#endif
NS_ADDREF(gDownloadManagerService);
if (NS_FAILED(gDownloadManagerService->Init()))
NS_RELEASE(gDownloadManagerService);

View File

@ -43,6 +43,10 @@ DownloadPlatform* DownloadPlatform::GetDownloadPlatform()
NS_ADDREF(gDownloadPlatformService);
#if defined(MOZ_WIDGET_GTK)
g_type_init();
#endif
return gDownloadPlatformService;
}

View File

@ -62,10 +62,20 @@ static const mozilla::Module::ContractIDEntry kGnomeContracts[] = {
{ nullptr }
};
static nsresult
InitGType ()
{
g_type_init();
return NS_OK;
}
static const mozilla::Module kGnomeModule = {
mozilla::Module::kVersion,
kGnomeCIDs,
kGnomeContracts
kGnomeContracts,
nullptr,
nullptr,
InitGType
};
NSMODULE_DEFN(mozgnome) = &kGnomeModule;