Minimo only. Get spacing right. Also enabled global history

git-svn-id: svn://10.0.0.236/trunk@179555 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/minimo/base/Minimo.cpp

@@ -361,6 +361,9 @@ void DoPreferences()
         return;
 
     prefBranch->SetIntPref("snav.keyCode.modifier", 0);
+
+
+
     prefBranch->GetBoolPref("config.wince.dumpJSConsole", &gDumpJSConsole);
 }
 
@@ -559,64 +562,66 @@ int main(int argc, char *argv[])
   gtk_set_locale();
   gtk_init(&argc, &argv);
 #endif
-
-    if (DoesProcessAlreadyExist())
-        return 0;
-
-    CreateSplashScreen();
-
+  
+  if (DoesProcessAlreadyExist())
+    return 0;
+  
+  CreateSplashScreen();
+  
 #ifdef HACKY_PRE_LOAD_LIBRARY
-    LoadKnownLibs();
+  LoadKnownLibs();
 #endif
-
+  
 #ifdef _BUILD_STATIC_BIN
-    NS_InitEmbedding(nsnull, nsnull, kPStaticModules, kStaticModuleCount);
+  NS_InitEmbedding(nsnull, nsnull, kPStaticModules, kStaticModuleCount);
 #else
-    NS_InitEmbedding(nsnull, nsnull);
+  NS_InitEmbedding(nsnull, nsnull);
 #endif
     // Choose the new profile
-    if (NS_FAILED(StartupProfile()))
-        return 1;
-    
-    DoPreferences();
-    OverrideComponents();
-
-    NS_TIMELINE_ENTER("appStartup");
-    nsCOMPtr<nsIAppShell> appShell = do_CreateInstance(kAppShellCID);
-    appShell->Create(nsnull, nsnull);
-    
-    ApplicationObserver *appObserver = new ApplicationObserver(appShell);
-    if (!appObserver)
-        return 1;
-    NS_ADDREF(appObserver);
-    
-    WindowCreator *creatorCallback = new WindowCreator(appShell);
-    if (!creatorCallback)
-        return 1;
-
-    nsCOMPtr<nsIWindowWatcher> wwatch(do_GetService(NS_WINDOWWATCHER_CONTRACTID));
-    wwatch->SetWindowCreator(creatorCallback);
-
-    nsCOMPtr<nsIDOMWindow> newWindow;
-    wwatch->OpenWindow(nsnull, start_url, "_blank", "chrome,dialog=no,all", nsnull, getter_AddRefs(newWindow));
-
-    appShell->Run();
-
-    appShell = nsnull;
-    wwatch = nsnull;
-    newWindow = nsnull;
-
-    delete appObserver;
-    delete creatorCallback;
-
-    if (gDumpJSConsole)
-      WriteConsoleLog();
-
-    // Close down Embedding APIs
-    NS_TermEmbedding();
-
+  if (NS_FAILED(StartupProfile()))
+    return 1;
+  
+  DoPreferences();
+  OverrideComponents();
+  
+  NS_TIMELINE_ENTER("appStartup");
+  nsCOMPtr<nsIAppShell> appShell = do_CreateInstance(kAppShellCID);
+  appShell->Create(nsnull, nsnull);
+  
+  ApplicationObserver *appObserver = new ApplicationObserver(appShell);
+  if (!appObserver)
+    return 1;
+  NS_ADDREF(appObserver);
+  
+  WindowCreator *creatorCallback = new WindowCreator(appShell);
+  if (!creatorCallback)
+    return 1;
+  
+  nsCOMPtr<nsIWindowWatcher> wwatch(do_GetService(NS_WINDOWWATCHER_CONTRACTID));
+  wwatch->SetWindowCreator(creatorCallback);
+  
+  nsCOMPtr<nsIDOMWindow> newWindow;
+  wwatch->OpenWindow(nsnull, start_url, "_blank", "chrome,dialog=no,all", nsnull, getter_AddRefs(newWindow));
+  
+  appShell->Run();
+  
+  appShell = nsnull;
+  wwatch = nsnull;
+  newWindow = nsnull;
+  
+  delete appObserver;
+  delete creatorCallback;
+  
+  if (gDumpJSConsole)
+    WriteConsoleLog();
+  
+  // Close down Embedding APIs
+  NS_TermEmbedding();
+  
 #ifdef HACKY_PRE_LOAD_LIBRARY
-    UnloadKnownLibs();
+  UnloadKnownLibs();
 #endif
-    return NS_OK;
+  return NS_OK;
 }
+
+

mozilla/minimo/base/wince/minimo-link-comps

@@ -1,33 +1,33 @@
-xpconect
-mozuconv
-i18n
-necko
-jar50
-rdf
-pref
-caps
-gkparser
-gkgfxwin
-imglib2
-gkwidget
-gklayout
-docshell
-embedcmp
-webbrwsr
-texteditor
-txmgr
-appshell
-chrome
-mork
-tkitcmps
-xmlextra
-t8iix
-websrvcs
-gkplugin
-softkey
-pipboot
-pipnss
-pippki
-phone
-snav
-ssr
+xpconect
+mozuconv
+i18n
+necko
+jar50
+rdf
+pref
+caps
+gkparser
+gkgfxwin
+imglib2
+gkwidget
+gklayout
+docshell
+embedcmp
+webbrwsr
+texteditor
+txmgr
+appshell
+chrome
+mork
+tkitcmps
+xmlextra
+t8iix
+websrvcs
+gkplugin
+softkey
+pipboot
+pipnss
+pippki
+phone
+snav
+ssr

mozilla/minimo/base/wince/minimo-link-names

@@ -1,33 +1,33 @@
-xpconnect
-nsUConvModule
-nsI18nModule
-necko_core_and_primary_protocols
-nsJarModule
-nsPrefModule
-nsSecurityManagerModule
-nsRDFModule
-nsParserModule
-nsGfxModule
-nsImageLib2Module
-nsPluginModule
-nsWidgetModule
-nsLayoutModule
-docshell_provider
-embedcomponents
-Browser_Embedding_Module
-nsEditorModule
-nsTransactionManagerModule
-appshell
-nsChromeModule
-nsMorkModule
-nsToolkitCompsModule
-nsXMLExtrasModule
-TransformiixModule
-nsWebServicesModule
-SoftKeyBoardModule
-BOOT
-NSS
-PKI
-nsPhoneSupportModule
-SpatialNavigationModule
-SSRModule
+xpconnect
+nsUConvModule
+nsI18nModule
+necko_core_and_primary_protocols
+nsJarModule
+nsPrefModule
+nsSecurityManagerModule
+nsRDFModule
+nsParserModule
+nsGfxModule
+nsImageLib2Module
+nsPluginModule
+nsWidgetModule
+nsLayoutModule
+docshell_provider
+embedcomponents
+Browser_Embedding_Module
+nsEditorModule
+nsTransactionManagerModule
+appshell
+nsChromeModule
+nsMorkModule
+nsToolkitCompsModule
+nsXMLExtrasModule
+TransformiixModule
+nsWebServicesModule
+SoftKeyBoardModule
+BOOT
+NSS
+PKI
+nsPhoneSupportModule
+SpatialNavigationModule
+SSRModule

mozilla/minimo/chrome/content/minimo.js

@@ -223,9 +223,14 @@ function browserInit(refTab)
 
       getBrowser().addProgressListener(BrowserStatusHandler, Components.interfaces.nsIWebProgress.NOTIFY_ALL);
       gBrowserStatusHandlerArray.push(BrowserStatusHandler);
+
       var refBrowser=getBrowser().getBrowserForTab(refTab);
       var webNavigation=refBrowser.webNavigation;
       webNavigation.sessionHistory = Components.classes["@mozilla.org/browser/shistory;1"].createInstance(Components.interfaces.nsISHistory);
+
+      // enable global history
+      getBrowser().docShell.QueryInterface(Components.interfaces.nsIDocShellHistory).useGlobalHistory = true;
+
     } catch (e) {
       alert("Error trying to startup browser.  Please report this as a bug:\n" + e);
     }

mozilla/minimo/customization/all.js

@@ -154,3 +154,4 @@ pref("security.warn_submit_insecure", false);
 pref("network.autodial-helper.enabled", true);
 
 pref("config.wince.useOKBtn", true);
+