diff options
author | Ankit Vani <a@nevitus.org> | 2014-05-20 10:36:58 +0530 |
---|---|---|
committer | Ankit Vani <a@nevitus.org> | 2014-05-20 10:36:58 +0530 |
commit | f2a0c1c4bff77f5ef1fd2a9c0c8d287f19b78c6b (patch) | |
tree | 84188e69c677093254e4f45c3550ce6bb08c70a7 /libpurple/protocols.h | |
parent | a86f54176f3e3c8affac0f6265c3caf8a1bd4153 (diff) | |
parent | 7ac6d2be2a78f658560651f8c0035d0a80905313 (diff) | |
download | pidgin-f2a0c1c4bff77f5ef1fd2a9c0c8d287f19b78c6b.tar.gz |
Merged default branch
Diffstat (limited to 'libpurple/protocols.h')
-rw-r--r-- | libpurple/protocols.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/libpurple/protocols.h b/libpurple/protocols.h index 2cec0f9962..fdeb9e2b25 100644 --- a/libpurple/protocols.h +++ b/libpurple/protocols.h @@ -78,8 +78,6 @@ typedef struct _PurpleProtocolChatEntry PurpleProtocolChatEntry; * password prompt. * @OPT_PROTO_MAIL_CHECK: Notify on new mail.<sbr/> * MSN and Yahoo notify you when you have new mail. - * @OPT_PROTO_IM_IMAGE: Images in IMs.<sbr/> - * Oscar lets you send images in direct IMs. * @OPT_PROTO_PASSWORD_OPTIONAL: Allow passwords to be optional.<sbr/> * Passwords in IRC are optional, and are needed for certain * functionality. @@ -113,7 +111,6 @@ typedef enum /*< flags >*/ OPT_PROTO_CHAT_TOPIC = 0x00000008, OPT_PROTO_NO_PASSWORD = 0x00000010, OPT_PROTO_MAIL_CHECK = 0x00000020, - OPT_PROTO_IM_IMAGE = 0x00000040, OPT_PROTO_PASSWORD_OPTIONAL = 0x00000080, OPT_PROTO_USE_POINTSIZE = 0x00000100, OPT_PROTO_REGISTER_NOSCREENNAME = 0x00000200, |