From 49f89795349a47ae4e061666d84a715bf24f5373 Mon Sep 17 00:00:00 2001 From: Glynn Foster Date: Mon, 10 Mar 2003 17:11:18 +0000 Subject: Mass indentation cleanup. Make sure the glade dialogs aren't initially 2003-03-10 Glynn Foster * 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. --- src/entry.c | 113 ++++++++++++++++++++++++++++++------------------------------ 1 file changed, 57 insertions(+), 56 deletions(-) (limited to 'src/entry.c') diff --git a/src/entry.c b/src/entry.c index 893fbf62..0ccd4c0e 100644 --- a/src/entry.c +++ b/src/entry.c @@ -32,79 +32,80 @@ static GtkWidget *entry; void zenity_entry (ZenityData *data, ZenityEntryData *entry_data) { - GladeXML *glade_dialog = NULL; - GtkWidget *dialog; - GtkWidget *text; + GladeXML *glade_dialog = NULL; + GtkWidget *dialog; + GtkWidget *text; - glade_dialog = zenity_util_load_glade_file ("zenity_entry_dialog"); + glade_dialog = zenity_util_load_glade_file ("zenity_entry_dialog"); - if (glade_dialog == NULL) { - data->exit_code = -1; - return; - } + if (glade_dialog == NULL) { + data->exit_code = -1; + return; + } - glade_xml_signal_autoconnect (glade_dialog); - - dialog = glade_xml_get_widget (glade_dialog, "zenity_entry_dialog"); + glade_xml_signal_autoconnect (glade_dialog); + + dialog = glade_xml_get_widget (glade_dialog, "zenity_entry_dialog"); - g_signal_connect (G_OBJECT (dialog), "response", - G_CALLBACK (zenity_entry_dialog_response), data); + + g_signal_connect (G_OBJECT (dialog), "response", + G_CALLBACK (zenity_entry_dialog_response), data); - if (data->dialog_title) - gtk_window_set_title (GTK_WINDOW (dialog), data->dialog_title); + 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 - zenity_util_set_window_icon (dialog, ZENITY_IMAGE_FULLPATH ("zenity-entry.png")); + if (data->window_icon) + zenity_util_set_window_icon (dialog, data->window_icon); + else + zenity_util_set_window_icon (dialog, ZENITY_IMAGE_FULLPATH ("zenity-entry.png")); - text = glade_xml_get_widget (glade_dialog, "zenity_entry_text"); + text = glade_xml_get_widget (glade_dialog, "zenity_entry_text"); - if (entry_data->dialog_text) - gtk_label_set_text_with_mnemonic (GTK_LABEL (text), entry_data->dialog_text); + if (entry_data->dialog_text) + gtk_label_set_text_with_mnemonic (GTK_LABEL (text), entry_data->dialog_text); - entry = glade_xml_get_widget (glade_dialog, "zenity_entry_input"); + entry = glade_xml_get_widget (glade_dialog, "zenity_entry_input"); - if (glade_dialog) - g_object_unref (glade_dialog); + if (glade_dialog) + g_object_unref (glade_dialog); - if (entry_data->entry_text) - gtk_entry_set_text (GTK_ENTRY (entry), entry_data->entry_text); + if (entry_data->entry_text) + gtk_entry_set_text (GTK_ENTRY (entry), entry_data->entry_text); - if (entry_data->visible == FALSE) - g_object_set (G_OBJECT (entry), "visibility", entry_data->visible, NULL); + if (!entry_data->visible) + g_object_set (G_OBJECT (entry), "visibility", entry_data->visible, NULL); - gtk_label_set_mnemonic_widget (GTK_LABEL (text), entry); + gtk_label_set_mnemonic_widget (GTK_LABEL (text), entry); - gtk_widget_show (dialog); - gtk_main (); + gtk_widget_show (dialog); + gtk_main (); } static void zenity_entry_dialog_response (GtkWidget *widget, int response, gpointer data) { - ZenityData *zen_data = data; - const gchar *text; - - switch (response) { - case GTK_RESPONSE_OK: - zen_data->exit_code = 0; - text = gtk_entry_get_text (GTK_ENTRY (entry)); - - if (text != NULL) - g_printerr ("%s\n", gtk_entry_get_text (GTK_ENTRY (entry))); - - gtk_main_quit (); - break; - - case GTK_RESPONSE_CANCEL: - zen_data->exit_code = 1; - gtk_main_quit (); - break; - - default: - /* Esc dialog */ - zen_data->exit_code = 1; - break; - } + ZenityData *zen_data = data; + const gchar *text; + + switch (response) { + case GTK_RESPONSE_OK: + zen_data->exit_code = 0; + text = gtk_entry_get_text (GTK_ENTRY (entry)); + + if (text != NULL) + g_printerr ("%s\n", gtk_entry_get_text (GTK_ENTRY (entry))); + + gtk_main_quit (); + break; + + case GTK_RESPONSE_CANCEL: + zen_data->exit_code = 1; + gtk_main_quit (); + break; + + default: + /* Esc dialog */ + zen_data->exit_code = 1; + break; + } } -- cgit