Remove includes from protocol.h that weren't used there and deal with the fallout

Testing Done:
Compiled and ran locally.  Connected with bonjour, xmpp, and irc.

Reviewed at https://reviews.imfreedom.org/r/635/

1 files changed, 0 insertions, 57 deletions

diff --git a/libpurple/protocols.h b/libpurple/protocols.h
index 06b8119bed..8794ab984b 100644
--- a/libpurple/protocols.h
+++ b/libpurple/protocols.h
@@ -39,63 +39,6 @@
 
 typedef struct _PurpleProtocolChatEntry PurpleProtocolChatEntry;
 
-/**
- * PurpleProtocolOptions:
- * @OPT_PROTO_UNIQUE_CHATNAME: User names are unique to a chat and are not
- *           shared between rooms.<sbr/>
- *           XMPP lets you choose what name you want in chats, so it shouldn't
- *           be pulling the aliases from the buddy list for the chat list; it
- *           gets annoying.
- * @OPT_PROTO_CHAT_TOPIC: Chat rooms have topics.<sbr/>
- *           IRC and XMPP support this.
- * @OPT_PROTO_NO_PASSWORD: Don't require passwords for sign-in.<sbr/>
- *           Zephyr doesn't require passwords, so there's no need for a
- *           password prompt.
- * @OPT_PROTO_MAIL_CHECK: Notify on new mail.<sbr/>
- *           MSN and Yahoo notify you when you have new mail.
- * @OPT_PROTO_PASSWORD_OPTIONAL: Allow passwords to be optional.<sbr/>
- *           Passwords in IRC are optional, and are needed for certain
- *           functionality.
- * @OPT_PROTO_USE_POINTSIZE: Allows font size to be specified in sane point
- *           size.<sbr/>
- *           Probably just XMPP and Y!M
- * @OPT_PROTO_REGISTER_NOSCREENNAME: Set the Register button active even when
- *           the username has not been specified.<sbr/>
- *           Gadu-Gadu doesn't need a username to register new account (because
- *           usernames are assigned by the server).
- * @OPT_PROTO_SLASH_COMMANDS_NATIVE: Indicates that slash commands are native
- *           to this protocol.<sbr/>
- *           Used as a hint that unknown commands should not be sent as
- *           messages.
- * @OPT_PROTO_INVITE_MESSAGE: Indicates that this protocol supports sending a
- *           user-supplied message along with an invitation.
- * @OPT_PROTO_AUTHORIZATION_GRANTED_MESSAGE: Indicates that this protocol
- *           supports sending a user-supplied message along with an
- *           authorization acceptance.
- * @OPT_PROTO_AUTHORIZATION_DENIED_MESSAGE: Indicates that this protocol
- *           supports sending a user-supplied message along with an
- *           authorization denial.
- *
- * Protocol options
- *
- * These should all be stuff that some protocols can do and others can't.
- */
-typedef enum  /*< flags >*/
-{
-	OPT_PROTO_UNIQUE_CHATNAME               = 0x00000004,
-	OPT_PROTO_CHAT_TOPIC                    = 0x00000008,
-	OPT_PROTO_NO_PASSWORD                   = 0x00000010,
-	OPT_PROTO_MAIL_CHECK                    = 0x00000020,
-	OPT_PROTO_PASSWORD_OPTIONAL             = 0x00000080,
-	OPT_PROTO_USE_POINTSIZE                 = 0x00000100,
-	OPT_PROTO_REGISTER_NOSCREENNAME         = 0x00000200,
-	OPT_PROTO_SLASH_COMMANDS_NATIVE         = 0x00000400,
-	OPT_PROTO_INVITE_MESSAGE                = 0x00000800,
-	OPT_PROTO_AUTHORIZATION_GRANTED_MESSAGE = 0x00001000,
-	OPT_PROTO_AUTHORIZATION_DENIED_MESSAGE  = 0x00002000
-
-} PurpleProtocolOptions;
-
 #include "media.h"
 #include "protocol.h"
 #include "status.h"