Attachment #321424 for bug #518603

View | Details | Raw Unified | Return to bug 518603
Collapse All | Expand All





        nsCOMPtr<nsICommandLineRunner> cmdLine;

#if defined(HAVE_DESKTOP_STARTUP_ID) && defined(MOZ_WIDGET_GTK2)
        nsRefPtr<nsGTKToolkit> toolkit = GetGTKToolkit();
        if (toolkit && !desktopStartupID.IsEmpty()) {
          toolkit->SetDesktopStartupID(desktopStartupID);
        }
#endif

        nsCOMPtr<nsIFile> workingDir;
        rv = NS_GetSpecialDirectory(NS_OS_CURRENT_WORKING_DIR, getter_AddRefs(workingDir));
        NS_ENSURE_SUCCESS(rv, 1);

          NS_TIMELINE_LEAVE("appStartup->CreateHiddenWindow");
          NS_ENSURE_SUCCESS(rv, 1);

#if defined(HAVE_DESKTOP_STARTUP_ID) && defined(MOZ_WIDGET_GTK2)
          nsRefPtr<nsGTKToolkit> toolkit = GetGTKToolkit();
          if (toolkit && !desktopStartupID.IsEmpty()) {
            toolkit->SetDesktopStartupID(desktopStartupID);
          }
#endif

          // Extension Compatibility Checking and Startup
          if (gAppData->flags & NS_XRE_ENABLE_EXTENSION_MANAGER) {
            nsCOMPtr<nsIExtensionManager> em(do_GetService("@mozilla.org/extensions/manager;1"));

Return to bug 518603

Lines 3173-3185 XRE_main(int argc, char* argv[], const n Link Here

(-)toolkit/xre/nsAppRunner.cpp.sav (-7 / +7 lines)
3173		3173
3174	nsCOMPtr<nsICommandLineRunner> cmdLine;	3174	nsCOMPtr<nsICommandLineRunner> cmdLine;
3175		3175
3176	#if defined(HAVE_DESKTOP_STARTUP_ID) && defined(MOZ_WIDGET_GTK2)
3177	nsRefPtr<nsGTKToolkit> toolkit = GetGTKToolkit();
3178	if (toolkit && !desktopStartupID.IsEmpty()) {
3179	toolkit->SetDesktopStartupID(desktopStartupID);
3180	}
3181	#endif
3182
3183	nsCOMPtr<nsIFile> workingDir;	3176	nsCOMPtr<nsIFile> workingDir;
3184	rv = NS_GetSpecialDirectory(NS_OS_CURRENT_WORKING_DIR, getter_AddRefs(workingDir));	3177	rv = NS_GetSpecialDirectory(NS_OS_CURRENT_WORKING_DIR, getter_AddRefs(workingDir));
3185	NS_ENSURE_SUCCESS(rv, 1);	3178	NS_ENSURE_SUCCESS(rv, 1);
Lines 3205-3210 XRE_main(int argc, char* argv[], const n Link Here
3205	NS_TIMELINE_LEAVE("appStartup->CreateHiddenWindow");	3198	NS_TIMELINE_LEAVE("appStartup->CreateHiddenWindow");
3206	NS_ENSURE_SUCCESS(rv, 1);	3199	NS_ENSURE_SUCCESS(rv, 1);
3207		3200
		3201	#if defined(HAVE_DESKTOP_STARTUP_ID) && defined(MOZ_WIDGET_GTK2)
		3202	nsRefPtr<nsGTKToolkit> toolkit = GetGTKToolkit();
		3203	if (toolkit && !desktopStartupID.IsEmpty()) {
		3204	toolkit->SetDesktopStartupID(desktopStartupID);
		3205	}
		3206	#endif
		3207
3208	// Extension Compatibility Checking and Startup	3208	// Extension Compatibility Checking and Startup
3209	if (gAppData->flags & NS_XRE_ENABLE_EXTENSION_MANAGER) {	3209	if (gAppData->flags & NS_XRE_ENABLE_EXTENSION_MANAGER) {
3210	nsCOMPtr<nsIExtensionManager> em(do_GetService("@mozilla.org/extensions/manager;1"));	3210	nsCOMPtr<nsIExtensionManager> em(do_GetService("@mozilla.org/extensions/manager;1"));