# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1083206551 0
# Node ID ad3633f92f9172971666ca39305e03fa8d2e6506
# Parent  ea2e2119b135070bbc4e1d1ee4d902e7c742db9f
[gaim-migrate @ 9609]
Just clean up one or four things.

committer: Tailor Script <tailor@pidgin.im>

diff -r ea2e2119b135 -r ad3633f92f91 src/protocols/rendezvous/mdns.c
--- a/src/protocols/rendezvous/mdns.c	Wed Apr 28 05:14:20 2004 +0000
+++ b/src/protocols/rendezvous/mdns.c	Thu Apr 29 02:42:31 2004 +0000
@@ -36,6 +36,14 @@
  * One Eyed Willie.
  */
 
+/*
+ * XXX - Store data for NULL ResourceRecords so that rr->rdata contains
+ * both the length and the data. This length will always be equal to
+ * rr->rdlength... but it fits in more with the rest of the code.
+ * rr->rdata should not need a separate length value to determine
+ * how many bytes it will take.
+ */
+
 #include "internal.h"
 #include "debug.h"
 
diff -r ea2e2119b135 -r ad3633f92f91 src/protocols/rendezvous/mdns_cache.c
--- a/src/protocols/rendezvous/mdns_cache.c	Wed Apr 28 05:14:20 2004 +0000
+++ b/src/protocols/rendezvous/mdns_cache.c	Thu Apr 29 02:42:31 2004 +0000
@@ -24,7 +24,6 @@
  */
 
 #include "internal.h"
-#include "debug.h"
 
 #include "mdns.h"
 #include "mdns_cache.h"
@@ -59,7 +58,6 @@
 
 	mdns_cache_remove(rr->name, rr->type);
 
-	printf("caching %d\n", rr->type);
 	new = mdns_copy_rr(rr);
 	rrs = g_slist_prepend(rrs, new);
 }
@@ -94,12 +92,10 @@
 	ResourceRecord *cur;
 
 	g_return_if_fail(q != NULL);
-	printf("query for q->type=%d, q->name=%s\n", q->type, q->name);
 
 	for (slist = rrs; slist != NULL; slist = slist->next) {
 		cur = slist->data;
 		if (((q->type == RENDEZVOUS_RRTYPE_ALL) || (q->type == cur->type)) && (!strcmp(q->name, cur->name))) {
-			printf("responding to cur->type=%d, cur->name=%s\n", cur->type, cur->name);
 			mdns_send_rr(fd, cur);
 		}
 	}
diff -r ea2e2119b135 -r ad3633f92f91 src/protocols/rendezvous/rendezvous.c
--- a/src/protocols/rendezvous/rendezvous.c	Wed Apr 28 05:14:20 2004 +0000
+++ b/src/protocols/rendezvous/rendezvous.c	Thu Apr 29 02:42:31 2004 +0000
@@ -599,60 +599,7 @@
 
 static GaimPlugin *my_protocol = NULL;
 
-static GaimPluginProtocolInfo prpl_info =
-{
-	GAIM_PRPL_API_VERSION,
-	OPT_PROTO_NO_PASSWORD | OPT_PROTO_BUDDY_ICON,
-	NULL,
-	NULL,
-	rendezvous_prpl_list_icon,
-	rendezvous_prpl_list_emblems,
-	rendezvous_prpl_status_text,
-	rendezvous_prpl_tooltip_text,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	rendezvous_prpl_login,
-	rendezvous_prpl_close,
-	rendezvous_prpl_send_im,
-	NULL,
-	NULL,
-	NULL,
-	rendezvous_prpl_set_away,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL
-};
+static GaimPluginProtocolInfo prpl_info;
 
 static GaimPluginInfo info =
 {
@@ -687,20 +634,31 @@
 	GaimAccountOption *option;
 	char hostname[255];
 
+	prpl_info.api_version	= GAIM_PRPL_API_VERSION;
+	prpl_info.options		= OPT_PROTO_NO_PASSWORD | OPT_PROTO_BUDDY_ICON;
+	prpl_info.list_icon		= rendezvous_prpl_list_icon;
+	prpl_info.list_emblems	= rendezvous_prpl_list_emblems;
+	prpl_info.status_text	= rendezvous_prpl_status_text;
+	prpl_info.tooltip_text	= rendezvous_prpl_tooltip_text;
+	prpl_info.login			= rendezvous_prpl_login;
+	prpl_info.close			= rendezvous_prpl_close;
+	prpl_info.send_im		= rendezvous_prpl_send_im;
+	prpl_info.set_away		= rendezvous_prpl_set_away;
+
 	if (gethostname(hostname, 255) != 0) {
 		gaim_debug_warning("rendezvous", "Error %d when getting host name.  Using \"localhost.\"\n", errno);
 		strcpy(hostname, "localhost");
 	}
 
 	/* Try to avoid making this configurable... */
-	split = gaim_account_user_split_new(_("Host Name"), hostname, '@');
+	split = gaim_account_user_split_new(_("Host name"), hostname, '@');
 	prpl_info.user_splits = g_list_append(prpl_info.user_splits, split);
 
-	option = gaim_account_option_string_new(_("First Name"), "first", "Gaim");
+	option = gaim_account_option_string_new(_("First name"), "first", "Gaim");
 	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options,
 											   option);
 
-	option = gaim_account_option_string_new(_("Last Name"), "last", _("User"));
+	option = gaim_account_option_string_new(_("Last name"), "last", _("User"));
 	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options,
 											   option);