diff -ur -X /home/gaimdev/dontdiff gaim-xmms-remote-cvs.rw/configure.ac gaim-xmms-remote-cvs.rw-stu/configure.ac
--- gaim-xmms-remote-cvs.rw/configure.ac	2004-05-27 08:41:44.000000000 -0400
+++ gaim-xmms-remote-cvs.rw-stu/configure.ac	2004-05-27 10:14:22.000000000 -0400
@@ -72,13 +72,13 @@
 CPPFLAGS="-I$result/../ -I$result -I$result/win32 $CPPFLAGS"
 
 AC_ARG_ENABLE(debug,   [  --enable-debug          compile with debugging support],,enable_debug=no)
-AC_ARG_ENABLE(deprecated,	[ --disable-deprecated	compile without deprecated API usage],,enable_deprecated=no)
+AC_ARG_ENABLE(deprecated,	[ --disable-deprecated	compile without deprecated API usage],,enable_deprecated=yes)
 
 if test "x$enable_debug" = "xyes" ; then
 	AC_DEFINE(DEBUG, 1, [Define if debugging is enabled.])
 fi
 
-if text "x$enable_deprecated" = "xno"; then
+if test "x$enable_deprecated" = "xno"; then
 	DEBUG_CFLAGS="$DEBUG_CFLAGS -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"
 fi
 AC_SUBST(DEBUG_CFLAGS)
@@ -136,7 +136,7 @@
 echo Using Gaim source from.........: $with_gaim
 echo;
 echo Debugging enabled..............: $enable_debug
-echo Deprecated API disabled........: $enable_deprecated
+echo Deprecated API enabled.........: $enable_deprecated
 echo;
 echo Type make to compile
 echo;
diff -ur -X /home/gaimdev/dontdiff gaim-xmms-remote-cvs.rw/src/gaim-xmms-remote.c gaim-xmms-remote-cvs.rw-stu/src/gaim-xmms-remote.c
--- gaim-xmms-remote-cvs.rw/src/gaim-xmms-remote.c	2004-05-27 08:41:44.000000000 -0400
+++ gaim-xmms-remote-cvs.rw-stu/src/gaim-xmms-remote.c	2004-05-27 10:34:08.000000000 -0400
@@ -273,7 +273,7 @@
 gxr_add_button(GaimConversation *conv) {
 	GaimGtkConversation *gtkconv = GAIM_GTK_CONVERSATION(conv);
 	GaimConversationType type = gaim_conversation_get_type(conv);
-	GtkWidget *button;
+	GtkWidget *button = NULL;
 
 	if(type != GAIM_CONV_IM && type != GAIM_CONV_CHAT)
 		return;
@@ -286,14 +286,15 @@
 	   !gaim_prefs_get_bool("/plugins/gtk/amc_grim/gaim-xmms-remote/chat"))
 		return;
 
-	
 	button = gaim_gtk_change_text("XMMS", button, GXR_STOCK_XMMS, 
 								  gaim_conversation_get_type(conv));
 	gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
+	gtk_tooltips_set_tip(gtkconv->tooltips, button,
+						 "XMMS Control", NULL);
 	g_object_set_data(G_OBJECT(button), "conv", conv);
 
 	g_signal_connect(G_OBJECT(button), "clicked",
-					 G_CALLBACK(gxr_button_clicked_cb), NULL);
+					 G_CALLBACK(gxr_button_clicked_cb), (gpointer)conv);
 
 
 	buttons = g_list_append(buttons, (gpointer)button);
@@ -384,8 +385,11 @@
 			gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
 
 			gtkconv = GAIM_GTK_CONVERSATION(conv);
+			gtk_tooltips_set_tip(gtkconv->tooltips, button,
+								 "XMMS Control", NULL);
 			gtk_box_pack_start(GTK_BOX(gtkconv->bbox), button, FALSE, FALSE, 0);
 
+			g_object_set_data(G_OBJECT(button), "conv", conv);
 			g_signal_connect(G_OBJECT(button), "clicked",
 							 G_CALLBACK(gxr_button_clicked_cb),
 							 (gpointer)conv);
@@ -412,7 +416,14 @@
 			gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
 
 			gtkconv = GAIM_GTK_CONVERSATION(conv);
+			gtk_tooltips_set_tip(gtkconv->tooltips, button,
+								 "XMMS Control", NULL);
 			gtk_box_pack_start(GTK_BOX(gtkconv->bbox), button, FALSE, FALSE, 0);
+
+			g_object_set_data(G_OBJECT(button), "conv", conv);
+			g_signal_connect(G_OBJECT(button), "clicked",
+							 G_CALLBACK(gxr_button_clicked_cb),
+							 (gpointer)conv);
 		}
 	}
 }