Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-01-27 07:34:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 660131 - Call g_type_init in loadProc of kGnomeModule to fix crash on mochitest-plain ; r=karlt

Browse Source
This commit is contained in:
Hiroyuki Ikezoe 2011-06-01 13:19:16 -04:00
parent 7ac2c0c464
commit 73e20bff7f
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
toolkit/system/gnome/nsGConfService.cpp
View File

@ -54,7 +54,6 @@ nsGConfService::~nsGConfService()
nsresult nsresult
nsGConfService::Init() nsGConfService::Init()
{ {
g_type_init();
mClient = gconf_client_get_default(); mClient = gconf_client_get_default();
return mClient ? NS_OK : NS_ERROR_FAILURE; return mClient ? NS_OK : NS_ERROR_FAILURE;
} }

7
toolkit/system/gnome/nsGIOService.cpp
View File

@ -299,13 +299,6 @@ nsGIOMimeApp::SetAsDefaultForURIScheme(nsACString const& aURIScheme)
return NS_OK; return NS_OK;
} }
nsresult
nsGIOService::Init()
{
// do nothing, gvfs/gio does not init.
return NS_OK;
}
NS_IMPL_ISUPPORTS1(nsGIOService, nsIGIOService) NS_IMPL_ISUPPORTS1(nsGIOService, nsIGIOService)
NS_IMETHODIMP NS_IMETHODIMP

2
toolkit/system/gnome/nsGIOService.h
View File

@ -49,8 +49,6 @@ class nsGIOService : public nsIGIOService
public: public:
NS_DECL_ISUPPORTS NS_DECL_ISUPPORTS
NS_DECL_NSIGIOSERVICE NS_DECL_NSIGIOSERVICE
NS_HIDDEN_(nsresult) Init();
}; };
#endif #endif

14
toolkit/system/gnome/nsGnomeModule.cpp
View File

@ -50,7 +50,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGnomeVFSService, Init)
#ifdef MOZ_ENABLE_GIO #ifdef MOZ_ENABLE_GIO
#include "nsGIOService.h" #include "nsGIOService.h"
#include "nsGSettingsService.h" #include "nsGSettingsService.h"
NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGIOService, Init) NS_GENERIC_FACTORY_CONSTRUCTOR(nsGIOService)
NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGSettingsService, Init) NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGSettingsService, Init)
#endif #endif
#ifdef MOZ_ENABLE_LIBNOTIFY #ifdef MOZ_ENABLE_LIBNOTIFY
@ -107,10 +107,20 @@ static const mozilla::Module::ContractIDEntry kGnomeContracts[] = {
{ NULL } { NULL }
}; };
static nsresult
InitGType ()
{
g_type_init();
return NS_OK;
}
static const mozilla::Module kGnomeModule = { static const mozilla::Module kGnomeModule = {
mozilla::Module::kVersion, mozilla::Module::kVersion,
kGnomeCIDs, kGnomeCIDs,
kGnomeContracts kGnomeContracts,
NULL,
NULL,
InitGType
}; };
NSMODULE_DEFN(mozgnome) = &kGnomeModule; NSMODULE_DEFN(mozgnome) = &kGnomeModule;