# HG changeset patch
# User Jeffrey Connelly <jaconnel@calpoly.edu>
# Date 1186965791 0
# Node ID 2b26ba483d87f3fb3246c27d21332c6782f5d9e5
# Parent  1d243e70db359dfe4850f243eefe0bc3ac5c8851
Conditionally compile out a few advanced configuration options (status text
and emoticon translation) to keep things simple.

diff -r 1d243e70db35 -r 2b26ba483d87 libpurple/protocols/myspace/myspace.c
--- a/libpurple/protocols/myspace/myspace.c	Mon Aug 13 00:38:43 2007 +0000
+++ b/libpurple/protocols/myspace/myspace.c	Mon Aug 13 00:43:11 2007 +0000
@@ -4031,14 +4031,18 @@
 	option = purple_account_option_int_new(_("Connect port"), "port", MSIM_PORT);
 	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 
+#ifdef MSIM_USER_WANTS_TO_CONFIGURE_STATUS_TEXT
 	option = purple_account_option_bool_new(_("Show display name in status text"), "show_display_name", TRUE);
 	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 
 	option = purple_account_option_bool_new(_("Show headline in status text"), "show_headline", TRUE);
 	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
-
+#endif
+
+#ifdef MSIM_USER_WANTS_TO_DISABLE_EMOTICONS
 	option = purple_account_option_bool_new(_("Send emoticons"), "emoticons", FALSE);
 	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
+#endif
 
 #ifdef MSIM_USER_REALLY_CARES_ABOUT_PRECISE_FONT_SIZES
 	option = purple_account_option_int_new(_("Screen resolution (dots per inch)"), "dpi", MSIM_DEFAULT_DPI);