# HG changeset patch
# User Eric Warmenhoven <eric@warmenhoven.org>
# Date 1008877919 0
# Node ID 8aa87902383997e5ecb5475d5625bef28eb16f98
# Parent  966f623dbd3586459fdb9bfd95194d8d88377ebb
[gaim-migrate @ 2915]
someone complained that this didn't look pretty. SO I REMOVED IT! WHO'S COMPLAINING NOW!

committer: Tailor Script <tailor@pidgin.im>

diff -r 966f623dbd35 -r 8aa879023839 src/about.c
--- a/src/about.c	Thu Dec 20 19:23:40 2001 +0000
+++ b/src/about.c	Thu Dec 20 19:51:59 2001 +0000
@@ -32,10 +32,8 @@
 #include "pixmaps/logo.xpm"
 #include "pixmaps/cancel.xpm"
 #include "pixmaps/about_small.xpm"
-#include "pixmaps/panic.xpm"
 
 static GtkWidget *about = NULL;
-static GtkWidget *help = NULL;
 
 static void destroy_about()
 {
@@ -175,70 +173,3 @@
 
 	gdk_window_raise(about->window);
 }
-
-static void destroy_help()
-{
-	if (help)
-		gtk_widget_destroy(help);
-	help = NULL;
-}
-
-void gaim_help(GtkWidget *w, void *x)
-{
-	GtkWidget *vbox;
-	GdkPixmap *pm;
-	GdkBitmap *bm;
-	GtkWidget *pix;
-	GtkWidget *label;
-	GtkWidget *hbox;
-	GtkWidget *close;
-
-	if (!help) {
-
-		help = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-		gtk_window_set_title(GTK_WINDOW(help), "Gaim Help");
-		gtk_window_set_wmclass(GTK_WINDOW(help), "help", "Gaim");
-		gtk_window_set_policy(GTK_WINDOW(help), FALSE, TRUE, TRUE);
-		gtk_widget_realize(help);
-		aol_icon(help->window);
-		gtk_signal_connect(GTK_OBJECT(help), "destroy",
-				   GTK_SIGNAL_FUNC(destroy_help), GTK_OBJECT(help));
-		gtk_widget_set_usize(help, 315, -1);
-
-		vbox = gtk_vbox_new(FALSE, 10);
-		gtk_container_add(GTK_CONTAINER(help), vbox);
-
-		hbox = gtk_hbox_new(FALSE, 10);
-		gtk_box_pack_end(GTK_BOX(vbox), hbox, FALSE, FALSE, 5);
-
-		close = picture_button(help, _("Close"), cancel_xpm);
-		gtk_box_pack_end(GTK_BOX(hbox), close, FALSE, FALSE, 5);
-		gtk_signal_connect(GTK_OBJECT(close), "clicked", GTK_SIGNAL_FUNC(destroy_help), NULL);
-
-		pm = gdk_pixmap_create_from_xpm_d(help->window, &bm, NULL, panic_xpm);
-		pix = gtk_pixmap_new(pm, bm);
-		gdk_pixmap_unref(pm);
-		gdk_bitmap_unref(bm);
-		gtk_box_pack_start(GTK_BOX(vbox), pix, FALSE, FALSE, 5);
-
-		label = gtk_label_new(_("Relax, help is just around the corner. "
-					"The first thing you'll need to do is get an AIM "
-					"account; you can get one from http://aim.aol.com/. "
-					"Just click the button that says \"New Users\" and "
-					"you can create an account that way. Once you have "
-					"your account, enter the username and password into "
-					"the login window that comes up when you start Gaim, "
-					"and click the Signon button. Once you're online, "
-					"you can talk to one of the Gaim developers for more "
-					"assistance; their contact information is in the "
-					"AUTHORS file in the Gaim source, or at "
-					WEBSITE "contactinfo.php. If you can't get online and "
-					"still need more assistance, feel free to email us "
-					"at gaim@marko.net. Thanks for using Gaim!"));
-		gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
-		gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT);
-		gtk_box_pack_end(GTK_BOX(vbox), label, FALSE, FALSE, 5);
-	}
-
-	gtk_widget_show_all(help);
-}
diff -r 966f623dbd35 -r 8aa879023839 src/aim.c
--- a/src/aim.c	Thu Dec 20 19:23:40 2001 +0000
+++ b/src/aim.c	Thu Dec 20 19:51:59 2001 +0000
@@ -330,7 +330,7 @@
 	gtk_box_pack_start(GTK_BOX(sbox), hbox, TRUE, TRUE, 0);
 	gtk_widget_show(hbox);
 
-	reg = gtk_button_new_with_label(_("Help"));
+	reg = gtk_button_new_with_label(_("About"));
 	options = gtk_button_new_with_label(_("Options"));
 #ifdef GAIM_PLUGINS
 	plugs = gtk_button_new_with_label(_("Plugins"));
@@ -343,7 +343,7 @@
 #endif
 	}
 
-	gtk_signal_connect(GTK_OBJECT(reg), "clicked", GTK_SIGNAL_FUNC(gaim_help), NULL);
+	gtk_signal_connect(GTK_OBJECT(reg), "clicked", GTK_SIGNAL_FUNC(show_about), NULL);
 	gtk_signal_connect(GTK_OBJECT(options), "clicked", GTK_SIGNAL_FUNC(show_prefs), NULL);
 #ifdef GAIM_PLUGINS
 	gtk_signal_connect(GTK_OBJECT(plugs), "clicked", GTK_SIGNAL_FUNC(show_plugins), NULL);