Mercurial > pidgin.yaz

--- a/src/protocols/napster/napster.c	Thu Sep 06 01:37:51 2001 +0000
+++ b/src/protocols/napster/napster.c	Thu Sep 06 02:16:05 2001 +0000
@@ -22,7 +22,6 @@
 #include <config.h>

 #include <netdb.h>
-#include <gtk/gtk.h>
 #include <unistd.h>
 #include <errno.h>
 #include <netinet/in.h>
@@ -34,9 +33,6 @@
 #include <time.h>
 #include <sys/socket.h>
 #include <sys/stat.h>
-#include <sys/types.h>
-#include <fcntl.h>
-#include <ctype.h>
 #include "multi.h"
 #include "prpl.h"
 #include "gaim.h"
@@ -49,58 +45,19 @@

 static unsigned int chat_id = 0;

-struct search_window {
-	GtkWidget *window;
-	GtkWidget *list;
-};
-
-struct browse_window {
-	GtkWidget *window;
-	GtkWidget *list;
-	struct gaim_connection *gc;
-	char *name;
-};
-
-struct nap_download_box {
-	GtkWidget *window;
-	GtkWidget *ok;
-	GtkWidget *entry;
-	gchar *who;
-};
-
 struct nap_channel {
 	unsigned int id;
 	gchar *name;
 };

-struct nap_file_request {
-	gchar *name;
-	gchar *file;
-	int fd;
-	long size;
-	long total;
-	int status;
-	int inpa;
-	FILE *mp3;
-	GtkWidget *window;
-	GtkWidget *progress;
-	GtkWidget *ok;
-	GtkWidget *cancel;
-	struct gaim_connection *gc;
-};
-
 struct nap_data {
 	int fd;
 	int inpa;

 	gchar *email;
 	GSList *channels;
-	GSList *requests;
-	GSList *browses;
 };

-static struct search_window *search_dialog = NULL;
-
 static char *nap_name()
 {
 	return "Napster";
@@ -114,107 +71,10 @@
 	unsigned short size;

 	size = strlen(message);
+
 	write(ndata->fd, &size, 2);
 	write(ndata->fd, &command, 2);
 	write(ndata->fd, message, size);
-
-}
-
-static void nap_send_download_req(struct gaim_connection *gc, char *who, char *file)
-{
-	struct nap_data *ndata = (struct nap_data *)gc->proto_data;
-	gchar buf[NAP_BUF_LEN];
-
-	g_snprintf(buf, NAP_BUF_LEN, "%s \"%s\"", who, file);
-
-	printf("%s\n", buf);
-	printf("%d\n", ndata->fd);
-	nap_write_packet(gc, 0xCB, buf);
-}
-
-// FIXME: These next two windows should really be together
-// and should use the same clist style look too.
-
-static void nap_handle_download(GtkCList *clist, gint row, gint col, GdkEventButton *event, gpointer user_data)
-{
-	gchar *results;
-	struct browse_window *bw = (struct browse_window *)user_data;
-
-	gtk_clist_get_text(GTK_CLIST(clist), row, 0, &results);
-
-	nap_send_download_req(bw->gc, bw->name, results);
-
-}
-
-static void nap_handle_download_search(GtkCList *clist, gint row, gint col, GdkEventButton *event, gpointer user_data)
-{
-	gchar *filename;
-	gchar *nick;
-
-	struct gaim_connection *gc = (struct gaim_connection *)user_data;
-
-	filename = (gchar *)gtk_clist_get_row_data(GTK_CLIST(clist), row);
-
-	gtk_clist_get_text(GTK_CLIST(clist), row, 1, &nick);
-
-	printf("Trying to download: %s from %s\n", filename, nick);
-	nap_send_download_req(gc, nick, filename);
-}
-
-static struct browse_window *browse_window_new(struct gaim_connection *gc, char *name)
-{
-	struct browse_window *browse = g_new0(struct browse_window, 1);
-	struct nap_data *ndata = (struct nap_data *)gc->proto_data;
-
-	browse->window = gtk_window_new(GTK_WINDOW_DIALOG);
-	browse->name = g_strdup(name);
-	browse->list = gtk_clist_new(1);
-	browse->gc = gc;
-
-	gtk_widget_show(browse->list);
-	gtk_container_add(GTK_CONTAINER(browse->window), browse->list);
-
-	gtk_widget_set_usize(GTK_WIDGET(browse->window), 300, 250);
-	gtk_widget_show(browse->window);
-
-	/*FIXME: I dont like using select-row.  Im lazy. Ill fix it later */
-	gtk_signal_connect(GTK_OBJECT(browse->list), "select-row", GTK_SIGNAL_FUNC(nap_handle_download), browse);
-
-	ndata->browses = g_slist_append(ndata->browses, browse);
-
-	return browse;
-}
-
-static void browse_window_add_file(struct browse_window *bw, char *name)
-{
-	char *fn[1];
-	fn[0] = strdup(name);
-	printf("User '%s' has file '%s'\n", bw->name, name);
-	gtk_clist_append(GTK_CLIST(bw->list), fn);
-
-	free(fn[0]);
-}
-
-static struct browse_window *find_browse_window_by_name(struct gaim_connection *gc, char *name)
-{
-	struct browse_window *browse;
-	struct nap_data *ndata = (struct nap_data *)gc->proto_data;
-	GSList *browses;
-
-	browses = ndata->browses;
-
-	while (browses) {
-		browse = (struct browse_window *)browses->data;
-
-		if (browse) {
-			if (!g_strcasecmp(name, browse->name)) {
-				return browse;
-			}
-		}
-		browses = g_slist_next(browses);
-	}
-
-	return NULL;
 }

 static int nap_send_im(struct gaim_connection *gc, char *who, char *message, int away)
@@ -286,240 +146,6 @@
 	return b;
 }

-/* This is a strange function.  I smoke too many bad bad things :-) */
-static struct nap_file_request * find_request_by_fd(struct gaim_connection *gc, int fd)
-{
-	struct nap_file_request *req;
-	struct nap_data *ndata = (struct nap_data *)gc->proto_data;
-	GSList *requests;
-
-	requests = ndata->requests;
-
-	while (requests) {
-		req = (struct nap_file_request *)requests->data;
-
-		if (req) {
-			if (req->fd == fd)
-				return req;
-		}
-		requests = g_slist_next(requests);
-	}
-
-	return NULL;
-}
-
-static void nap_ctc_callback(gpointer data, gint source, GaimInputCondition condition)
-{
-	struct gaim_connection *gc = (struct gaim_connection *)data;
-	struct nap_data *ndata = (struct nap_data *)gc->proto_data;
-	struct nap_file_request *req;
-	unsigned char *buf;
-	int i = 0;
-
-	req = find_request_by_fd(gc, source);
-	if (!req) /* Something bad happened */
-		return;
-
-	buf = (char *)malloc(sizeof(char) * (NAP_BUF_LEN + 1));
-
-	if (req->status == 0)
-	{
-		int j;
-		gchar tmp[32];
-		long filesize;
-		gchar **parse_name;
-		gchar path[2048];
-		GtkWidget *hbox;
-		GtkWidget *vbox;
-		GtkWidget *label;
-		gchar *buf2;
-
-		recv(source, buf, 1, 0);
-
-		/* We should receive a '1' upon connection */
-		if (buf[0] != '1')
-		{
-			do_error_dialog("Uh Oh", "Uh Oh");
-			gaim_input_remove(req->inpa);
-			ndata->requests = g_slist_remove(ndata->requests, req);
-			g_free(req->name);
-			g_free(req->file);
-			close(source);
-			g_free(req);
-			free(buf);
-			return;
-		}
-
-		/* Lets take a peek at the awaiting data */
-		i = recv(source, buf, NAP_BUF_LEN, MSG_PEEK);
-		buf[i] = 0; /* Make sure that we terminate our string */
-
-		/* Looks like the uploader sent the proper data. Let's see how big the
-		 * file is */
-
-		for (j = 0, i = 0; isdigit(buf[i]); i++, j++)
-		{
-			tmp[j] = buf[i];
-		}
-		tmp[j] = 0;
-		filesize = atol(tmp);
-
-		/* Save the size of the file */
-		req->total = filesize;
-
-		/* If we have a zero file size then something bad happened */
-		if (filesize == 0) {
-			gaim_input_remove(req->inpa);
-			ndata->requests = g_slist_remove(ndata->requests, req);
-			g_free(req->name);
-			g_free(req->file);
-			g_free(req);
-			free(buf);
-			close(source);
-			return;
-		}
-
-		/* Now that we've done that, let's go ahead and read that
-		 * data to get it out of the way */
-		recv(source, buf, strlen(tmp), 0);
-
-		/* Now, we should tell the server that we're download something */
-		nap_write_packet(gc, 0xda, "\n");
-
-		req->status = 1;
-
-		/* FIXME: We dont want to force the file name.  I'll parse this
-		 * later */
-
-		parse_name = g_strsplit(req->file, "\\", 0);
-		g_snprintf(path, sizeof(path), "%s/%s", getenv("HOME"), parse_name[sizeof(parse_name)]);
-		printf("Gonna try to save to: %s\n", path);
-		g_strfreev(parse_name);
-
-		req->mp3 = fopen(path, "w");
-
-		req->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-
-		vbox = gtk_vbox_new(FALSE, 5);
-
-		buf2 = (gchar *)g_malloc(sizeof(gchar) * (strlen(req->file) + 33));
-		g_snprintf(buf2, strlen(req->file) + 32, "Downloading File: %s", req->file);
-		label = gtk_label_new(buf2);
-		gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 5);
-
-		req->progress = gtk_progress_bar_new();
-		gtk_progress_bar_update(GTK_PROGRESS_BAR(req->progress), 0);
-		gtk_progress_configure(GTK_PROGRESS(req->progress), 0, 0, (float)req->total/(float)1024);
-		gtk_progress_set_format_string(GTK_PROGRESS(req->progress), "%P%% (%VKB / %UKB)");
-		gtk_progress_set_show_text(GTK_PROGRESS(req->progress), TRUE);
-		gtk_box_pack_start(GTK_BOX(vbox), req->progress, FALSE, FALSE, 5);
-
-		hbox = gtk_hbox_new(TRUE, 5);
-
-		req->ok = gtk_button_new_with_label("Ok");
-		req->cancel = gtk_button_new_with_label("Cancel");
-
-		gtk_box_pack_end(GTK_BOX(hbox), req->cancel, FALSE, FALSE, 5);
-		gtk_box_pack_end(GTK_BOX(hbox), req->ok, FALSE, FALSE, 5);
-
-		gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 5);
-
-		gtk_container_add(GTK_CONTAINER(req->window), vbox);
-
-		gtk_widget_show_all(req->window);
-
-		free(buf);
-		return;
-	}
-
-	/* Looks like our status isn't 1.  It's safe to assume we're downloadin' */
-	i = recv(source, buf, NAP_BUF_LEN, 0);
-
-	req->size += i; /* Lets add up the total */
-
-//	printf("Downloaded %ld of %ld (%f)\n", req->size, req->total, (float)req->size/(float)req->total);
-
-	gtk_progress_bar_update(GTK_PROGRESS_BAR(req->progress), (float)req->size/(float)req->total);
-
-	while (gtk_events_pending())
-		gtk_main_iteration();
-
-	fwrite(buf, i, sizeof(char), req->mp3);
-
-	free(buf);
-
-	if (req->size >= req->total) {
-		printf("Download complete.\n");
-		nap_write_packet(gc, 0xdb, "\n"); /* Tell the server we're finished */
-		gaim_input_remove(req->inpa);
-
-		ndata->requests = g_slist_remove(ndata->requests, req);
-
-		if (req->name != NULL)
-			g_free(req->name);
-
-		if (req->file != NULL)
-			g_free(req->file);
-
-		g_free(req);
-		fclose(req->mp3);
-		close(source);
-	}
-}
-
-static void nap_get_file_connect(gpointer data, gint source, GaimInputCondition cond)
-{
-	char buf[NAP_BUF_LEN];
-	struct nap_file_request *req = data;
-	struct gaim_connection *gc = req->gc;
-	struct nap_data *ndata = (struct nap_data *)gc->proto_data;
-
-	if (source < 0) {
-		do_error_dialog("Error connecting to user", "Gaim: Napster error");
-		g_free(req->name);
-		g_free(req->file);
-		g_free(req);
-		return;
-	}
-
-	if (req->fd != source)
-		req->fd = source;
-
-	send(req->fd, "GET", 3, 0);
-
-	/* Send our request to the user */
-	g_snprintf(buf, sizeof(buf), "%s \"%s\" 0", gc->username, req->file);
-
-	send(req->fd, buf, strlen(buf), 0);
-
-	/* Add our request */
-	ndata->requests = g_slist_append(ndata->requests, req);
-
-	/* And start monitoring */
-	req->inpa = gaim_input_add(req->fd, GAIM_INPUT_READ, nap_ctc_callback, gc);
-}
-
-static void nap_get_file(struct gaim_connection *gc, gchar *user, gchar *file, gchar *host, unsigned int port)
-{
-	struct nap_file_request *req = g_new0(struct nap_file_request, 1);
-
-	req->name = g_strdup(user);
-	req->file = g_strdup(file);
-	req->size = 0;
-	req->status = 0;
-	req->total = 0;
-	req->gc = gc;
-
-	/* Make a connection with the server */
-	req->fd = proxy_connect(host, port, nap_get_file_connect, req);
-	if (req->fd < 0) {
-		do_error_dialog("Error connecting to user", "Gaim: Napster error");
-		g_free(req->name);
-		g_free(req->file);
-		g_free(req);
-	}
-}
-
 static void nap_callback(gpointer data, gint source, GaimInputCondition condition)
 {
 	struct gaim_connection *gc = data;
@@ -529,33 +155,47 @@
 	int len;
 	int command;
 	gchar **res;
+	int i;

-	recv(source, header, 4, 0);
-//	read(source, header, 4);
+	if (recv(source, header, 4, 0) != 4) {
+		hide_login_progress(gc, "Unable to read");
+		signoff(gc);
+		return;
+	}
+
 	len = header[0];
 	command = header[1];

 	buf = (gchar *)g_malloc(sizeof(gchar) * (len + 1));

-//	read(source, buf, len);
-	recv(source, buf, len, 0);
+	i = 0;
+	do {
+		int tmp = recv(source, buf + i, len - i, 0);
+		if (tmp <= 0) {
+			g_free(buf);
+			hide_login_progress(gc, "Unable to read");
+			signoff(gc);
+			return;
+		}
+		i += tmp;
+	} while (i != len);

 	buf[len] = 0;

-	printf("DEBUG: %s\n", buf);
+	debug_printf("DEBUG: %s\n", buf);

 	if (command == 0xd6) {
 		res = g_strsplit(buf, " ", 0);
 		/* Do we want to report what the users are doing? */
 		printf("users: %s, files: %s, size: %sGB\n", res[0], res[1], res[2]);
 		g_strfreev(res);
-		free(buf);
+		g_free(buf);
 		return;
 	}

 	if (command == 0x26d) {
 		/* Do we want to use the MOTD? */
-		free(buf);
+		g_free(buf);
 		return;
 	}

@@ -563,7 +203,7 @@
 		res = g_strsplit(buf, " ", 1);
 		serv_got_im(gc, res[0], res[1], 0, time((time_t)NULL));
 		g_strfreev(res);
-		free(buf);
+		g_free(buf);
 		return;
 	}

@@ -585,7 +225,7 @@
 			serv_got_joined_chat(gc, chat_id, buf);
 		}

-		free(buf);
+		g_free(buf);
 		return;
 	}

@@ -603,7 +243,7 @@

 		g_strfreev(res);

-		free(buf);
+		g_free(buf);
 		return;
 	}

@@ -620,7 +260,7 @@
 		remove_chat_buddy(convo, res[1]);

 		g_strfreev(res);
-		free(buf);
+		g_free(buf);
 		return;
 	}

@@ -636,13 +276,13 @@
 			serv_got_chat_in(gc, channel->id, res[1], 0, res[2], time((time_t)NULL));

 		g_strfreev(res);
-		free(buf);
+		g_free(buf);
 		return;
 	}

 	if (command == 0x194) {
 		do_error_dialog(buf, "Gaim: Napster Error");
-		free(buf);
+		g_free(buf);
 		return;
 	}

@@ -652,7 +292,7 @@
 		g_snprintf(buf2, NAP_BUF_LEN, "Unable to add '%s' to your hotlist", buf);
 		do_error_dialog(buf2, "Gaim: Napster Error");

-		free(buf);
+		g_free(buf);
 		return;

 	}
@@ -668,7 +308,7 @@
 		serv_got_chat_left(gc, channel->id);
 		ndata->channels = g_slist_remove(ndata->channels, channel);

-		free(buf);
+		g_free(buf);
 		return;

 	}
@@ -681,159 +321,33 @@
 		serv_got_update(gc, res[0], 1, 0, 0, 0, 0, 0);

 		g_strfreev(res);
-		free(buf);
+		g_free(buf);
 		return;
 	}

 	if (command == 0xd2) {
 		serv_got_update(gc, buf, 0, 0, 0, 0, 0, 0);
-		free(buf);
-		return;
-	}
-
-	if (command == 0xd4) {
-		/* Looks like we're getting a browse response */
-		gchar user[64];
-		gchar file[2048];
-		struct browse_window *bw = NULL;
-
-		int i,j;
-
-		for (i = 0, j = 0; buf[i] != ' '; i++, j++)
-		{
-			user[j] = buf[i];
-		}
-		user[j] = 0; i++; i++;
-
-		for (j = 0; buf[i] != '\"'; i++, j++)
-		{
-			file[j] = buf[i];
-		}
-		file[j] = 0;
-
-		bw = find_browse_window_by_name(gc, user);
-		if (!bw)
-		{
-			/* If a browse window isn't found, let's create one */
-			bw = browse_window_new(gc, user);
-		}
-
-		browse_window_add_file(bw, file);
-
-		free(buf);
-		return;
-
-	}
-
-	if (command == 0xc9) {
-		/* We've received a search response */
-		gchar *file = (gchar *)g_malloc(sizeof(gchar) * (NAP_BUF_LEN+1));
-		gchar *tmp;
-		gchar rest[NAP_BUF_LEN];
-		gchar *data[5];
-		gchar **parse_name;
-
-		int i, j;
-
-		for (i = 1, j = 0; ((buf[i] != '\"') && (buf[i] != 0)); i++, j++)
-		{
-			file[j] = buf[i];
-		}
-
-		file[j] = 0; i++;
-
-		tmp = (gchar *)g_malloc(sizeof(gchar) * (strlen(file) + 1));
-		strcpy(tmp, rindex(file, '\\')+1);
-
-		strcpy(rest, buf+i);
-
-		parse_name = g_strsplit(rest, " ", 0);
-
-		data[0] = g_strdup(tmp);
-		data[1] = g_strdup(parse_name[6]);
-		data[2] = g_strdup(parse_name[2]);
-		data[3] = g_strdup(parse_name[3]);
-		data[4] = g_strdup(parse_name[8]);
-
-//		printf("File: %s, 1: %s, 2: %s, 3: %s\n", data[0], data[1], data[2], data[3]);
-		i = gtk_clist_append(GTK_CLIST(search_dialog->list), data);
-
-		gtk_clist_set_row_data(GTK_CLIST(search_dialog->list), i, file);
-		g_strfreev(parse_name);
-	//	g_free(file);
-		g_free(tmp);
-		g_free(buf);
-		return;
-	}
-
-	if (command == 0xca)
-	{
-		/* End of search */
 		g_free(buf);
 		return;
 	}

 	if (command == 0x12d) {
 		/* Our buddy was added successfully */
-		free(buf);
+		g_free(buf);
 		return;
 	}

 	if (command == 0x2ec) {
 		/* Looks like someone logged in as us! =-O */
-		free(buf);
+		g_free(buf);

 		signoff(gc);
 		return;
 	}

-	if (command == 0xcc) {
-		/* We received a Download ACK from a user.  The way this is printed is kind of
-		 * strange so we'll need to parse this one ourselves.  */
-
-		gchar user[64];
-		gchar file[2048];
-		gchar hoststr[16];
-		gchar portstr[16];
-		int i,j;
-
-		for (i = 0, j = 0; buf[i] != ' '; i++, j++)
-		{
-			user[j] = buf[i];
-		}
-		user[j] = 0; i++;
-
-		for (j = 0; buf[i] != ' '; i++, j++)
-		{
-			hoststr[j] = buf[i];
-		}
-		hoststr[j] = 0; i++;
+	debug_printf("NAP: [COMMAND: 0x%04x] %s\n", command, buf);

-		for (j = 0; buf[i] != ' '; i++, j++)
-		{
-			portstr[j] = buf[i];
-		}
-		portstr[j] = 0; i++;
-
-		i++; /* We do this to ignore the first quotation mark */
-
-		for (j = 0; buf[i] != '\"'; i++, j++)
-		{
-			file[j] = buf[i];
-		}
-		file[j] = 0;
-
-		/* Aaight.  We dont need nuttin' else. Let's download the file */
-		nap_get_file(gc, user, file, hoststr, atoi(portstr));
-
-		free(buf);
-
-		return;
-	}
-
-	printf("NAP: [COMMAND: 0x%04x] %s\n", command, buf);
-
-	free(buf);
+	g_free(buf);
 }


@@ -1001,8 +515,6 @@
 {
 	struct nap_data *ndata = (struct nap_data *)gc->proto_data;
 	struct nap_channel *channel;
-	struct browse_window *browse;
-	struct nap_file_request *req;

 	if (gc->inpa)
 		gaim_input_remove(gc->inpa);
@@ -1014,27 +526,7 @@
 		g_free(channel);
 	}

-	while (ndata->browses) {
-		browse = (struct browse_window *)ndata->browses->data;
-		g_free(browse->name);
-		gtk_widget_destroy(browse->window);
-		ndata->browses = g_slist_remove(ndata->browses, browse);
-		g_free(browse);
-	}
-
-	while (ndata->requests) {
-		req = (struct nap_file_request *)ndata->requests->data;
-		g_free(req->name);
-		g_free(req->file);
-		if (req->inpa) {
-			gaim_input_remove(req->inpa);
-		}
-		ndata->requests = g_slist_remove(ndata->requests, req);
-		g_free(req);
-
-	}
-
-	free(gc->proto_data);
+	g_free(gc->proto_data);
 }

 static void nap_add_buddies(struct gaim_connection *gc, GList *buddies)
@@ -1045,145 +537,6 @@
 	}
 }

-static void nap_draw_new_user(GtkWidget *box)
-{
-	GtkWidget *label;
-
-	label = gtk_label_new(_("Napster registration is currently under development"));
-
-	gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
-	gtk_box_pack_start(GTK_BOX(box), label, FALSE, FALSE, 5);
-	gtk_widget_show(label);
-}
-
-
-static void nap_send_browse(struct gaim_connection *gc, char *who)
-{
-	gchar buf[NAP_BUF_LEN];
-
-	g_snprintf(buf, NAP_BUF_LEN, "%s", who);
-	nap_write_packet(gc, 0xd3, buf);
-}
-
-static void nap_find_callback(GtkObject *w, GtkWidget *entry)
-{
-	struct gaim_connection *gc = (struct gaim_connection *)gtk_object_get_user_data(w);
-	const gchar *search;
-	gchar buf[NAP_BUF_LEN];
-
-	search = gtk_entry_get_text(GTK_ENTRY(entry));
-	g_snprintf(buf, NAP_BUF_LEN, "FILENAME CONTAINS \"%s\" MAX_RESULTS 50", search);
-
-	nap_write_packet(gc, 0xc8, buf);
-}
-
-static void destroy_window(GtkObject *w, GtkWidget *win)
-{
-	gtk_widget_destroy(win);
-}
-
-static void nap_show_search(struct gaim_connection *gc, char *omit)
-{
-	if (!search_dialog)
-	{
-		GtkWidget *window;
-		GtkWidget *sw;
-		GtkWidget *vbox;
-		GtkWidget *hbox;
-		GtkWidget *label;
-		GtkWidget *button;
-		GtkWidget *entry;
-		GtkWidget *list;
-		gchar *titles[5] = {"Mp3 Name", "Nick", "Size", "Bitrate", "Connection"};
-		search_dialog = g_new0(struct search_window, 1);
-
-		window = gtk_window_new(GTK_WINDOW_DIALOG);
-
-		vbox = gtk_vbox_new(FALSE, 0);
-
-		/* First Line */
-		hbox = gtk_hbox_new(FALSE, 5);
-		label = gtk_label_new("Search for:");
-		gtk_widget_show(label);
-		gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 5);
-
-		entry = gtk_entry_new();
-		gtk_widget_show(entry);
-		gtk_box_pack_start(GTK_BOX(hbox), entry, FALSE, FALSE, 5);
-
-		button = gtk_button_new_with_label("Find");
-		gtk_widget_show(button);
-		gtk_object_set_user_data(GTK_OBJECT(button), gc);
-		gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(nap_find_callback), entry);
-
-		gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 5);
-
-		button = gtk_button_new_with_label("Cancel");
-		gtk_widget_show(button);
-		gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 5);
-
-
-		gtk_widget_show(hbox);
-		gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 5);
-		/* End First List */
-
-		/* Second Line */
-
-		sw = gtk_scrolled_window_new(NULL, NULL);
-
-		list = gtk_clist_new_with_titles(5, titles);
-
-		gtk_clist_column_titles_show(GTK_CLIST(list));
-
-		gtk_signal_connect(GTK_OBJECT(list), "select-row", GTK_SIGNAL_FUNC(nap_handle_download_search), gc);
-
-		gtk_container_add(GTK_CONTAINER(sw), list);
-		gtk_widget_show(list);
-
-		gtk_box_pack_start(GTK_BOX(vbox), sw, FALSE, FALSE, 5);
-
-		gtk_widget_show(sw);
-
-		/* End Second Line */
-
-		gtk_widget_show(vbox);
-
-		gtk_container_add(GTK_CONTAINER(window), vbox);
-		gtk_container_set_border_width(GTK_CONTAINER(window), 10);
-
-		gtk_widget_set_usize(GTK_WIDGET(list), 500, 350);
-		gtk_widget_set_usize(GTK_WIDGET(window), 500, 400);
-
-		gtk_signal_connect(GTK_OBJECT(window), "destroy", GTK_SIGNAL_FUNC(destroy_window), window);
-		gtk_widget_show(window);
-
-		search_dialog->window = window;
-		search_dialog->list = list;
-	}
-
-	gtk_widget_show(search_dialog->window);
-}
-
-static GList *nap_buddy_menu(struct gaim_connection *gc, char *who)
-{
-	GList *m = NULL;
-	struct proto_buddy_menu *pbm;
-
-	pbm = g_new0(struct proto_buddy_menu, 1);
-	pbm->label = _("Browse Files");
-	pbm->callback = nap_send_browse;
-	pbm->gc = gc;
-	m = g_list_append(m, pbm);
-
-	pbm = g_new0(struct proto_buddy_menu, 1);
-	pbm->label = _("Search Napster");
-	pbm->callback = nap_show_search;
-	pbm->gc = gc;
-	m = g_list_append(m, pbm);
-
-	return m;
-}
-
 static char** nap_list_icon(int uc)
 {
 	return napster_xpm;
@@ -1196,7 +549,6 @@
 	ret->protocol = PROTO_NAPSTER;
 	ret->name = nap_name;
 	ret->list_icon = nap_list_icon;
-	ret->buddy_menu = nap_buddy_menu;
 	ret->user_opts = NULL;
 	ret->login = nap_login;
 	ret->close = nap_close;
@@ -1225,7 +577,6 @@
 	ret->chat_whisper = NULL;
 	ret->chat_send = nap_chat_send;
 	ret->keepalive = NULL;
-	ret->draw_new_user = nap_draw_new_user;

 	my_protocol = ret;
 }