зеркало из https://github.com/mozilla/gecko-dev.git
Fixes for following Linux installer bugs:
http://bugzilla.mozilla.org/show_bug.cgi?id=93240 -- installer window too narrow for license text http://bugzilla.mozilla.org/show_bug.cgi?id=98201 -- cancel button does not respond http://bugzilla.mozilla.org/show_bug.cgi?id=108282 -- crasher, calling gtk+ function with NULL argument http://bugzilla.mozilla.org/show_bug.cgi?id=113997 -- mozilla installer eats 100% CPU
This commit is contained in:
Родитель
6267e49b2f
Коммит
0ee72c5a07
|
@ -880,11 +880,7 @@ nsInstallDlg::ShowCompleteDlg()
|
|||
gtk_widget_grab_default(okButton);
|
||||
gtk_widget_show_all(completeDlg);
|
||||
|
||||
while (!bComplete)
|
||||
{
|
||||
XI_GTK_UPDATE_UI();
|
||||
}
|
||||
|
||||
gtk_main();
|
||||
gtk_main_quit();
|
||||
}
|
||||
|
||||
|
@ -896,6 +892,7 @@ nsInstallDlg::CompleteOK(GtkWidget *aWidget, gpointer aData)
|
|||
if (dlg)
|
||||
gtk_widget_destroy(dlg);
|
||||
|
||||
gtk_main_quit();
|
||||
bComplete = TRUE;
|
||||
}
|
||||
|
||||
|
@ -1392,7 +1389,8 @@ nsInstallDlg::InitDLProgress( int isFirst )
|
|||
void
|
||||
nsInstallDlg::InitInstallProgress()
|
||||
{
|
||||
gtk_widget_hide(sDLProgress.vbox);
|
||||
if ( sDLProgress.vbox )
|
||||
gtk_widget_hide(sDLProgress.vbox);
|
||||
gCtx->idlg->ShowTable();
|
||||
}
|
||||
|
||||
|
|
|
@ -156,6 +156,8 @@ nsLicenseDlg::Show(int aDirection)
|
|||
GtkWidget *text = gtk_text_new(NULL, NULL);
|
||||
GdkFont *font = gdk_font_load( LICENSE_FONT );
|
||||
gtk_text_set_editable(GTK_TEXT(text), FALSE);
|
||||
gtk_text_set_word_wrap(GTK_TEXT(text), TRUE);
|
||||
gtk_text_set_line_wrap(GTK_TEXT(text), TRUE);
|
||||
gtk_table_attach(GTK_TABLE(mTable), text, 1, 2, 0, 1,
|
||||
static_cast<GtkAttachOptions>(GTK_FILL | GTK_EXPAND),
|
||||
static_cast<GtkAttachOptions>(GTK_FILL | GTK_EXPAND),
|
||||
|
|
Загрузка…
Ссылка в новой задаче