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

move gtk_init to after NS_TraceMallocStartupArgs to fix tracemalloc bustage

Browse Source
This commit is contained in:
bryner%netscape.com 2003-03-04 10:32:14 +00:00
parent e101df3686
commit dd3782698c
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
toolkit/xre/nsAppRunner.cpp
View File

@ -1790,14 +1790,6 @@ int xre_main(int argc, char* argv[], const nsXREAppData& aAppData)
InitializeMacOSXApp(argc, argv); InitializeMacOSXApp(argc, argv);
#endif #endif
#if defined(MOZ_WIDGET_GTK) || defined(MOZ_WIDGET_GTK2)
// Initialize GTK+1/2 here for splash
#if defined(MOZ_WIDGET_GTK)
gtk_set_locale();
#endif
gtk_init(&argc, &argv);
#endif /* MOZ_WIDGET_GTK || MOZ_WIDGET_GTK2 */
#ifdef _BUILD_STATIC_BIN #ifdef _BUILD_STATIC_BIN
// Initialize XPCOM's module info table // Initialize XPCOM's module info table
NSGetStaticModuleInfo = app_getModuleInfo; NSGetStaticModuleInfo = app_getModuleInfo;
@ -1812,6 +1804,14 @@ int xre_main(int argc, char* argv[], const nsXREAppData& aAppData)
argc = NS_TraceMallocStartupArgs(argc, argv); argc = NS_TraceMallocStartupArgs(argc, argv);
#endif #endif
#if defined(MOZ_WIDGET_GTK) || defined(MOZ_WIDGET_GTK2)
// Initialize GTK+1/2 here for splash
#if defined(MOZ_WIDGET_GTK)
gtk_set_locale();
#endif
gtk_init(&argc, &argv);
#endif /* MOZ_WIDGET_GTK || MOZ_WIDGET_GTK2 */
// Call the code to install our handler // Call the code to install our handler
#ifdef MOZ_JPROF #ifdef MOZ_JPROF
setupProfilingStuff(); setupProfilingStuff();