From: short <>
Date: Sun, 9 Nov 2003 20:52:18 +0000 (+0000)
Subject: Pre-size GnomeDialog to prevent its later next-page resizes.
X-Git-Tag: captive-1_1~32
X-Git-Url: http://git.jankratochvil.net/?a=commitdiff_plain;h=8780f98e140b6dd2b1b382d2a23fa75508a45328;p=captive.git

Pre-size GnomeDialog to prevent its later next-page resizes.
---

diff --git a/src/install/acquire/ui-gnome.c b/src/install/acquire/ui-gnome.c
index 57862bc..32b2150 100644
--- a/src/install/acquire/ui-gnome.c
+++ b/src/install/acquire/ui-gnome.c
@@ -678,9 +678,9 @@ GtkBox *druid_button_box;
 	gtk_widget_hide(GTK_WIDGET(Druid->finish));
 
 	DruidButtonSkip=GTK_BUTTON(gtk_button_new_from_stock(GTK_STOCK_REDO));
-	gtk_container_foreach(GTK_CONTAINER(DruidButtonSkip),
-			(GtkCallback)button_stock_set_label,	/* callback */
-			_("_Skip"));	/* callback_data */
+	button_stock_set_label(
+			GTK_WIDGET(DruidButtonSkip),	/* widget */
+			_("_Skip"));	/* label_text_new */
 	gtk_box_pack_end(druid_button_box,GTK_WIDGET(DruidButtonSkip),FALSE,TRUE,0);
 	gtk_widget_show(GTK_WIDGET(DruidButtonSkip));
 	g_signal_connect((gpointer)DruidButtonSkip,"clicked",G_CALLBACK(on_DruidButtonSkip_clicked),NULL);
@@ -690,9 +690,9 @@ GtkBox *druid_button_box;
 	gtk_widget_show(GTK_WIDGET(DruidButtonOK));
 	g_signal_connect((gpointer)DruidButtonOK,"clicked",G_CALLBACK(on_DruidButtonOK_clicked),NULL);
 
-	gtk_container_foreach(GTK_CONTAINER(PageFinish),
-			(GtkCallback)PageFinish_set_label_attr,	/* callback */
-			NULL);	/* callback_data */
+	PageFinish_set_label_attr(
+			GTK_WIDGET(PageFinish),	/* widget */
+			NULL);	/* callback_data; unused */
 
 	state_changed();
 
@@ -729,7 +729,19 @@ static void ui_gnome_interactive(void)
 {
 	gdk_threads_enter();
 
+	/* Postpone gtk_widget_show_all() from App_init() here
+	 * to have already passed all ui_gnome_module_available_notify().
+	 */
+	gnome_druid_set_page(Druid,MicrosoftComPage);
 	gtk_widget_show_all(GTK_WIDGET(App));
+#if 0
+	/* gnome_druid_set_page(Druid,PageStart); */
+	gnome_druid_set_page(Druid,ScanDiskPage);
+	gnome_druid_set_page(Druid,ScanPathPage);
+	/* gnome_druid_set_page(Druid,MicrosoftComPage); */
+	gnome_druid_set_page(Druid,PageFinish);
+#endif
+	gnome_druid_set_page(Druid,PageStart);
 
 	gtk_main();