Description: use convenience function for about dialog and fix close button
Origin: other, https://bugs.launchpad.net/ubuntu/+source/atomix/+bug/173772
Author: Marshall Scorcio <marshall.scorcio@gmail.com>
Acked-By: Petter Reinholdtsen <pere@debian.org>
Reviewed-By: Guilherme de Siqueira Pastore <gpastore@debian.org>
Bug-Debian: http://bugs.debian.org/495714
Last-Update: 2012-06-17

--- atomix-2.14.0.orig/src/main.c
+++ atomix-2.14.0/src/main.c
@@ -152,8 +152,6 @@ static void verb_EditPreferences_cb (Bon
 static void verb_HelpAbout_cb (BonoboUIComponent *uic, gpointer user_data,
 			       const char *cname)
 {
-  GtkWidget *dlg;
-
   const char *authors[] =
     {
       "Guilherme de S. Pastore <gpastore@gnome.org>",
@@ -167,16 +165,15 @@ static void verb_HelpAbout_cb (BonoboUIC
       NULL
     };
 
-  dlg = gtk_about_dialog_new ();
-  gtk_about_dialog_set_name (GTK_ABOUT_DIALOG(dlg), "Atomix");
-  gtk_about_dialog_set_version (GTK_ABOUT_DIALOG(dlg), VERSION);
-  gtk_about_dialog_set_comments (GTK_ABOUT_DIALOG(dlg), _("A puzzle game about atoms and molecules"));
-  gtk_about_dialog_set_website (GTK_ABOUT_DIALOG(dlg), "http://www.gnome.org/projects/atomix");
-  gtk_about_dialog_set_authors (GTK_ABOUT_DIALOG(dlg), authors);
-  gtk_about_dialog_set_artists (GTK_ABOUT_DIALOG(dlg), artists);
-  gtk_about_dialog_set_translator_credits (GTK_ABOUT_DIALOG(dlg), _("translator-credits"));
-
-  gtk_widget_show (dlg);
+  gtk_show_about_dialog(GTK_WINDOW(app->mainwin),
+  					"program-name", _("Atomix"),
+  					"version", VERSION,
+  					"comments", _("A puzzle game about atoms and molecules"),
+  					"website", _("http://jens.triq.net/atomix.php"),
+  					"authors", authors,
+  					"artists", artists,
+  					"translator_credits", _("translator-credits"),
+  					NULL);
 }
 
 static gboolean on_app_destroy_event (GtkWidget *widget, GdkEvent *event,
