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, 310 insertions, 304 deletions

diff --git a/src/about.c b/src/about.c
index cf0f119..2adcf64 100644
--- a/src/about.c
+++ b/src/about.c
@@ -45,410 +45,416 @@ static void zenity_about_dialog_response (GtkWidget *widget, int response, gpoin
 
 /* Sync with the people in the THANKS file */
 static const gchar *author_credits[] = {
-        "Author -",
-        "Glynn Foster <glynn.foster@sun.com>",
-        "",
-        "Thanks to -",
-        "Jonathan Blandford <jrb@redhat.com>",
-        "Ross Burton <ross@burtonini.com>",
-        "Anders Carlsson <andersca@codefactory.se>",
-        "John Fleck <jfleck@inkstain.net>",
-        "James Henstridge <james@daa.com.au>",
-        "Mihai T. Lazarescu <mihai@email.it>",
-        "Mike Newman <mike@gtnorthern.demon.co.uk>",
-        "Havoc Pennington <hp@redhat.com>",
-        "Kristian Rietveld <kris@gtk.org>",
-        "Jakub Steiner <jimmac@ximian.com>",
-        "Tom Tromey <tromey@redhat.com>",
-        NULL
+  "Author -",
+  "Glynn Foster <glynn.foster@sun.com>",
+  "",
+  "Thanks to -",
+  "Jonathan Blandford <jrb@redhat.com>",
+  "Ross Burton <ross@burtonini.com>",
+  "Anders Carlsson <andersca@codefactory.se>",
+  "John Fleck <jfleck@inkstain.net>",
+  "James Henstridge <james@daa.com.au>",
+  "Mihai T. Lazarescu <mihai@email.it>",
+  "Mike Newman <mike@gtnorthern.demon.co.uk>",
+  "Havoc Pennington <hp@redhat.com>",
+  "Kristian Rietveld <kris@gtk.org>",
+  "Jakub Steiner <jimmac@ximian.com>",
+  "Tom Tromey <tromey@redhat.com>",
+  NULL
 };
 
 gchar *translator_credits;
 
 static gint
-zenity_move_clothes_event (GnomeCanvasItem *item, GdkEvent *event, gpointer data)
+zenity_move_clothes_event (GnomeCanvasItem *item, 
+                           GdkEvent *event,
+                           gpointer data)
 {
-	static double x, y;
-	double new_x, new_y;
-	static int dragging;
-	double item_x, item_y;
-
-	/* set item_[xy] to the event x,y position in the parent's item-relative coordinates */
-	item_x = event->button.x;
-	item_y = event->button.y;
-	gnome_canvas_item_w2i (item->parent, &item_x, &item_y);
-
-	switch (event->type) {
-	case GDK_BUTTON_PRESS:
-		x = item_x;
-		y = item_y;
-		gnome_canvas_item_ungrab (item, event->button.time);
-		gnome_canvas_item_raise_to_top (item);
-		dragging = TRUE;
-		break;
-
-	case GDK_MOTION_NOTIFY:
-		if (dragging && (event->motion.state & GDK_BUTTON1_MASK)) {
-			new_x = item_x;
-			new_y = item_y;
-
-			gnome_canvas_item_move (item, new_x - x, new_y - y);
-			x = new_x;
-			y = new_y;
-		}
-		break;
-
-	case GDK_BUTTON_RELEASE:
-		gnome_canvas_item_ungrab (item, event->button.time);
-		dragging = FALSE;
-		break;
-
-	default:
-		break;
-	}
-
-	return FALSE;
+  static double x, y;
+  double new_x, new_y;
+  static int dragging;
+  double item_x, item_y;
+
+  /* set item_[xy] to the event x,y position in the parent's 
+   * item-relative coordinates
+   */
+  
+  item_x = event->button.x;
+  item_y = event->button.y;
+  gnome_canvas_item_w2i (item->parent, &item_x, &item_y);
+
+  switch (event->type) {
+    case GDK_BUTTON_PRESS:
+      x = item_x;
+      y = item_y;
+      gnome_canvas_item_ungrab (item, event->button.time);
+      gnome_canvas_item_raise_to_top (item);
+      dragging = TRUE;
+      break;
+
+    case GDK_MOTION_NOTIFY:
+      if (dragging && (event->motion.state & GDK_BUTTON1_MASK)) {
+        new_x = item_x;
+        new_y = item_y;
+
+        gnome_canvas_item_move (item, new_x - x, new_y - y);
+        x = new_x;
+        y = new_y;
+      }
+      break;
+
+    case GDK_BUTTON_RELEASE:
+      gnome_canvas_item_ungrab (item, event->button.time);
+      dragging = FALSE;
+      break;
+
+    default:
+      break;
+  }
+
+  return FALSE;
 }
 
 typedef struct 
 {
-        const gchar *filename;
-        gdouble x, y;
+  const gchar *filename;
+  gdouble x, y;
 } MonkClothes;
 
 static MonkClothes monk_clothes[] = {
-        {"gnome-tshirt.png", 30.0, 20.0},
-        {"sunglasses.png", ZENITY_CANVAS_X - 100.0 , ZENITY_CANVAS_Y - 150.0 },
-        {"surfboard.png", 30.0, ZENITY_CANVAS_Y - 200.0},
-        {"hawaii-shirt.png", ZENITY_CANVAS_X - 50.0, 20.0}
+  {"gnome-tshirt.png", 30.0, 20.0},
+  {"sunglasses.png", ZENITY_CANVAS_X - 100.0 , ZENITY_CANVAS_Y - 150.0 },
+  {"surfboard.png", 30.0, ZENITY_CANVAS_Y - 200.0},
+  {"hawaii-shirt.png", ZENITY_CANVAS_X - 50.0, 20.0}
 };
 
 static void
 zenity_create_clothes (GtkWidget *canvas_board)
 {
-        GdkPixbuf *pixbuf;
-        GnomeCanvasItem *canvas_item;
-        gchar *pixbuf_path;
-        gint i;
-
-        for (i = 0; i < G_N_ELEMENTS (monk_clothes); i++) {
-                pixbuf_path = g_strconcat (ZENITY_CLOTHES_PATH, monk_clothes[i].filename, NULL); 
-                pixbuf = gdk_pixbuf_new_from_file (pixbuf_path, NULL);
-
-                canvas_item = gnome_canvas_item_new (GNOME_CANVAS_GROUP (GNOME_CANVAS (canvas_board)->root),
-                                                     gnome_canvas_pixbuf_get_type (),
-                                                     "x", monk_clothes[i].x,
-                                                     "y", monk_clothes[i].y,
-                                                     "pixbuf", pixbuf,
-                                                     "anchor", GTK_ANCHOR_NW,
-                                                     NULL);
-                g_signal_connect (G_OBJECT (canvas_item), "event",
-                                  G_CALLBACK (zenity_move_clothes_event), NULL);
-        }
+  GdkPixbuf *pixbuf;
+  GnomeCanvasItem *canvas_item;
+  gchar *pixbuf_path;
+  gint i;
+
+  for (i = 0; i < G_N_ELEMENTS (monk_clothes); i++) {
+    pixbuf_path = g_strconcat (ZENITY_CLOTHES_PATH, monk_clothes[i].filename, NULL); 
+    pixbuf = gdk_pixbuf_new_from_file (pixbuf_path, NULL);
+
+    canvas_item = gnome_canvas_item_new (GNOME_CANVAS_GROUP (GNOME_CANVAS (canvas_board)->root),
+                                         gnome_canvas_pixbuf_get_type (),
+                                         "x", monk_clothes[i].x,
+                                         "y", monk_clothes[i].y,
+                                         "pixbuf", pixbuf,
+                                         "anchor", GTK_ANCHOR_NW,
+                                          NULL);
+    g_signal_connect (G_OBJECT (canvas_item), "event",
+                      G_CALLBACK (zenity_move_clothes_event), NULL);
+  }
 }
 
 static GtkWidget *
 zenity_create_monk (void)
 {
-        GtkWidget *canvas_board;
-        GnomeCanvasItem *canvas_item;
-        GnomeCanvasGroup *root;
-        GdkPixbuf *pixbuf;
-        GdkColor color = { 0, 0xffff, 0xffff, 0xffff };
+  GtkWidget *canvas_board;
+  GnomeCanvasItem *canvas_item;
+  GnomeCanvasGroup *root;
+  GdkPixbuf *pixbuf;
+  GdkColor color = { 0, 0xffff, 0xffff, 0xffff };
 
-        canvas_board = gnome_canvas_new ();
+  canvas_board = gnome_canvas_new ();
 
-        gnome_canvas_set_scroll_region (GNOME_CANVAS (canvas_board), 0, 0,
-                                        ZENITY_CANVAS_X, ZENITY_CANVAS_Y);
+  gnome_canvas_set_scroll_region (GNOME_CANVAS (canvas_board), 0, 0,
+                                  ZENITY_CANVAS_X, ZENITY_CANVAS_Y);
 
-        gtk_widget_set_size_request (canvas_board, ZENITY_CANVAS_X, ZENITY_CANVAS_Y);
+  gtk_widget_set_size_request (canvas_board, ZENITY_CANVAS_X, ZENITY_CANVAS_Y);
 
-        gdk_colormap_alloc_color (gtk_widget_get_colormap (GTK_WIDGET (canvas_board)),
-                                  &color, FALSE, TRUE);
+  gdk_colormap_alloc_color (gtk_widget_get_colormap (GTK_WIDGET (canvas_board)),
+                            &color, FALSE, TRUE);
 
-        gtk_widget_modify_bg (GTK_WIDGET (canvas_board), GTK_STATE_NORMAL, &color);
+  gtk_widget_modify_bg (GTK_WIDGET (canvas_board), GTK_STATE_NORMAL, &color);
 
-        pixbuf = gdk_pixbuf_new_from_file (ZENITY_CLOTHES_PATH "monk.png", NULL);
+  pixbuf = gdk_pixbuf_new_from_file (ZENITY_CLOTHES_PATH "monk.png", NULL);
 
-        canvas_item = gnome_canvas_item_new (GNOME_CANVAS_GROUP (GNOME_CANVAS (canvas_board)->root),
-                                             gnome_canvas_pixbuf_get_type (),
-                                             "x", (ZENITY_CANVAS_X / 2.0)/2.0 + 10.0,
-                                             "y", (ZENITY_CANVAS_Y / 2.0)/2.0 - 50.0,
-                                             "pixbuf", pixbuf,
-                                             "anchor", GTK_ANCHOR_NW,
-                                             NULL);
+  canvas_item = gnome_canvas_item_new (GNOME_CANVAS_GROUP (GNOME_CANVAS (canvas_board)->root),
+                                       gnome_canvas_pixbuf_get_type (),
+                                       "x", (ZENITY_CANVAS_X / 2.0)/2.0 + 10.0,
+                                       "y", (ZENITY_CANVAS_Y / 2.0)/2.0 - 50.0,
+                                       "pixbuf", pixbuf,
+                                       "anchor", GTK_ANCHOR_NW,
+                                       NULL);
 
-        zenity_create_clothes (canvas_board);
+  zenity_create_clothes (canvas_board);
 
-        return canvas_board;
+  return canvas_board;
 }
 
 static GtkWidget *
 zenity_create_boutique (void) 
 {
-        GtkWidget *window;
-        GtkWidget *canvas;
+  GtkWidget *window;
+  GtkWidget *canvas;
 
-        window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
 
-        zenity_util_set_window_icon (window, ZENITY_IMAGE_FULLPATH ("zenity.png"));
-        canvas = zenity_create_monk ();
-        gtk_container_add (GTK_CONTAINER (window), canvas);
+  zenity_util_set_window_icon (window, ZENITY_IMAGE_FULLPATH ("zenity.png"));
+  canvas = zenity_create_monk ();
+  gtk_container_add (GTK_CONTAINER (window), canvas);
 
-        return window;
+  return window;
 }
 
 static gboolean
 zenity_zen_wisdom (GtkDialog *dialog, GdkEventKey *event, gpointer user_data)
 {
-        static gint string_count;
-
-        if (string_count >= 3)
-                return FALSE;
-
-        switch (event->keyval) {
-                case GDK_N:
-                case GDK_n:
-                        if (string_count == 2) {
-                                GtkWidget *window;
-                                window = zenity_create_boutique ();
-                                gtk_widget_show_all (window);
-                                string_count++;
-                        } else {
-                                string_count = 0;
-                        }
-                        break;
-               case GDK_Z:
-               case GDK_z:
-                        if (string_count == 0)
-                                string_count++;
-                        else
-                                string_count = 0;
-                        break;
-              case GDK_E:
-              case GDK_e:
-                        if (string_count == 1)
-                                string_count++;
-                        else
-                                string_count = 0;
-                        break;
-              default:
-                        string_count = 0;
-        }
-
-        return FALSE;
+  static gint string_count;
+
+  if (string_count >= 3)
+    return FALSE;
+
+  switch (event->keyval) {
+    case GDK_N:
+    case GDK_n:
+      if (string_count == 2) {
+        GtkWidget *window;
+        window = zenity_create_boutique ();
+        gtk_widget_show_all (window);
+        string_count++;
+      } else {
+        string_count = 0;
+      }
+      break;
+    case GDK_Z:
+    case GDK_z:
+      if (string_count == 0)
+        string_count++;
+      else
+        string_count = 0;
+      break;
+    case GDK_E:
+    case GDK_e:
+      if (string_count == 1)
+        string_count++;
+      else
+        string_count = 0;
+      break;
+    default:
+      string_count = 0;
+  }
+
+  return FALSE;
 }
 
 void 
 zenity_about (ZenityData *data)
 {
-	GladeXML *glade_dialog = NULL;
-        GdkPixbuf *pixbuf;
-	GtkWidget *label;
-        GtkWidget *image;
-        gchar *text;
+  GladeXML *glade_dialog = NULL;
+  GdkPixbuf *pixbuf;
+  GtkWidget *label;
+  GtkWidget *image;
+  gchar *text;
 
-	glade_dialog = zenity_util_load_glade_file ("zenity_about_dialog");
+  glade_dialog = zenity_util_load_glade_file ("zenity_about_dialog");
 
-	if (glade_dialog == NULL) {
-		data->exit_code = -1;
-		return;
-        }
+  if (glade_dialog == NULL) {
+    data->exit_code = -1;
+    return;
+  }
 
-	translator_credits = _("translator_credits");
+  translator_credits = _("translator_credits");
 
-	glade_xml_signal_autoconnect (glade_dialog);
+  glade_xml_signal_autoconnect (glade_dialog);
 
-	dialog = glade_xml_get_widget (glade_dialog, "zenity_about_dialog");
+  dialog = glade_xml_get_widget (glade_dialog, "zenity_about_dialog");
 
-	g_signal_connect (G_OBJECT (dialog), "response",
-			  G_CALLBACK (zenity_about_dialog_response), data);
-        g_signal_connect (G_OBJECT (dialog), "key_press_event",
-                          G_CALLBACK (zenity_zen_wisdom), glade_dialog);
+  g_signal_connect (G_OBJECT (dialog), "response",
+                    G_CALLBACK (zenity_about_dialog_response), data);
+  g_signal_connect (G_OBJECT (dialog), "key_press_event",
+                    G_CALLBACK (zenity_zen_wisdom), glade_dialog);
 
-        zenity_util_set_window_icon (dialog, ZENITY_IMAGE_FULLPATH ("zenity.png"));
+  zenity_util_set_window_icon (dialog, ZENITY_IMAGE_FULLPATH ("zenity.png"));
 
-        image = glade_xml_get_widget (glade_dialog, "zenity_about_image");
+  image = glade_xml_get_widget (glade_dialog, "zenity_about_image");
 
-        pixbuf = gdk_pixbuf_new_from_file (ZENITY_IMAGE_FULLPATH ("zenity.png"), NULL);
+  pixbuf = gdk_pixbuf_new_from_file (ZENITY_IMAGE_FULLPATH ("zenity.png"), NULL);
     
-        if (pixbuf != NULL) {
-                gtk_image_set_from_pixbuf (GTK_IMAGE (image), pixbuf);
-                g_object_unref (pixbuf);
-        }
-
-	label = glade_xml_get_widget (glade_dialog, "zenity_about_version");
-        gtk_label_set_selectable (GTK_LABEL (label), FALSE);
-        text = g_strdup_printf ("<span size=\"xx-large\" weight=\"bold\">Zenity %s</span>", VERSION);
-	gtk_label_set_markup (GTK_LABEL (label), text);
-        g_free (text);
-
-        label = glade_xml_get_widget (glade_dialog, "zenity_about_description");
-        gtk_label_set_selectable (GTK_LABEL (label), FALSE);
-        gtk_label_set_text (GTK_LABEL (label), _("Display dialog boxes from shell scripts"));
-
-        label = glade_xml_get_widget (glade_dialog, "zenity_about_copyright");
-        gtk_label_set_selectable (GTK_LABEL (label), FALSE);
-        text = g_strdup_printf ("<span size=\"small\">%s</span>", _("(C) 2003 Sun Microsystems"));
-        gtk_label_set_markup (GTK_LABEL (label), text);
-        g_free (text);
-
-	if (glade_dialog)
-		g_object_unref (glade_dialog);
-
-	gtk_widget_show (dialog);
-	gtk_main ();
+  if (pixbuf != NULL) {
+    gtk_image_set_from_pixbuf (GTK_IMAGE (image), pixbuf);
+    g_object_unref (pixbuf);
+  }
+
+  label = glade_xml_get_widget (glade_dialog, "zenity_about_version");
+  gtk_label_set_selectable (GTK_LABEL (label), FALSE);
+  text = g_strdup_printf ("<span size=\"xx-large\" weight=\"bold\">Zenity %s</span>", VERSION);
+  gtk_label_set_markup (GTK_LABEL (label), text);
+  g_free (text);
+
+  label = glade_xml_get_widget (glade_dialog, "zenity_about_description");
+  gtk_label_set_selectable (GTK_LABEL (label), FALSE);
+  gtk_label_set_text (GTK_LABEL (label), _("Display dialog boxes from shell scripts"));
+
+  label = glade_xml_get_widget (glade_dialog, "zenity_about_copyright");
+  gtk_label_set_selectable (GTK_LABEL (label), FALSE);
+  text = g_strdup_printf ("<span size=\"small\">%s</span>", _("(C) 2003 Sun Microsystems"));
+  gtk_label_set_markup (GTK_LABEL (label), text);
+  g_free (text);
+
+  if (glade_dialog)
+    g_object_unref (glade_dialog);
+
+  gtk_widget_show (dialog);
+  gtk_main ();
 }
 
 static GtkWidget *
 zenity_about_create_label (void)
 {
-        GtkWidget *label;
+  GtkWidget *label;
 
-        label = gtk_label_new ("");
-        gtk_label_set_selectable (GTK_LABEL (label), TRUE);
-        gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
-        gtk_misc_set_padding (GTK_MISC (label), 8, 8);
+  label = gtk_label_new ("");
+  gtk_label_set_selectable (GTK_LABEL (label), TRUE);
+  gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
+  gtk_misc_set_padding (GTK_MISC (label), 8, 8);
 
-        gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
+  gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
 
-        return label;
+  return label;
 }
 
 static void
 zenity_about_update_author_label (GtkWidget *label)
 {
-        GString *string;
-        gchar *tmp;
-        gint i = 0;
+  GString *string;
+  gchar *tmp;
+  gint i = 0;
 
-        gtk_widget_show (label);
+  gtk_widget_show (label);
 
-        string = g_string_new ("");
+  string = g_string_new ("");
 
-        for (i = 0; author_credits[i] != NULL; i++) {
-                tmp = g_markup_escape_text (author_credits[i], -1);
-                g_string_append (string, tmp);
+  for (i = 0; author_credits[i] != NULL; i++) {
+    tmp = g_markup_escape_text (author_credits[i], -1);
+    g_string_append (string, tmp);
 
-                if (author_credits[i+1] != NULL)
-                          g_string_append (string, "\n");
+    if (author_credits[i+1] != NULL)
+      g_string_append (string, "\n");
 
-                g_free (tmp);
-        }
-        gtk_label_set_markup (GTK_LABEL (label), string->str);
-        g_string_free (string, TRUE);
+    g_free (tmp);
+  }
+  gtk_label_set_markup (GTK_LABEL (label), string->str);
+  g_string_free (string, TRUE);
 }
 
 static void
 zenity_about_update_translator_label (GtkWidget *label)
 {
-        GString *string;
-        gchar *tmp;
+  GString *string;
+  gchar *tmp;
 
-        if (strcmp (translator_credits, "translator_credits") == 0) {
-                gtk_widget_hide (label);
-                return;
-        } else {
-                gtk_widget_show (label);
-        }
+  if (strcmp (translator_credits, "translator_credits") == 0) {
+    gtk_widget_hide (label);
+    return;
+  } else {
+    gtk_widget_show (label);
+  }
 
-        string = g_string_new ("");
+  string = g_string_new ("");
 
-        tmp = g_markup_escape_text (translator_credits, -1);
-        g_string_append (string, tmp);
-        g_free (tmp);
+  tmp = g_markup_escape_text (translator_credits, -1);
+  g_string_append (string, tmp);
+  g_free (tmp);
 
-        gtk_label_set_markup (GTK_LABEL (label), string->str);
-        g_string_free (string, TRUE);
+  gtk_label_set_markup (GTK_LABEL (label), string->str);
+  g_string_free (string, TRUE);
 }
 
 static void
 zenity_about_dialog_credits_response (GtkWidget *widget, int response, gpointer data)
 {
-        gtk_widget_destroy (widget);
-        widget = NULL;
+  gtk_widget_destroy (widget);
+  widget = NULL;
 }
 
 static void
 zenity_about_display_credits_dialog (void)
 {
-        GtkWidget *credits_dialog;
-        GtkWidget *label, *notebook, *sw;
-
-        if (cred_dialog != NULL) {
-                gtk_window_present (GTK_WINDOW (cred_dialog));
-                return;
-        }
-
-        credits_dialog = gtk_dialog_new_with_buttons (_("Credits"), 
-                                                      GTK_WINDOW (dialog), GTK_DIALOG_DESTROY_WITH_PARENT,
-                                                      GTK_STOCK_OK, GTK_RESPONSE_OK, NULL);
-
-	g_signal_connect (G_OBJECT (credits_dialog), "response",
-			  G_CALLBACK (gtk_widget_destroy), credits_dialog);
-	g_signal_connect (G_OBJECT (credits_dialog), "destroy",
-			  G_CALLBACK (gtk_widget_destroyed), &cred_dialog);
-
-        cred_dialog = credits_dialog;
-
-        gtk_window_set_default_size (GTK_WINDOW (credits_dialog), 360, 260);
-        gtk_dialog_set_default_response (GTK_DIALOG (credits_dialog), GTK_RESPONSE_OK);
-
-        notebook = gtk_notebook_new ();
-        gtk_container_set_border_width (GTK_CONTAINER (notebook), 8);
-        gtk_box_pack_start (GTK_BOX (GTK_DIALOG (credits_dialog)->vbox), notebook, TRUE, TRUE, 0);
-
-        if (author_credits != NULL) {
-                label = zenity_about_create_label ();
-                sw = gtk_scrolled_window_new (NULL, NULL);
-                gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), 
-                                                GTK_POLICY_AUTOMATIC,
-                                                GTK_POLICY_AUTOMATIC);
-                gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (sw), label);
-                gtk_viewport_set_shadow_type (GTK_VIEWPORT (GTK_BIN (sw)->child), GTK_SHADOW_NONE);
-                gtk_notebook_append_page (GTK_NOTEBOOK (notebook), sw,
-                                          gtk_label_new (_("Written by")));
-                zenity_about_update_author_label (label);
-        }
-
-        if (translator_credits != NULL && strcmp (translator_credits, "translator_credits") != 0) {
-                label = zenity_about_create_label ();
-                sw = gtk_scrolled_window_new (NULL, NULL);
-                gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), 
-                                                GTK_POLICY_AUTOMATIC,
-                                                GTK_POLICY_AUTOMATIC);
-                gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (sw), label);
-                gtk_viewport_set_shadow_type (GTK_VIEWPORT (GTK_BIN (sw)->child), GTK_SHADOW_NONE);
-                gtk_notebook_append_page (GTK_NOTEBOOK (notebook), sw,
-                                          gtk_label_new (_("Translated by")));
-                zenity_about_update_translator_label (label);
-        }
-
-        gtk_widget_show_all (credits_dialog);
+  GtkWidget *credits_dialog;
+  GtkWidget *label, *notebook, *sw;
+
+  if (cred_dialog != NULL) {
+    gtk_window_present (GTK_WINDOW (cred_dialog));
+    return;
+  }
+
+  credits_dialog = gtk_dialog_new_with_buttons (_("Credits"), 
+                                                GTK_WINDOW (dialog), GTK_DIALOG_DESTROY_WITH_PARENT,
+                                                GTK_STOCK_OK, GTK_RESPONSE_OK, NULL);
+
+  g_signal_connect (G_OBJECT (credits_dialog), "response",
+                    G_CALLBACK (gtk_widget_destroy), credits_dialog);
+  g_signal_connect (G_OBJECT (credits_dialog), "destroy",
+                    G_CALLBACK (gtk_widget_destroyed), &cred_dialog);
+
+  cred_dialog = credits_dialog;
+
+  gtk_window_set_default_size (GTK_WINDOW (credits_dialog), 360, 260);
+  gtk_dialog_set_default_response (GTK_DIALOG (credits_dialog), GTK_RESPONSE_OK);
+
+  notebook = gtk_notebook_new ();
+  gtk_container_set_border_width (GTK_CONTAINER (notebook), 8);
+  gtk_box_pack_start (GTK_BOX (GTK_DIALOG (credits_dialog)->vbox), notebook, TRUE, TRUE, 0);
+       
+  if (author_credits != NULL) {
+    label = zenity_about_create_label ();
+    sw = gtk_scrolled_window_new (NULL, NULL);
+    gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), 
+                                    GTK_POLICY_AUTOMATIC,
+                                    GTK_POLICY_AUTOMATIC);
+    gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (sw), label);
+    gtk_viewport_set_shadow_type (GTK_VIEWPORT (GTK_BIN (sw)->child), GTK_SHADOW_NONE);
+    gtk_notebook_append_page (GTK_NOTEBOOK (notebook), sw,
+    gtk_label_new (_("Written by")));
+    zenity_about_update_author_label (label);
+  }
+
+  if (translator_credits != NULL && strcmp (translator_credits, "translator_credits") != 0) {
+    label = zenity_about_create_label ();
+    sw = gtk_scrolled_window_new (NULL, NULL);
+    gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), 
+                                    GTK_POLICY_AUTOMATIC,
+                                    GTK_POLICY_AUTOMATIC);
+    gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (sw), label);
+    gtk_viewport_set_shadow_type (GTK_VIEWPORT (GTK_BIN (sw)->child), GTK_SHADOW_NONE);
+    gtk_notebook_append_page (GTK_NOTEBOOK (notebook), sw,
+    gtk_label_new (_("Translated by")));
+    zenity_about_update_translator_label (label);
+  }
+
+  gtk_widget_show_all (credits_dialog);
 }
 
 static void
 zenity_about_dialog_response (GtkWidget *widget, int response, gpointer data)
 {
-        ZenityData *zen_data = data;
-        GError *error = NULL;
-
-	switch (response) {
-		case GTK_RESPONSE_OK:
-			zen_data->exit_code = 0;
-			gtk_main_quit ();
-			break;
-
-		case GTK_RESPONSE_HELP:
-                        zenity_util_show_help (ZENITY_HELP_PATH, "zenity.xml", NULL);
-			break;
-
-                case GTK_RESPONSE_CREDITS:
-                        zenity_about_display_credits_dialog ();
-                        break;
-		default:
-			/* Esc dialog */
-			zen_data->exit_code = 1;
-			break;
-	}
+  ZenityData *zen_data = data;
+  GError *error = NULL;
+
+  switch (response) {
+    case GTK_RESPONSE_OK:
+      zen_data->exit_code = 0;
+      gtk_main_quit ();
+      break;
+
+    case GTK_RESPONSE_HELP:
+      zenity_util_show_help (ZENITY_HELP_PATH, "zenity.xml", NULL);
+      break;
+
+    case GTK_RESPONSE_CREDITS:
+      zenity_about_display_credits_dialog ();
+      break;
+
+    default:
+      /* Esc dialog */
+      zen_data->exit_code = 1;
+      break;
+  }
 }