[Gaim-commits] CVS: gaim/src about.c,1.71,1.72 aim.c,1.185,1.186 away.c,1.71,1.72 buddy.c,1.325,1.326 buddy_chat.c,1.157,1.158 conversation.c,1.373,1.374 dialogs.c,1.332,1.333 multi.c,1.126,1.127 plugins.c,1.90,1.91 prefs.c,1.245,1.246 prpl.c,1.58,1.59 server.c,1.233,1.234 ui.h,1.49,1.50 util.c,1.130,1.131

[Sean E. <sea...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv31458/src

Modified Files:
	about.c aim.c away.c buddy.c buddy_chat.c conversation.c 
	dialogs.c multi.c plugins.c prefs.c prpl.c server.c ui.h 
	util.c 
Log Message:
Rob McQueen removed aol_icon() and made Gaim use the pretty png as our
default icon.  Thanks.


Index: about.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/about.c,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -d -r1.71 -r1.72
--- about.c	29 Aug 2002 21:40:06 -0000	1.71
+++ about.c	30 Aug 2002 03:13:59 -0000	1.72
@@ -95,7 +95,6 @@
 		gtk_window_set_wmclass(GTK_WINDOW(about), "about", "Gaim");
 		gtk_window_set_policy(GTK_WINDOW(about), FALSE, TRUE, TRUE);
 		gtk_widget_realize(about);
-		aol_icon(about->window);
 
 		vbox = gtk_vbox_new(FALSE, 5);
 		gtk_container_set_border_width(GTK_CONTAINER(vbox), 5);

Index: aim.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/aim.c,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -d -r1.185 -r1.186
--- aim.c	29 Aug 2002 21:40:06 -0000	1.185
+++ aim.c	30 Aug 2002 03:13:59 -0000	1.186
@@ -226,7 +226,7 @@
 	GList *tmp;
 
 	if (mainwindow) {
-		gtk_widget_show(mainwindow);
+		gtk_window_present(GTK_WINDOW(mainwindow));
 		return;
 	}
 
@@ -237,7 +237,6 @@
 			   GTK_SIGNAL_FUNC(cancel_logon), mainwindow);
 	gtk_window_set_title(GTK_WINDOW(mainwindow), _("Gaim - Login"));
 	gtk_widget_realize(mainwindow);
-	aol_icon(mainwindow->window);
 	gdk_window_set_group(mainwindow->window, mainwindow->window);
 
 	table = gtk_table_new(8, 2, FALSE);
@@ -492,6 +491,18 @@
 	GIOChannel *channel;
 	int UI_fd;
 	char name[256];
+	GList *icons = NULL;
+	GdkPixbuf *icon = NULL;
+
+	/* use the nice PNG icon for all the windows */
+	icon = gdk_pixbuf_new_from_file(DATADIR "/pixmaps/gaim.png",NULL);
+	if (icon) {
+		icons = g_list_append(icons,icon);
+		gtk_window_set_default_icon_list(icons);
+		g_object_unref(G_OBJECT(icon));
+	} else {
+		debug_printf("Failed to load icon from %s/pixmaps/gaim.png\n",DATADIR);
+	}
 
 	g_snprintf(name, sizeof(name), "%s/gaim_%s.%d", g_get_tmp_dir(), g_get_user_name(), getpid());
 
@@ -712,12 +723,9 @@
 		show_usage(0, argv[0]);
 		return 0;
 	}
-	/* show version window */
+	/* show version message */
 	if (opt_version) {
-		gtk_init(&argc, &argv);
-		load_prefs();
-		show_about(0, (void *)2);
-		gtk_main();
+		printf("Gaim %s\n",VERSION);
 		return 0;
 	}
 

Index: away.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/away.c,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -d -r1.71 -r1.72
--- away.c	29 Aug 2002 21:40:06 -0000	1.71
+++ away.c	30 Aug 2002 03:13:59 -0000	1.72
@@ -188,7 +188,6 @@
 			gtk_window_set_title(GTK_WINDOW(imaway), _("Gaim - Away!"));
 		gtk_signal_connect(GTK_OBJECT(imaway), "destroy", GTK_SIGNAL_FUNC(do_im_back), imaway);
 		gtk_widget_realize(imaway);
-		aol_icon(imaway->window);
 
 		vbox = gtk_vbox_new(FALSE, 5);
 		gtk_container_add(GTK_CONTAINER(imaway), vbox);

Index: buddy.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/buddy.c,v
retrieving revision 1.325
retrieving revision 1.326
diff -u -d -r1.325 -r1.326
--- buddy.c	29 Aug 2002 21:40:06 -0000	1.325
+++ buddy.c	30 Aug 2002 03:13:59 -0000	1.326
@@ -2661,7 +2661,6 @@
 	gtk_window_set_wmclass(GTK_WINDOW(blist), "buddy_list", "Gaim");
 
 	gtk_widget_realize(blist);
-	aol_icon(blist->window);
 
 	gtk_window_set_policy(GTK_WINDOW(blist), TRUE, TRUE, TRUE);
 

Index: buddy_chat.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/buddy_chat.c,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -d -r1.157 -r1.158
--- buddy_chat.c	29 Aug 2002 01:47:13 -0000	1.157
+++ buddy_chat.c	30 Aug 2002 03:14:00 -0000	1.158
@@ -263,7 +263,6 @@
 		gtk_signal_connect(GTK_OBJECT(joinchat), "delete_event",
 				   GTK_SIGNAL_FUNC(destroy_join_chat), joinchat);
 		gtk_window_set_title(GTK_WINDOW(joinchat), _("Join Chat"));
-		aol_icon(joinchat->window);
 
 		mainbox = gtk_vbox_new(FALSE, 5);
 		gtk_container_set_border_width(GTK_CONTAINER(mainbox), 5);
@@ -455,7 +454,6 @@
 		gtk_window_set_focus(GTK_WINDOW(invite), GTK_WIDGET(GTK_COMBO(inviteentry)->entry));
 		gtk_container_add(GTK_CONTAINER(invite), vbox);
 
-		aol_icon(invite->window);
 
 	}
 	gtk_widget_show(invite);
@@ -1184,7 +1182,6 @@
 			gtk_window_set_policy(GTK_WINDOW(win), TRUE, TRUE, FALSE);
 			gtk_container_border_width(GTK_CONTAINER(win), 0);
 			gtk_widget_realize(win);
-			aol_icon(win->window);
 			gtk_window_set_title(GTK_WINDOW(win), _("Gaim - Group Chats"));
 			gtk_signal_connect(GTK_OBJECT(win), "delete_event",
 					   GTK_SIGNAL_FUNC(delete_all_convo), NULL);
@@ -1230,7 +1227,6 @@
 		gtk_window_set_policy(GTK_WINDOW(win), TRUE, TRUE, TRUE);
 		gtk_container_border_width(GTK_CONTAINER(win), 10);
 		gtk_widget_realize(win);
-		aol_icon(win->window);
 		g_snprintf(buf, sizeof(buf), "Gaim - %s (chat)", b->name);
 		gtk_window_set_title(GTK_WINDOW(win), buf);
 		gtk_signal_connect(GTK_OBJECT(win), "destroy", GTK_SIGNAL_FUNC(close_callback), b);

Index: conversation.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/conversation.c,v
retrieving revision 1.373
retrieving revision 1.374
diff -u -d -r1.373 -r1.374
--- conversation.c	30 Aug 2002 03:04:11 -0000	1.373
+++ conversation.c	30 Aug 2002 03:14:01 -0000	1.374
@@ -2767,7 +2767,6 @@
 			gtk_window_set_policy(GTK_WINDOW(win), TRUE, TRUE, FALSE);
 			gtk_container_border_width(GTK_CONTAINER(win), 0);
 			gtk_widget_realize(win);
-			aol_icon(win->window);
 			gtk_window_set_title(GTK_WINDOW(win), _("Gaim - Conversations"));
 			gtk_signal_connect(GTK_OBJECT(win), "delete_event",
 					   GTK_SIGNAL_FUNC(delete_all_convo), NULL);
@@ -2815,7 +2814,6 @@
 		gtk_window_set_policy(GTK_WINDOW(win), TRUE, TRUE, TRUE);
 		gtk_container_border_width(GTK_CONTAINER(win), 10);
 		gtk_widget_realize(win);
-		aol_icon(win->window);
 		gtk_signal_connect(GTK_OBJECT(win), "delete_event",
 				   GTK_SIGNAL_FUNC(delete_event_convo), c);
 	}

Index: dialogs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/dialogs.c,v
retrieving revision 1.332
retrieving revision 1.333
diff -u -d -r1.332 -r1.333
--- dialogs.c	30 Aug 2002 03:04:11 -0000	1.332
+++ dialogs.c	30 Aug 2002 03:14:01 -0000	1.333
@@ -71,8 +71,6 @@
 #include "pixmaps/wink.xpm"
 #include "pixmaps/yell.xpm"
 
-#include "pixmaps/aimicon.xpm"
-
 #include "pixmaps/aol_icon.xpm"
 #include "pixmaps/free_icon.xpm"
 #include "pixmaps/dt_icon.xpm"
@@ -414,7 +412,6 @@
 			   GTK_SIGNAL_FUNC(destroy_dialog), w->window);
 	gtk_signal_connect(GTK_OBJECT(w->window), "delete_event", GTK_SIGNAL_FUNC(free_warn_data), w);
 	gtk_widget_realize(w->window);
-	aol_icon(w->window->window);
 
 	fbox = gtk_vbox_new(FALSE, 5);
 	gtk_container_add(GTK_CONTAINER(w->window), fbox);
@@ -607,7 +604,6 @@
 	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
 
 	gtk_widget_show(hbox);
-	aol_icon(d->window);
 
 	gtk_widget_show(d);
 	return d;
@@ -700,7 +696,6 @@
 
 	gtk_signal_connect(GTK_OBJECT(ok), "clicked", GTK_SIGNAL_FUNC(destroy_dialog), eedialog);
 	gtk_widget_realize(eedialog);
-	aol_icon(eedialog->window);
 
 	gtk_widget_show(eedialog);
 }
@@ -723,7 +718,6 @@
 		gtk_signal_connect(GTK_OBJECT(imdialog), "destroy",
 				   GTK_SIGNAL_FUNC(destroy_dialog), imdialog);
 		gtk_widget_realize(imdialog);
-		aol_icon(imdialog->window);
 
 		mainbox = gtk_vbox_new(FALSE, 5);
 		gtk_container_set_border_width(GTK_CONTAINER(mainbox), 5);
@@ -861,7 +855,6 @@
 	gtk_window_set_title(GTK_WINDOW(info->window), _("Gaim - Get User Info"));
 	gtk_widget_grab_focus(info->entry);
 
-	aol_icon(info->window->window);
 	gtk_widget_show_all(info->window);
 }
 
@@ -1003,7 +996,6 @@
 	gtk_container_add(GTK_CONTAINER(a->window), frame);
 	gtk_container_set_border_width(GTK_CONTAINER(a->window), 5);
 	gtk_widget_realize(a->window);
-	aol_icon(a->window->window);
 
 	gtk_widget_show(a->window);
 }
@@ -1084,7 +1076,6 @@
 	gtk_window_set_title(GTK_WINDOW(a->window), _("Gaim - Add Buddy"));
 
 	gtk_widget_realize(a->window);
-	aol_icon(a->window->window);
 	gtk_signal_connect(GTK_OBJECT(a->window), "destroy", GTK_SIGNAL_FUNC(destroy_dialog), a->window);
 	gtk_signal_connect(GTK_OBJECT(a->window), "destroy", GTK_SIGNAL_FUNC(free_dialog), a);
 	dialogwindows = g_list_prepend(dialogwindows, a->window);
@@ -1427,7 +1418,6 @@
 	gtk_window_set_title(GTK_WINDOW(pwin), _("Gaim - Privacy"));
 	gtk_signal_connect(GTK_OBJECT(pwin), "destroy", GTK_SIGNAL_FUNC(destroy_privacy), NULL);
 	gtk_widget_realize(pwin);
-	aol_icon(pwin->window);
 
 	gtk_widget_set_usize(pwin, 0, 400);
 
@@ -1692,7 +1682,6 @@
 	gtk_window_set_title(GTK_WINDOW(b->window), _("Gaim - New Buddy Pounce"));
 	gtk_signal_connect(GTK_OBJECT(b->window), "destroy", GTK_SIGNAL_FUNC(destroy_dialog), b->window);
 	gtk_widget_realize(b->window);
-	aol_icon(b->window->window);
 
 	vbox = gtk_vbox_new(FALSE, 5);
 	gtk_container_set_border_width(GTK_CONTAINER(vbox), 5);
@@ -1967,7 +1956,6 @@
 	gtk_window_set_title(GTK_WINDOW(b->window), _("Gaim - Set Dir Info"));
 	gtk_signal_connect(GTK_OBJECT(b->window), "destroy", GTK_SIGNAL_FUNC(destroy_dialog), b->window);
 	gtk_widget_realize(b->window);
-	aol_icon(b->window->window);
 
 	fbox = gtk_vbox_new(FALSE, 5);
 	gtk_container_add(GTK_CONTAINER(b->window), fbox);
@@ -2152,7 +2140,6 @@
 	gtk_window_set_title(GTK_WINDOW(b->window), _("Gaim - Password Change"));
 	gtk_signal_connect(GTK_OBJECT(b->window), "destroy", GTK_SIGNAL_FUNC(destroy_dialog), b->window);
 	gtk_widget_realize(b->window);
-	aol_icon(b->window->window);
 	dialogwindows = g_list_prepend(dialogwindows, b->window);
 
 	fbox = gtk_vbox_new(FALSE, 5);
@@ -2251,7 +2238,6 @@
 	gtk_window_set_title(GTK_WINDOW(b->window), _("Gaim - Set User Info"));
 	gtk_signal_connect(GTK_OBJECT(b->window), "destroy", GTK_SIGNAL_FUNC(destroy_dialog), b->window);
 	gtk_widget_realize(b->window);
-	aol_icon(b->window->window);
 
 	vbox = gtk_vbox_new(FALSE, 5);
 	gtk_container_set_border_width(GTK_CONTAINER(vbox), 5);
@@ -2355,7 +2341,6 @@
 		gtk_container_border_width(GTK_CONTAINER(b->window), 5);
 		gtk_widget_realize(GTK_WIDGET(b->window));
 		gtk_signal_connect(GTK_OBJECT(b->window), "destroy", GTK_SIGNAL_FUNC(info_dlg_free), b);
-		aol_icon(b->window->window);
 
 		bbox = gtk_vbox_new(FALSE, 5);
 		gtk_container_add(GTK_CONTAINER(b->window), bbox);
@@ -2545,7 +2530,6 @@
 	gtk_window_set_focus(GTK_WINDOW(p->window), p->entry);
 	gtk_container_add(GTK_CONTAINER(p->window), frame);
 	gtk_widget_realize(p->window);
-	aol_icon(p->window->window);
 
 	gtk_widget_show(p->window);
 }
@@ -2812,7 +2796,6 @@
 	gtk_container_add(GTK_CONTAINER(b->window), fbox);
 	gtk_container_border_width(GTK_CONTAINER(b->window), 5);
 	gtk_widget_realize(b->window);
-	aol_icon(b->window->window);
 
 	gtk_widget_show(b->window);
 }
@@ -2833,7 +2816,6 @@
 	gtk_window_set_policy(GTK_WINDOW(b->window), FALSE, TRUE, TRUE);
 	gtk_window_set_wmclass(GTK_WINDOW(b->window), "find_email", "Gaim");
 	gtk_widget_realize(b->window);
-	aol_icon(b->window->window);
 	dialogwindows = g_list_prepend(dialogwindows, b->window);
 	gtk_signal_connect(GTK_OBJECT(b->window), "destroy", GTK_SIGNAL_FUNC(destroy_dialog), b->window);
 	gtk_window_set_title(GTK_WINDOW(b->window), _("Gaim - Find Buddy By Email"));
@@ -2982,7 +2964,6 @@
 		b->toggle = linky;
 		b->entry = c->entry;
 		gtk_widget_realize(c->link_dialog);
-		aol_icon(c->link_dialog->window);
 
 	}
 
@@ -3100,7 +3081,6 @@
 		gtk_signal_connect(GTK_OBJECT(GTK_COLOR_SELECTION_DIALOG(fgcseld)->ok_button), "clicked",
 				   GTK_SIGNAL_FUNC(apply_color_dlg), (void *)1);
 		gtk_widget_realize(fgcseld);
-		aol_icon(fgcseld->window);
 		gtk_widget_show(fgcseld);
 		gdk_window_raise(fgcseld->window);
 		return;
@@ -3125,7 +3105,6 @@
 				   "clicked", GTK_SIGNAL_FUNC(cancel_fgcolor), c);
 
 		gtk_widget_realize(c->fg_color_dialog);
-		aol_icon(c->fg_color_dialog->window);
 	}
 
 	gtk_widget_show(c->fg_color_dialog);
@@ -3154,7 +3133,6 @@
 		gtk_signal_connect(GTK_OBJECT(GTK_COLOR_SELECTION_DIALOG(bgcseld)->ok_button), "clicked",
 				   GTK_SIGNAL_FUNC(apply_color_dlg), (void *)2);
 		gtk_widget_realize(bgcseld);
-		aol_icon(bgcseld->window);
 		gtk_widget_show(bgcseld);
 		gdk_window_raise(bgcseld->window);
 		return;
@@ -3179,7 +3157,6 @@
 				   "clicked", GTK_SIGNAL_FUNC(cancel_bgcolor), c);
 
 		gtk_widget_realize(c->bg_color_dialog);
-		aol_icon(c->bg_color_dialog->window);
 	}
 
 	gtk_widget_show(c->bg_color_dialog);
@@ -3259,7 +3236,6 @@
 		gtk_signal_connect(GTK_OBJECT(GTK_FONT_SELECTION_DIALOG(fontseld)->ok_button), "clicked",
 				   GTK_SIGNAL_FUNC(apply_font_dlg), fontseld);
 		gtk_widget_realize(fontseld);
-		aol_icon(fontseld->window);
 		gtk_widget_show(fontseld);
 		gdk_window_raise(fontseld->window);
 		return;
@@ -3291,7 +3267,6 @@
 
 		gtk_widget_realize(c->font_dialog);
 
-		aol_icon(c->font_dialog->window);
 	}
 	gtk_widget_show(c->font_dialog);
 	gdk_window_raise(c->font_dialog->window);
@@ -3510,7 +3485,6 @@
 	gtk_signal_connect(GTK_OBJECT(ca->window), "delete_event",
 			   GTK_SIGNAL_FUNC(destroy_dialog), ca->window);
 	gtk_widget_realize(ca->window);
-	aol_icon(ca->window->window);
 
 	tbox = gtk_vbox_new(FALSE, 5);
 	gtk_container_add(GTK_CONTAINER(ca->window), tbox);
@@ -3870,7 +3844,6 @@
 	gtk_container_add(GTK_CONTAINER(aliasdlg), frame);
 	gtk_container_set_border_width(GTK_CONTAINER(aliasdlg), 5);
 	gtk_widget_realize(aliasdlg);
-	aol_icon(aliasdlg->window);
 
 	gtk_widget_show(aliasdlg);
 }
@@ -3949,7 +3922,6 @@
 	gtk_object_set_user_data(GTK_OBJECT(filesel), name);
 
 	gtk_widget_realize(filesel);
-	aol_icon(filesel->window);
 	gtk_widget_show(filesel);
 
 	return;
@@ -3991,7 +3963,6 @@
 	gtk_window_set_policy(GTK_WINDOW(window), TRUE, TRUE, TRUE);
 	gtk_signal_connect(GTK_OBJECT(window), "delete_event", GTK_SIGNAL_FUNC(destroy_dialog), window);
 	gtk_widget_realize(window);
-	aol_icon(window->window);
 
 	box = gtk_vbox_new(FALSE, 5);
 	gtk_container_add(GTK_CONTAINER(window), box);
@@ -4159,7 +4130,6 @@
 	block = gtk_signal_connect(GTK_OBJECT(window), "delete_event",
 				   GTK_SIGNAL_FUNC(dont_destroy), window);
 	gtk_widget_realize(window);
-	aol_icon(window->window);
 
 	layout = gtk_imhtml_new(NULL, NULL);
 	bbox = gtk_hbox_new(FALSE, 0);
@@ -4354,7 +4324,6 @@
 		gtk_signal_connect(GTK_OBJECT(rename_dialog), "destroy",
 				   GTK_SIGNAL_FUNC(destroy_dialog), rename_dialog);
 		gtk_widget_realize(rename_dialog);
-		aol_icon(rename_dialog->window);
 
 		mainbox = gtk_vbox_new(FALSE, 5);
 		gtk_container_set_border_width(GTK_CONTAINER(mainbox), 5);
@@ -4460,7 +4429,6 @@
 		gtk_signal_connect(GTK_OBJECT(rename_bud_dialog), "destroy",
 				   GTK_SIGNAL_FUNC(destroy_dialog), rename_bud_dialog);
 		gtk_widget_realize(rename_bud_dialog);
-		aol_icon(rename_bud_dialog->window);
 
 		mainbox = gtk_vbox_new(FALSE, 5);
 		gtk_container_set_border_width(GTK_CONTAINER(mainbox), 5);
@@ -4579,21 +4547,6 @@
 
 #endif /* USE_PERL */
 
-static GdkPixmap *icon_pm = NULL;
-static GdkBitmap *icon_bm = NULL;
-
-void aol_icon(GdkWindow *w)
-{
-#ifndef _WIN32
-	if (icon_pm == NULL) {
-		icon_pm = gdk_pixmap_create_from_xpm_d(w, &icon_bm, NULL, (gchar **)aimicon_xpm);
-	}
-	gdk_window_set_icon(w, NULL, icon_pm, icon_bm);
-	if (mainwindow)
-		gdk_window_set_group(w, mainwindow->window);
-#endif
-}
-
 GtkWidget *pixbuf_button(char *text, char *iconfile)
 {
 	GtkWidget *button, *image, *label, *bbox;
@@ -5144,7 +5097,6 @@
 	/* Clean up if user dismisses window via window manager! */
 	gtk_signal_connect(GTK_OBJECT(b->window), "destroy", GTK_SIGNAL_FUNC(b->cancel), (gpointer) b);
 	gtk_widget_realize(b->window);
-	aol_icon(b->window->window);
 
 	vbox = gtk_vbox_new(FALSE, 5);
 	gtk_container_add(GTK_CONTAINER (b->window), vbox);

Index: multi.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/multi.c,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -d -r1.126 -r1.127
--- multi.c	29 Aug 2002 21:40:07 -0000	1.126
+++ multi.c	30 Aug 2002 03:14:02 -0000	1.127
@@ -756,7 +756,6 @@
 	u->mod = gtk_window_new(GTK_WINDOW_TOPLEVEL);
 	gtk_window_set_wmclass(GTK_WINDOW(u->mod), "account", "Gaim");
 	gtk_widget_realize(u->mod);
-	aol_icon(u->mod->window);
 	gtk_window_set_title(GTK_WINDOW(u->mod), _("Gaim - Modify Account"));
 	gtk_window_set_policy(GTK_WINDOW(u->mod), FALSE, TRUE, TRUE);	/* nothing odd here :) */
 	gtk_signal_connect(GTK_OBJECT(u->mod), "destroy", GTK_SIGNAL_FUNC(delmod), u);
@@ -871,7 +870,6 @@
 	gtk_container_border_width(GTK_CONTAINER(p->win), 5);
 	gtk_signal_connect(GTK_OBJECT(p->win), "destroy", GTK_SIGNAL_FUNC(pass_des), p);
 	gtk_widget_realize(p->win);
-	aol_icon(p->win->window);
 
 	frame = gtk_frame_new(_("Enter Password"));
 	gtk_container_add(GTK_CONTAINER(p->win), frame);
@@ -1014,7 +1012,6 @@
 	gtk_window_set_title(GTK_WINDOW(acctedit), _("Gaim - Account Editor"));
 	gtk_window_set_wmclass(GTK_WINDOW(acctedit), "accounteditor", "Gaim");
 	gtk_widget_realize(acctedit);
-	aol_icon(acctedit->window);
 	gtk_widget_set_usize(acctedit, -1, 200);
 	gtk_signal_connect(GTK_OBJECT(acctedit), "destroy", GTK_SIGNAL_FUNC(delete_acctedit), W);
 
@@ -1314,7 +1311,6 @@
 		gtk_container_set_border_width(GTK_CONTAINER(meter_win->window), 5);
 		gtk_window_set_title (GTK_WINDOW (meter_win->window), "Gaim Account Signon");
 		gtk_widget_realize(meter_win->window);
-		aol_icon(meter_win->window->window);
 		
 		vbox = gtk_vbox_new (FALSE, 0);
 		gtk_container_add (GTK_CONTAINER (meter_win->window), GTK_WIDGET (vbox));

Index: plugins.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/plugins.c,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -d -r1.90 -r1.91
--- plugins.c	29 Aug 2002 21:40:07 -0000	1.90
+++ plugins.c	30 Aug 2002 03:14:03 -0000	1.91
@@ -193,7 +193,6 @@
 	GAIM_DIALOG(plugwindow);
 	gtk_window_set_wmclass(GTK_WINDOW(plugwindow), "plugins", "Gaim");
 	gtk_widget_realize(plugwindow);
-	aol_icon(plugwindow->window);
 	gtk_window_set_title(GTK_WINDOW(plugwindow), _("Gaim - Plugins"));
 	gtk_signal_connect(GTK_OBJECT(plugwindow), "destroy", GTK_SIGNAL_FUNC(hide_plugins), NULL);
 

Index: prefs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/prefs.c,v
retrieving revision 1.245
retrieving revision 1.246
diff -u -d -r1.245 -r1.246
--- prefs.c	30 Aug 2002 03:04:11 -0000	1.245
+++ prefs.c	30 Aug 2002 03:14:04 -0000	1.246
@@ -1276,7 +1276,6 @@
 	prefs = gtk_window_new(GTK_WINDOW_TOPLEVEL);
 	gtk_window_set_wmclass(GTK_WINDOW(prefs), "preferences", "Gaim");
 	gtk_widget_realize(prefs);
-	aol_icon(prefs->window);
 	gtk_window_set_title(GTK_WINDOW(prefs), _("Gaim - Preferences"));
 	gtk_window_set_policy (GTK_WINDOW(prefs), FALSE, FALSE, TRUE);
 	gtk_signal_connect(GTK_OBJECT(prefs), "destroy", GTK_SIGNAL_FUNC(delete_prefs), NULL);
@@ -1405,7 +1404,6 @@
 	gtk_window_set_wmclass(GTK_WINDOW(dw->window), "debug_out", "Gaim");
 	gtk_signal_connect(GTK_OBJECT(dw->window), "delete_event", GTK_SIGNAL_FUNC(debug_delete), NULL);
 	gtk_widget_realize(dw->window);
-	aol_icon(dw->window->window);
 
 	box = gtk_hbox_new(FALSE, 0);
 	gtk_container_add(GTK_CONTAINER(dw->window), box);

Index: prpl.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/prpl.c,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- prpl.c	29 Aug 2002 01:47:14 -0000	1.58
+++ prpl.c	30 Aug 2002 03:14:04 -0000	1.59
@@ -144,7 +144,6 @@
 	gtk_window_set_policy(GTK_WINDOW(window), FALSE, TRUE, TRUE);
 	gtk_window_set_title(GTK_WINDOW(window), _("Accept?"));
 	gtk_widget_realize(window);
-	aol_icon(window->window);
 	if (dont)
 		gtk_signal_connect(GTK_OBJECT(window), "destroy", GTK_SIGNAL_FUNC(dont), data);
 
@@ -211,7 +210,6 @@
 	gtk_window_set_title(GTK_WINDOW(window), _("Gaim - Prompt"));
 	gtk_signal_connect(GTK_OBJECT(window), "destroy", GTK_SIGNAL_FUNC(des_prompt), p);
 	gtk_widget_realize(window);
-	aol_icon(window->window);
 
 	vbox = gtk_vbox_new(FALSE, 5);
 	gtk_container_set_border_width(GTK_CONTAINER(vbox), 5);
@@ -431,7 +429,6 @@
 	gtk_window_set_title(GTK_WINDOW(mn->email_win), _("Gaim - New Mail"));
 	gtk_signal_connect(GTK_OBJECT(mn->email_win), "destroy", GTK_SIGNAL_FUNC(des_email_win), mn);
 	gtk_widget_realize(mn->email_win);
-	aol_icon(mn->email_win->window);
 
 	vbox = gtk_vbox_new(FALSE, 5);
 	gtk_container_set_border_width(GTK_CONTAINER(vbox), 5);
@@ -670,7 +667,6 @@
 	gtk_window_set_title(GTK_WINDOW(regdlg), _("Gaim - Registration"));
 	gtk_window_set_wmclass(GTK_WINDOW(regdlg), "register", "Gaim");
 	gtk_widget_realize(regdlg);
-	aol_icon(regdlg->window);
 	gtk_signal_connect(GTK_OBJECT(regdlg), "destroy", GTK_SIGNAL_FUNC(delete_regdlg), NULL);
 
 	vbox = gtk_vbox_new(FALSE, 5);

Index: server.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/server.c,v
retrieving revision 1.233
retrieving revision 1.234
diff -u -d -r1.233 -r1.234
--- server.c	29 Aug 2002 21:40:08 -0000	1.233
+++ server.c	30 Aug 2002 03:14:05 -0000	1.234
@@ -887,7 +887,6 @@
 
 	d = gtk_dialog_new();
 	gtk_widget_realize(d);
-	aol_icon(d->window);
 
 
 	label = gtk_label_new(buf2);
@@ -1069,7 +1068,6 @@
 	gtk_signal_connect(GTK_OBJECT(window), "destroy", GTK_SIGNAL_FUNC(des_popup), window);
 	gtk_object_set_user_data(GTK_OBJECT(window), url);
 	gtk_widget_realize(window);
-	aol_icon(window->window);
 
 	vbox = gtk_vbox_new(FALSE, 5);
 	gtk_container_add(GTK_CONTAINER(window), vbox);

Index: ui.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/ui.h,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- ui.h	30 Aug 2002 03:04:12 -0000	1.49
+++ ui.h	30 Aug 2002 03:14:05 -0000	1.50
@@ -448,7 +448,6 @@
 extern void show_rename_group(GtkWidget *, struct group *);
 extern void show_rename_buddy(GtkWidget *, struct buddy *);
 extern void load_perl_script();
-extern void aol_icon(GdkWindow *);
 extern GtkWidget *picture_button(GtkWidget *, char *, char **);
 extern GtkWidget *picture_button2(GtkWidget *, char *, char **, short);
 extern GtkWidget *pixbuf_button(char *, char *);

Index: util.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/util.c,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -d -r1.130 -r1.131
--- util.c	29 Aug 2002 01:47:14 -0000	1.130
+++ util.c	30 Aug 2002 03:14:05 -0000	1.131
@@ -770,7 +770,8 @@
 {
 	switch (mode) {
 	case 0:		/* full help text */
-		printf("Usage: %s [OPTION]...\n\n"
+		printf("Gaim %s\n"
+		       "Usage: %s [OPTION]...\n\n"
 		       "  -a, --acct          display account editor window\n"
 		       "  -w, --away[=MESG]   make away on signon (optional argument MESG specifies\n"
 		       "                      name of away message to use)\n"
@@ -779,11 +780,11 @@
 		       "  -u, --user=NAME     use account NAME\n"
 		       "  -f, --file=FILE     use FILE as config\n"
 		       "  -d, --debug         print debugging messages to stdout\n"
-		       "  -v, --version       display version information window\n"
-		       "  -h, --help          display this help and exit\n", name);
+		       "  -v, --version       display the current version and exit\n"
+		       "  -h, --help          display this help and exit\n", VERSION, name);
 		break;
 	case 1:		/* short message */
-		printf("Try `%s -h' for more information.\n", name);
+		printf("Gaim %s. Try `%s -h' for more information.\n", VERSION, name);
 		break;
 	}
 }