--- a/src/xs_about.c	Sun Jun 22 11:34:01 2003 +0000
+++ b/src/xs_about.c	Sun Jun 22 11:37:05 2003 +0000
@@ -22,11 +22,12 @@
 
 #include "xmms-sid.h"
 #include <gtk/gtk.h>
-/* #include "xmms-sid-logo.xpm" */
+#include "xmms-sid-logo.xpm"
 
 
 static GtkWidget *xs_aboutwin = NULL;
 
+
 int xs_about_ok(void)
 {
  gtk_widget_destroy(xs_aboutwin);
@@ -40,6 +41,15 @@
  */
 void xs_about(void)
 {
+ GtkWidget *about_vbox1;
+ GtkWidget *about_frame;
+ GtkWidget *about_logo;
+ GdkPixmap *about_logo_pixmap = NULL, *about_logo_mask = NULL;
+ GtkWidget *about_scrwin;
+ GtkWidget *about_text;
+ GtkWidget *alignment6;
+ GtkWidget *about_close;
+
  /* Check if there already is an open about window */
  if (xs_aboutwin != NULL)
  	{
@@ -48,7 +58,115 @@
 	}
 
  /* No, create one ... */	
- xs_aboutwin = create_xs_aboutwin();
+ xs_aboutwin = gtk_window_new (GTK_WINDOW_DIALOG);
+ gtk_widget_set_name (xs_aboutwin, "xs_aboutwin");
+ gtk_object_set_data (GTK_OBJECT (xs_aboutwin), "xs_aboutwin", xs_aboutwin);
+ gtk_window_set_title (GTK_WINDOW (xs_aboutwin), "About " PACKAGE_STRING);
+ gtk_window_set_modal (GTK_WINDOW (xs_aboutwin), TRUE);
+ gtk_window_set_default_size (GTK_WINDOW (xs_aboutwin), 300, -1);
+
+ about_vbox1 = gtk_vbox_new (FALSE, 0);
+ gtk_widget_set_name (about_vbox1, "about_vbox1");
+ gtk_widget_ref (about_vbox1);
+ gtk_object_set_data_full (GTK_OBJECT (xs_aboutwin), "about_vbox1", about_vbox1,
+                          (GtkDestroyNotify) gtk_widget_unref);
+ gtk_widget_show (about_vbox1);
+ gtk_container_add (GTK_CONTAINER (xs_aboutwin), about_vbox1);
+
+ about_frame = gtk_frame_new (NULL);
+ gtk_widget_set_name (about_frame, "about_frame");
+ gtk_widget_ref (about_frame);
+ gtk_object_set_data_full (GTK_OBJECT (xs_aboutwin), "about_frame", about_frame,
+                          (GtkDestroyNotify) gtk_widget_unref);
+ gtk_widget_show (about_frame);
+ gtk_box_pack_start (GTK_BOX (about_vbox1), about_frame, FALSE, FALSE, 0);
+ gtk_container_set_border_width (GTK_CONTAINER (about_frame), 4);
+ gtk_frame_set_shadow_type (GTK_FRAME (about_frame), GTK_SHADOW_OUT);
+
+ about_logo_pixmap = gdk_pixmap_create_from_xpm_d(
+ 	xs_aboutwin, &about_logo_mask, NULL, xmms_sid_logo_xpm);
+
+ about_logo = gtk_pixmap_new(about_logo_pixmap, about_logo_mask);
+ 
+ gtk_widget_set_name (about_logo, "about_logo");
+ gtk_widget_ref (about_logo);
+ gtk_object_set_data_full (GTK_OBJECT (xs_aboutwin), "about_logo", about_logo,
+                          (GtkDestroyNotify) gtk_widget_unref);
+ gtk_widget_show (about_logo);
+ gtk_container_add (GTK_CONTAINER (about_frame), about_logo);
+ gtk_misc_set_padding (GTK_MISC (about_logo), 0, 6);
+
+ about_scrwin = gtk_scrolled_window_new (NULL, NULL);
+ gtk_widget_set_name (about_scrwin, "about_scrwin");
+ gtk_widget_ref (about_scrwin);
+ gtk_object_set_data_full (GTK_OBJECT (xs_aboutwin), "about_scrwin", about_scrwin,
+                          (GtkDestroyNotify) gtk_widget_unref);
+ gtk_widget_show (about_scrwin);
+ gtk_box_pack_start (GTK_BOX (about_vbox1), about_scrwin, TRUE, TRUE, 0);
+ gtk_container_set_border_width (GTK_CONTAINER (about_scrwin), 8);
+ gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (about_scrwin), GTK_POLICY_NEVER, GTK_POLICY_ALWAYS);
+
+ about_text = gtk_text_new (NULL, NULL);
+ gtk_widget_set_name (about_text, "about_text");
+ gtk_widget_ref (about_text);
+ gtk_object_set_data_full (GTK_OBJECT (xs_aboutwin), "about_text", about_text,
+                          (GtkDestroyNotify) gtk_widget_unref);
+ gtk_widget_show (about_text);
+ gtk_container_add (GTK_CONTAINER (about_scrwin), about_text);
+ gtk_widget_set_usize (about_text, -2, 100);
+ gtk_text_insert (GTK_TEXT (about_text), NULL, NULL, NULL,
+	"Programming and design\n"
+	"\tMatti 'ccr/TNSP' Hämäläinen\n"
+	"\n"
+	"libSIDPlay created by\n"
+	"\tMichael Schwendt\n"
+	"\n"
+	"libSIDPlay2 and reSID created by\n"
+	"\tSimon White, Dag Lem,\n"
+	"\tMichael Schwendt and rest.\n"
+	"\n"
+	"Original XMMS-SID created by\n"
+	"\tWillem Monsuwe\n"
+	"\n"
+	"\"XMMS-SID Theme\"-song (SIDtune)\n"
+	"\tPeter 'Brite-Lite' Halin of Dekadence\n"
+	"\t(C) Copyright 2003 Dekadence\n"
+	"\thttp://www.dekadence64.org/\n"
+	"\n"
+	"Thanks and greetings ...\n"
+	"\tEveryone at #Linux.Fi, #Fireball,\n"
+	"\t#TNSP and #c-64 of IRCNet...\n"
+	"\n"
+	"\tPwP, iSO, Byterapers, Fairlight,\n"
+	"\tmfx, Unique, Static, Dekadence,\n"
+	"\tPHn, Creators, Cosine, tAAt ...\n"
+	"\n"
+	"Special thanks\n"
+	"\t- All the betatesters.\n"
+	"\t- All the users! Hey it's you!\n", -1);
+
+ alignment6 = gtk_alignment_new (0.5, 0.5, 0.18, 1);
+ gtk_widget_set_name (alignment6, "alignment6");
+ gtk_widget_ref (alignment6);
+ gtk_object_set_data_full (GTK_OBJECT (xs_aboutwin), "alignment6", alignment6,
+                          (GtkDestroyNotify) gtk_widget_unref);
+ gtk_widget_show (alignment6);
+ gtk_box_pack_start (GTK_BOX (about_vbox1), alignment6, FALSE, TRUE, 0);
+ gtk_container_set_border_width (GTK_CONTAINER (alignment6), 8);
+
+ about_close = gtk_button_new_with_label ("Close");
+ gtk_widget_set_name (about_close, "about_close");
+ gtk_widget_ref (about_close);
+ gtk_object_set_data_full (GTK_OBJECT (xs_aboutwin), "about_close", about_close,
+                          (GtkDestroyNotify) gtk_widget_unref);
+ gtk_widget_show (about_close);
+ gtk_container_add (GTK_CONTAINER (alignment6), about_close);
+ GTK_WIDGET_SET_FLAGS (about_close, GTK_CAN_DEFAULT);
+
+ gtk_signal_connect (GTK_OBJECT (about_close), "clicked",
+                    GTK_SIGNAL_FUNC (xs_about_ok),
+                    NULL);
+
  gtk_widget_show(xs_aboutwin);
 }