diff src/about.c @ 4082:4b04ecb3eb97

[gaim-migrate @ 4297] (22:54:38) Robot101: * Make sure prefs are saved before plugins are removed, and not afterwards. (22:54:59) Robot101: * Move do_quit() into aim.c and make sure everything appropriate uses it. (22:55:12) Robot101: * Remove duplicated cancel_login for closing the main window, use do_quit instead. (22:55:49) Robot101: * Remove uncalled code pertaining to closing the about window from when it was called via gaim -v. (22:56:06) LSchiere: what's this in sounds? (22:56:29) Robot101: * Add correct ifdefs to prefs so only compiled-in sound methods are shown. (22:56:34) LSchiere: if you broke my sounds... (22:57:07) Robot101: * Remove unused sound order data, and clarify comments and debug output. (22:57:56) Robot101: * Remove duplicated check which is performed at the start of play_file anyway. (22:58:03) Robot101: that's the lot committer: Tailor Script <[e-mail]>

--- a/src/about.c	Mon Dec 16 00:19:44 2002 +0000
+++ b/src/about.c	Mon Dec 16 03:58:54 2002 +0000
@@ -40,13 +40,6 @@
 	about = NULL;
 }
 
-
-static void version_exit()
-{
-	gtk_main_quit();
-}
-
-
 char *name()
 {
 	return PACKAGE;
@@ -62,7 +55,7 @@
 	return VERSION;
 }
 
-void show_about(GtkWidget *w, void *null)
+void show_about(GtkWidget *w, void *data)
 {
 	GtkWidget *vbox;
 	GtkWidget *frame;
@@ -180,18 +173,10 @@
 		button = gaim_pixbuf_button_from_stock(_("Close"), GTK_STOCK_CLOSE, GAIM_BUTTON_HORIZONTAL);
 		gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0);
 
-		if (null != (void *)2) {
-			/* 2 can be as sad as 1, it's the loneliest number since the number 1 */
-			gtk_signal_connect_object(GTK_OBJECT(button), "clicked",
-						  GTK_SIGNAL_FUNC(destroy_about), GTK_OBJECT(about));
-			gtk_signal_connect(GTK_OBJECT(about), "destroy",
+		gtk_signal_connect_object(GTK_OBJECT(button), "clicked",
+					  GTK_SIGNAL_FUNC(destroy_about), GTK_OBJECT(about));
+		gtk_signal_connect(GTK_OBJECT(about), "destroy",
 					   GTK_SIGNAL_FUNC(destroy_about), GTK_OBJECT(about));
-		} else {
-			gtk_signal_connect(GTK_OBJECT(button), "clicked",
-					   GTK_SIGNAL_FUNC(version_exit), NULL);
-			gtk_signal_connect(GTK_OBJECT(about), "destroy",
-					   GTK_SIGNAL_FUNC(version_exit), NULL);
-		}
 		gtk_widget_show(button);
 
 		/* this makes the sizes not work. */
@@ -203,6 +188,5 @@
 
 	/* Let's give'em something to talk about -- woah woah woah */
 	gtk_widget_show(about);
-
-	gdk_window_raise(about->window);
+	gtk_window_present(about);
 }