--- trunk/src/main.c	2009/12/03 16:44:44	227
+++ trunk/src/main.c	2009/12/03 20:07:13	228
@@ -1140,75 +1140,9 @@
 
 /******************** begin of menu *********************/
 
-typedef struct {
-  appdata_t *appdata;
-  GtkWidget *dialog;
-} about_context_t;
-
-#ifdef ENABLE_BROWSER_INTERFACE
-void on_paypal_button_clicked(GtkButton *button, about_context_t *context) {
-  gtk_dialog_response(GTK_DIALOG(context->dialog), GTK_RESPONSE_ACCEPT); 
-  browser_url(context->appdata, 
-	      "https://www.paypal.com/cgi-bin/webscr"
-	      "?cmd=_s-xclick&hosted_button_id=7400558");
-}
-#endif
-
 static void 
 cb_menu_about(GtkWidget *window, gpointer data) {
-  about_context_t context;
-
-  context.appdata = (appdata_t *)data;
-
-#ifdef ENABLE_LIBLOCATION
-  char *uses = "uses liblocation";
-#elif defined(ENABLE_GPSBT)
-  char *uses = "uses gpsbt and gpsd";
-#else
-  char *uses = "uses gpsd";
-#endif
-  
-  const gchar *authors[] = {
-    "Till Harbaum <till@harbaum.org>",
-    "John Stowers <john.stowers@gmail.com>",
-    "GCVote: Guido Wegener <guido.wegener@gmx.de>",
-    NULL };
-
-  context.dialog = g_object_new(GTK_TYPE_ABOUT_DIALOG,
-			"name", "GPXView",
-			"version", VERSION,
-			"copyright", _("Copyright 2008-2009"),
-			"authors", authors,		
-			"website", _("http://www.harbaum.org/till/maemo"),
-			"comments", _(uses),
-			NULL);
-
-#ifdef ENABLE_BROWSER_INTERFACE
-  /* add a way to donate to the project */
-  GtkWidget *alignment = gtk_alignment_new(0.5, 0, 0, 0);
-  
-  GtkWidget *hbox = gtk_hbox_new(FALSE, 8);
-  gtk_box_pack_start(GTK_BOX(hbox),
-		     gtk_label_new(_("Do you like GPXView?")), 
-		     FALSE, FALSE, 0);
-
-  GtkWidget *button = gtk_button_new();
-  gtk_button_set_image(GTK_BUTTON(button), 
-		       icon_get_widget(ICON_MISC, 5));
-  gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
-  g_signal_connect(button, "clicked", 
-		   G_CALLBACK(on_paypal_button_clicked), &context); 
-  gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
-
-  gtk_container_add(GTK_CONTAINER(alignment), hbox);
-  gtk_box_pack_start_defaults(GTK_BOX((GTK_DIALOG(context.dialog))->vbox),
-			      alignment);
-
-  gtk_widget_show_all(alignment);
-#endif
-
-  gtk_dialog_run(GTK_DIALOG(context.dialog));
-  gtk_widget_destroy(context.dialog);
+  about_box((appdata_t*)data);
 }
 
 #if defined(USE_MAEMO) && defined(HILDON_HELP)