Mercurial > pidgin
diff libpurple/conversation.h @ 24847:b2206f3b8b24
merge of '665a07783e325291cdd356dacf8f394fb18f0031'
and '814d53152c168c9c4732b3d084260711d536fba6'
| author | Kevin Stange <kevin@simguy.net> |
|---|---|
| date | Fri, 19 Dec 2008 08:10:19 +0000 |
| parents | d8452c0bec7b |
| children | 584063555949 9ea6842536ba |
line wrap: on
line diff
--- a/libpurple/conversation.h Sat Dec 06 19:57:58 2008 +0000 +++ b/libpurple/conversation.h Fri Dec 19 08:10:19 2008 +0000 @@ -84,7 +84,7 @@ PURPLE_CONV_UPDATE_TITLE, PURPLE_CONV_UPDATE_CHATLEFT, - PURPLE_CONV_UPDATE_FEATURES, /**< The features for a chat have changed */ + PURPLE_CONV_UPDATE_FEATURES /**< The features for a chat have changed */ } PurpleConvUpdateType; @@ -126,7 +126,7 @@ PURPLE_MESSAGE_NOTIFY = 0x2000, /**< Message is a notification */ PURPLE_MESSAGE_NO_LINKIFY = 0x4000, /**< Message should not be auto- linkified @since 2.1.0 */ - PURPLE_MESSAGE_INVISIBLE = 0x8000, /**< Message should not be displayed */ + PURPLE_MESSAGE_INVISIBLE = 0x8000 /**< Message should not be displayed */ } PurpleMessageFlags; /** @@ -139,7 +139,7 @@ PURPLE_CBFLAGS_HALFOP = 0x0002, /**< Half-op */ PURPLE_CBFLAGS_OP = 0x0004, /**< Channel Op or Moderator */ PURPLE_CBFLAGS_FOUNDER = 0x0008, /**< Channel Founder */ - PURPLE_CBFLAGS_TYPING = 0x0010, /**< Currently typing */ + PURPLE_CBFLAGS_TYPING = 0x0010 /**< Currently typing */ } PurpleConvChatBuddyFlags;