# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1151877126 0
# Node ID b986b6e2441b637c824b8a7914e721ad926aad77
# Parent  4e44ecb866bddf1d95018360025066ef58dd1938
[gaim-migrate @ 16400]
part of sf patch #1490646, from Jonty Wareing & Jono Cole

"The user can now specify their AIM and Jabber ID in the
preferences"

committer: Tailor Script <tailor@pidgin.im>

diff -r 4e44ecb866bd -r b986b6e2441b src/protocols/bonjour/bonjour.c
--- a/src/protocols/bonjour/bonjour.c	Sun Jul 02 09:37:25 2006 +0000
+++ b/src/protocols/bonjour/bonjour.c	Sun Jul 02 21:52:06 2006 +0000
@@ -127,8 +127,8 @@
 	bd->dns_sd_data->phsh = g_strdup("");
 	bd->dns_sd_data->email = g_strdup(gaim_account_get_string(account, "email", ""));
 	bd->dns_sd_data->vc = g_strdup("");
-	bd->dns_sd_data->jid = g_strdup("");
-	bd->dns_sd_data->AIM = g_strdup("");
+	bd->dns_sd_data->jid = g_strdup(gaim_account_get_string(account, "jid", ""));
+	bd->dns_sd_data->AIM = g_strdup(gaim_account_get_string(account, "AIM", ""));
 
 	status = gaim_account_get_active_status(account);
 	presence = gaim_account_get_presence(account);
@@ -588,6 +588,12 @@
 	option = gaim_account_option_string_new(_("E-mail"), "email", "");
 	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 
+	option = gaim_account_option_string_new(_("AIM Account"), "AIM", "");
+	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
+
+	option = gaim_account_option_string_new(_("Jabber Account"), "jid", "");
+	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
+
 	my_protocol = plugin;
 }
 
diff -r 4e44ecb866bd -r b986b6e2441b src/protocols/bonjour/dns_sd.c
--- a/src/protocols/bonjour/dns_sd.c	Sun Jul 02 09:37:25 2006 +0000
+++ b/src/protocols/bonjour/dns_sd.c	Sun Jul 02 21:52:06 2006 +0000
@@ -251,11 +251,19 @@
 	sw_text_record_add_key_and_string_value(dns_data, "port.p2pj", BONJOUR_DEFAULT_PORT);
 	sw_text_record_add_key_and_string_value(dns_data, "phsh", data->phsh);
 	sw_text_record_add_key_and_string_value(dns_data, "status", data->status);
-	sw_text_record_add_key_and_string_value(dns_data, "msg", data->msg);
-	sw_text_record_add_key_and_string_value(dns_data, "email", data->email);
 	sw_text_record_add_key_and_string_value(dns_data, "vc", data->vc);
-	sw_text_record_add_key_and_string_value(dns_data, "jid", data->jid);
-	sw_text_record_add_key_and_string_value(dns_data, "AIM", data->AIM);
+
+	if ((data->email != NULL) && (*data->email != '\0'))
+		sw_text_record_add_key_and_string_value(dns_data, "email", data->email);
+
+	if ((data->jid != NULL) && (*data->jid != '\0'))
+		sw_text_record_add_key_and_string_value(dns_data, "jid", data->jid);
+
+	if ((data->AIM != NULL) && (*data->AIM != '\0'))
+		sw_text_record_add_key_and_string_value(dns_data, "AIM", data->AIM);
+
+	if ((data->msg != NULL) && (*data->msg != '\0'))
+		sw_text_record_add_key_and_string_value(dns_data, "msg", data->msg);
 
 	/* Publish the service */
 	switch (type)