Bug 171317 Show Dialog=FALSE doesn't work

patch by ajschult@verizon.net r=dveditz sr=bryner

xpinstall/packager/unix/config.it

@@ -36,7 +36,6 @@ License File=MPL-1.1.txt
 ;-------------------------------------------------------------------------
 [Dialog Setup Type]
 ;-------------------------------------------------------------------------
-Show Dialog=TRUE
 Title=Mozilla Installer
 ; *** LOCALIZE ME BABY ***
 Message0=Please select the setup type you wish to install.
@@ -109,7 +108,6 @@ C11=Component11
 ;-------------------------------------------------------------------------
 [Dialog Select Components]
 ;-------------------------------------------------------------------------
-Show Dialog=TRUE
 Title=Mozilla Installer
 ; *** LOCALIZE ME BABY ***
 Message0=Please select the components you wish to install.

xpinstall/wizard/unix/src2/nsComponentsDlg.cpp

@@ -135,17 +135,6 @@ nsComponentsDlg::Parse(nsINIParser *aParser)
     err = aParser->GetStringAlloc(DLG_COMPONENTS, MSG0, &mMsg0, &bufsize);
     if (err != OK && err != nsINIParser::E_NO_KEY) goto BAIL; else err = OK;
 
-    bufsize = 5;
-    err = aParser->GetStringAlloc(DLG_COMPONENTS, SHOW_DLG, &showDlg, &bufsize);
-    if (err != OK && err != nsINIParser::E_NO_KEY) goto BAIL; else err = OK;
-    if (bufsize != 0 && showDlg)
-    {
-        if (0 == strncmp(showDlg, "TRUE", 4))
-            mShowDlg = nsXInstallerDlg::SHOW_DIALOG;
-        else if (0 == strncmp(showDlg, "FALSE", 5))
-            mShowDlg = nsXInstallerDlg::SKIP_DIALOG;
-    }
-
     bufsize = 0;
     err = aParser->GetStringAlloc(DLG_COMPONENTS, TITLE, &mTitle, &bufsize);
     if (err != OK  && err != nsINIParser::E_NO_KEY) goto BAIL; else err = OK;

xpinstall/wizard/unix/src2/nsInstallDlg.cpp

@@ -528,6 +528,14 @@ nsInstallDlg::Show()
     gtk_widget_show(gCtx->back);
     gtk_widget_show(gCtx->next);
 
+    if (!mShowDlg)
+    {
+       gCtx->bMoving = FALSE;
+       nsInstallDlg::Next((GtkWidget *)NULL, gCtx->idlg);
+       return err;
+    }
+   
+
     return err;
 }
 

xpinstall/wizard/unix/src2/nsLicenseDlg.cpp

@@ -132,6 +132,12 @@ int
 nsLicenseDlg::Show()
 {
     int err = OK;
+    if (!mShowDlg)
+    {
+       gCtx->sdlg->Show();
+       return err;
+    }
+    
     char *licenseContents = NULL;
 
     XI_VERIFY(gCtx);

xpinstall/wizard/unix/src2/nsSetupTypeDlg.cpp

@@ -194,17 +194,6 @@ nsSetupTypeDlg::Parse(nsINIParser *aParser)
     err = aParser->GetStringAlloc(DLG_SETUP_TYPE, MSG0, &mMsg0, &bufsize);
     if (err != OK && err != nsINIParser::E_NO_KEY) goto BAIL; else err = OK;
 
-    bufsize = 5;
-    err = aParser->GetStringAlloc(DLG_SETUP_TYPE, SHOW_DLG, &showDlg, &bufsize);
-    if (err != OK && err != nsINIParser::E_NO_KEY) goto BAIL; else err = OK;
-    if (bufsize != 0 && showDlg)
-    {
-        if (0 == strncmp(showDlg, "TRUE", 4))
-            mShowDlg = nsXInstallerDlg::SHOW_DIALOG;
-        else if (0 == strncmp(showDlg, "FALSE", 5))
-            mShowDlg = nsXInstallerDlg::SKIP_DIALOG;
-    }
-
     bufsize = 0;
     err = aParser->GetStringAlloc(DLG_SETUP_TYPE, TITLE, &mTitle, &bufsize);
     if (err != OK && err != nsINIParser::E_NO_KEY) goto BAIL; else err = OK;

xpinstall/wizard/unix/src2/nsWelcomeDlg.cpp

@@ -116,7 +116,13 @@ BAIL:
 int
 nsWelcomeDlg::Show()
 {
-    int err = 0;
+    int err = OK;
+    if (!mShowDlg)
+    {
+       gCtx->ldlg->Show();
+       return err;
+    }
+   
     char *readmeContents = NULL;
 
     XI_VERIFY(gCtx);