Mass indentation cleanup. Make sure the glade dialogs aren't initially

2003-03-10  Glynn Foster  <glynn.foster@sun.com>

	* src/about.c, src/calendar.c, src/entry.c, src/fileselection.c,
	src/main.c, src/msg.c, src/progress.c, src/text.c, src/tree.c,
	src/util.c, src/util.h, src/zenity.glade, src/zenity.h:

	Mass indentation cleanup. Make sure the glade dialogs aren't initially
	visible because this avoids a visibility jump. Apparently == TRUE is
	bad mojo. Fix up.

1 files changed, 94 insertions, 91 deletions

diff --git a/src/msg.c b/src/msg.c
index 5c73af0..feac59d 100644
--- a/src/msg.c
+++ b/src/msg.c
@@ -30,105 +30,108 @@ static void zenity_msg_dialog_response (GtkWidget *widget, int response, gpointe
 void 
 zenity_msg (ZenityData *data, ZenityMsgData *msg_data)
 {
-	GladeXML *glade_dialog;
-	GtkWidget *dialog;
-	GtkWidget *text;
-
-	switch (msg_data->mode) {
-
-		case ZENITY_MSG_WARNING:
-			glade_dialog = zenity_util_load_glade_file ("zenity_warning_dialog");
-			dialog = glade_xml_get_widget (glade_dialog, "zenity_warning_dialog");
-			text = glade_xml_get_widget (glade_dialog, "zenity_warning_text");
-			break;
-
-		case ZENITY_MSG_QUESTION:
-			glade_dialog = zenity_util_load_glade_file ("zenity_question_dialog");
-			dialog = glade_xml_get_widget (glade_dialog, "zenity_question_dialog");
-			text = glade_xml_get_widget (glade_dialog, "zenity_question_text");
-			break;
-
-		case ZENITY_MSG_ERROR:
-			glade_dialog = zenity_util_load_glade_file ("zenity_error_dialog");
-			dialog = glade_xml_get_widget (glade_dialog, "zenity_error_dialog");
-			text = glade_xml_get_widget (glade_dialog, "zenity_error_text");
-			break;
-
-		case ZENITY_MSG_INFO:
-			glade_dialog = zenity_util_load_glade_file ("zenity_info_dialog");
-			dialog = glade_xml_get_widget (glade_dialog, "zenity_info_dialog");
-			text = glade_xml_get_widget (glade_dialog, "zenity_info_text");
-			break;
+  GladeXML *glade_dialog;
+  GtkWidget *dialog;
+  GtkWidget *text;
+
+  switch (msg_data->mode) {
+    case ZENITY_MSG_WARNING:
+      glade_dialog = zenity_util_load_glade_file ("zenity_warning_dialog");
+      dialog = glade_xml_get_widget (glade_dialog, "zenity_warning_dialog");
+      text = glade_xml_get_widget (glade_dialog, "zenity_warning_text");
+      break;
+
+    case ZENITY_MSG_QUESTION:
+      glade_dialog = zenity_util_load_glade_file ("zenity_question_dialog");
+      dialog = glade_xml_get_widget (glade_dialog, "zenity_question_dialog");
+      text = glade_xml_get_widget (glade_dialog, "zenity_question_text");
+      break;
+
+    case ZENITY_MSG_ERROR:
+      glade_dialog = zenity_util_load_glade_file ("zenity_error_dialog");
+      dialog = glade_xml_get_widget (glade_dialog, "zenity_error_dialog");
+      text = glade_xml_get_widget (glade_dialog, "zenity_error_text");
+      break;
+
+    case ZENITY_MSG_INFO:
+      glade_dialog = zenity_util_load_glade_file ("zenity_info_dialog");
+      dialog= glade_xml_get_widget (glade_dialog, "zenity_info_dialog");
+      text = glade_xml_get_widget (glade_dialog, "zenity_info_text");
+      break;
 		
-		default:
-			g_assert_not_reached ();
-			break;	
-	}
-
-	g_signal_connect (G_OBJECT (dialog), "response",
-			  G_CALLBACK (zenity_msg_dialog_response), data);
-
-	if (glade_dialog == NULL) {
-		data->exit_code = -1;
-		return;
-	}
-	
-	glade_xml_signal_autoconnect (glade_dialog);
-	
-        if (glade_dialog)
-		g_object_unref (glade_dialog);
-
-	if (data->dialog_title)
-		gtk_window_set_title (GTK_WINDOW (dialog), data->dialog_title);
+    default:
+      g_assert_not_reached ();
+      break;	
+  }
 
-	if (data->window_icon)
-		zenity_util_set_window_icon (dialog, data->window_icon);
-	else {
-		GdkPixbuf	*pixbuf = NULL;
-		switch (msg_data->mode) {
+  g_signal_connect (G_OBJECT (dialog), "response",
+                    G_CALLBACK (zenity_msg_dialog_response), data);
 	
-			case ZENITY_MSG_WARNING:
-				zenity_util_set_window_icon_from_stock (dialog, GTK_STOCK_DIALOG_WARNING);
-				break;
-			case ZENITY_MSG_QUESTION:
-				zenity_util_set_window_icon_from_stock (dialog, GTK_STOCK_DIALOG_QUESTION);
-				break;
-			case ZENITY_MSG_ERROR:
-				zenity_util_set_window_icon_from_stock (dialog, GTK_STOCK_DIALOG_ERROR);
-				break;
-			case ZENITY_MSG_INFO:
-				zenity_util_set_window_icon_from_stock (dialog, GTK_STOCK_DIALOG_INFO);
-				break;
-			default:
-				break;
-		}
-	}
+  if (glade_dialog == NULL) {
+    data->exit_code = -1;
+    return;
+  }
+	
+  glade_xml_signal_autoconnect (glade_dialog);
+        
+  if (glade_dialog)
+    g_object_unref (glade_dialog);
+
+  if (data->dialog_title)
+    gtk_window_set_title (GTK_WINDOW (dialog), data->dialog_title);
+
+  if (data->window_icon)
+    zenity_util_set_window_icon (dialog, data->window_icon);
+  else {
+    GdkPixbuf *pixbuf = NULL;
+    
+    switch (msg_data->mode) {
+      case ZENITY_MSG_WARNING:
+        zenity_util_set_window_icon_from_stock (dialog, GTK_STOCK_DIALOG_WARNING);
+        break;
+
+      case ZENITY_MSG_QUESTION:
+        zenity_util_set_window_icon_from_stock (dialog, GTK_STOCK_DIALOG_QUESTION);
+        break;
+      
+      case ZENITY_MSG_ERROR:
+        zenity_util_set_window_icon_from_stock (dialog, GTK_STOCK_DIALOG_ERROR);
+        break;
+      
+      case ZENITY_MSG_INFO:
+        zenity_util_set_window_icon_from_stock (dialog, GTK_STOCK_DIALOG_INFO);
+        break;
+  
+      default:
+        break;
+    }
+  }
         
-        if (msg_data->dialog_text)
-	        gtk_label_set_text (GTK_LABEL (text), msg_data->dialog_text);
+  if (msg_data->dialog_text)
+    gtk_label_set_text (GTK_LABEL (text), msg_data->dialog_text);
 
-	gtk_widget_show (dialog);
-	gtk_main ();
+  gtk_widget_show (dialog);
+  gtk_main ();
 }
 
 static void
 zenity_msg_dialog_response (GtkWidget *widget, int response, gpointer data)
 {
-	ZenityData *zen_data = data;
-
-	switch (response) {
-		case GTK_RESPONSE_OK:
-			zen_data->exit_code = 0;
-			gtk_main_quit ();
-			break;
-
-		case GTK_RESPONSE_CANCEL:
-			zen_data->exit_code = 1;
-			gtk_main_quit ();
-			break;
-
-		default:
-			zen_data->exit_code = 1;
-			break;
-	}
+  ZenityData *zen_data = data;
+
+  switch (response) {
+    case GTK_RESPONSE_OK:
+      zen_data->exit_code = 0;
+      gtk_main_quit ();
+      break;
+
+    case GTK_RESPONSE_CANCEL:
+      zen_data->exit_code = 1;
+      gtk_main_quit ();
+      break;
+
+    default:
+      zen_data->exit_code = 1;
+      break;
+  }
 }