pidgin: 7674ddc7: Remove the commas at the end of enumerat...

rekkanoryo at pidgin.im rekkanoryo at pidgin.im
Thu Dec 11 03:46:14 EST 2008


-----------------------------------------------------------------
Revision: 7674ddc7cd8cc44708f19acbd479542bdb18391a
Ancestor: 5782905cd80df759d9e2bc08c800621412e9e0ab
Author: florian at instantbird.org
Date: 2008-12-11T06:32:05
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/7674ddc7cd8cc44708f19acbd479542bdb18391a

Modified files:
        libpurple/blist.h libpurple/cmds.h libpurple/connection.h
        libpurple/conversation.h
        libpurple/protocols/bonjour/bonjour_ft.h
        libpurple/protocols/msn/contact.h
        libpurple/protocols/msn/servconn.h
        libpurple/protocols/msn/slpcall.h
        libpurple/protocols/msn/switchboard.h
        libpurple/protocols/qq/buddy_info.c
        libpurple/protocols/qq/buddy_info.h
        libpurple/protocols/qq/buddy_opt.c
        libpurple/protocols/qq/buddy_opt.h
        libpurple/protocols/qq/group.h
        libpurple/protocols/qq/group_info.h
        libpurple/protocols/qq/group_join.c
        libpurple/protocols/qq/im.h
        libpurple/protocols/qq/qq_define.h
        libpurple/protocols/qq/qq_process.h
        libpurple/protocols/qq/qq_trans.c
        libpurple/protocols/sametime/sametime.c
        libpurple/protocols/silc10/wb.c
        libpurple/protocols/yahoo/yahoochat.c
        libpurple/protocols/yahoo/ycht.h
        libpurple/protocols/zephyr/zephyr.c libpurple/prpl.h
        libpurple/smiley.c

ChangeLog: 

Remove the commas at the end of enumerator lists.  This resolves warnings
when building libpurple within the Mozilla build system that turn into errors
if the compiler is switched to a C++ compiler.  Fixes #7717.

-------------- next part --------------
============================================================
--- libpurple/blist.h	bf3c1e82378df0cd3ed3a9e4c03a5d65c0857c73
+++ libpurple/blist.h	fc4989f2603e3ddba69dc06bfe316c6bf1f3a617
@@ -71,7 +71,7 @@ typedef enum
 
 typedef enum
 {
-	PURPLE_BLIST_NODE_FLAG_NO_SAVE      = 1 << 0, /**< node should not be saved with the buddy list */
+	PURPLE_BLIST_NODE_FLAG_NO_SAVE      = 1 << 0 /**< node should not be saved with the buddy list */
 
 } PurpleBlistNodeFlags;
 
============================================================
--- libpurple/cmds.h	033a4a99a2f13b5cf8fced0037a1dbb81b4c169b
+++ libpurple/cmds.h	cdbf3f9ee14393b410b170eb3fc3b7997b8e9114
@@ -38,7 +38,7 @@ typedef enum _PurpleCmdStatus {
 	PURPLE_CMD_STATUS_NOT_FOUND,
 	PURPLE_CMD_STATUS_WRONG_ARGS,
 	PURPLE_CMD_STATUS_WRONG_PRPL,
-	PURPLE_CMD_STATUS_WRONG_TYPE,
+	PURPLE_CMD_STATUS_WRONG_TYPE
 } PurpleCmdStatus;
 
 /** Commands registered with the core return one of these values when run.
@@ -51,7 +51,7 @@ typedef enum _PurpleCmdRet {
 typedef enum _PurpleCmdRet {
 	PURPLE_CMD_RET_OK,       /**< Everything's okay; Don't look for another command to call. */
 	PURPLE_CMD_RET_FAILED,   /**< The command failed, but stop looking.*/
-	PURPLE_CMD_RET_CONTINUE, /**< Continue, looking for other commands with the same name to call. */
+	PURPLE_CMD_RET_CONTINUE /**< Continue, looking for other commands with the same name to call. */
 } PurpleCmdRet;
 
 #define PURPLE_CMD_FUNC(func) ((PurpleCmdFunc)func)
@@ -76,7 +76,7 @@ typedef enum _PurpleCmdPriority {
 	PURPLE_CMD_P_PLUGIN    =  3000,
 	PURPLE_CMD_P_ALIAS     =  4000,
 	PURPLE_CMD_P_HIGH      =  5000,
-	PURPLE_CMD_P_VERY_HIGH =  6000,
+	PURPLE_CMD_P_VERY_HIGH =  6000
 } PurpleCmdPriority;
 
 /** Flags used to set various properties of commands.  Every command should
@@ -93,7 +93,7 @@ typedef enum _PurpleCmdFlag {
 	/** Command is usable only for a particular prpl. */
 	PURPLE_CMD_FLAG_PRPL_ONLY        = 0x04,
 	/** Incorrect arguments to this command should be accepted anyway. */
-	PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS = 0x08,
+	PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS = 0x08
 } PurpleCmdFlag;
 
 
============================================================
--- libpurple/connection.h	d77712b6f6c732bbc84b3d8e1603c66f893f63ee
+++ libpurple/connection.h	b93524b7b223d1785c2757f392bc1496e61d98ad
@@ -44,7 +44,7 @@ typedef enum
 	PURPLE_CONNECTION_NO_FONTSIZE = 0x0020, /**< Connection does not send/receive font sizes */
 	PURPLE_CONNECTION_NO_URLDESC = 0x0040,  /**< Connection does not support descriptions with links */ 
 	PURPLE_CONNECTION_NO_IMAGES = 0x0080,  /**< Connection does not support sending of images */
-	PURPLE_CONNECTION_ALLOW_CUSTOM_SMILEY = 0x0100, /**< Connection supports sending and receiving custom smileys */
+	PURPLE_CONNECTION_ALLOW_CUSTOM_SMILEY = 0x0100 /**< Connection supports sending and receiving custom smileys */
 
 } PurpleConnectionFlags;
 
============================================================
--- libpurple/conversation.h	9ef84351aa54594150f930902721df72b6702970
+++ libpurple/conversation.h	1021377b712292c17ea95162457abce0225c0d79
@@ -84,7 +84,7 @@ typedef enum
 	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 @@ typedef enum
 	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 @@ typedef enum
 	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;
 
============================================================
--- libpurple/protocols/bonjour/bonjour_ft.h	432e101cd2fbcd57d8b17a57ae046ef99731a967
+++ libpurple/protocols/bonjour/bonjour_ft.h	f1574d1e3fd49efd9fc0346811bbecba09bcc027
@@ -27,7 +27,7 @@ typedef enum {
 typedef enum {
 	XEP_BYTESTREAMS = 1,
 	XEP_IBB = 2,
-	XEP_UNKNOWN = 4,
+	XEP_UNKNOWN = 4
 } XepSiMode;
 
 struct _XepXfer
============================================================
--- libpurple/protocols/msn/contact.h	ffe1cc2b41bd53183ed8a2d47304531cbaa002e4
+++ libpurple/protocols/msn/contact.h	cc9b138ba0754ea79d1ac849d54e845f2f629f0b
@@ -616,7 +616,7 @@ typedef enum
 	MSN_ADD_GROUP       = 0x10,
 	MSN_DEL_GROUP       = 0x20,
 	MSN_RENAME_GROUP    = 0x40,
-	MSN_UPDATE_INFO     = 0x80,
+	MSN_UPDATE_INFO     = 0x80
 } MsnCallbackAction;
 
 typedef struct _MsnCallbackState MsnCallbackState;
============================================================
--- libpurple/protocols/msn/servconn.h	76b54b003f24fdfd45c7feae03a71d0046f5d21a
+++ libpurple/protocols/msn/servconn.h	c2b6a2bd8b086027fc6547a16aefe8677fc5a499
@@ -40,7 +40,7 @@ typedef enum
 	MSN_SERVCONN_ERROR_NONE,
 	MSN_SERVCONN_ERROR_CONNECT,
 	MSN_SERVCONN_ERROR_WRITE,
-	MSN_SERVCONN_ERROR_READ,
+	MSN_SERVCONN_ERROR_READ
 
 } MsnServConnError;
 
============================================================
--- libpurple/protocols/msn/slpcall.h	1bc5420bb50468f6c14c0e17726bea20320676de
+++ libpurple/protocols/msn/slpcall.h	13863cc3a700579662279fdb70c9fb520d5c2adf
@@ -37,7 +37,7 @@ typedef enum
 typedef enum
 {
 	MSN_SLPCALL_ANY,
-	MSN_SLPCALL_DC,
+	MSN_SLPCALL_DC
 
 } MsnSlpCallType;
 
============================================================
--- libpurple/protocols/msn/switchboard.h	c09c32ae84ee13b2a2a05c4487a208111e5ecacc
+++ libpurple/protocols/msn/switchboard.h	b8994e4d60738264aa0368d513a1dac1fa9352a5
@@ -57,7 +57,7 @@ typedef enum
 typedef enum
 {
 	MSN_SB_FLAG_IM = 0x01, /**< This switchboard is being used for a conversation. */
-	MSN_SB_FLAG_FT = 0x02, /**< This switchboard is being used for file transfer. */
+	MSN_SB_FLAG_FT = 0x02  /**< This switchboard is being used for file transfer. */
 
 } MsnSBFlag;
 
============================================================
--- libpurple/protocols/qq/buddy_info.c	fce59f01b3c6f9bde0bfe3cb2631f297a0e1a42f
+++ libpurple/protocols/qq/buddy_info.c	692fe027208e94cfc82e9bbb9b8c0f94beb46706
@@ -87,7 +87,7 @@ enum {
 	QQ_INFO_UNKNOW3, QQ_INFO_UNKNOW4, QQ_INFO_UNKNOW5,
 	QQ_INFO_IS_PUB_MOBILE, QQ_INFO_IS_PUB_CONTACT, QQ_INFO_COLLEGE, QQ_INFO_HOROSCOPE,
 	QQ_INFO_ZODIAC, QQ_INFO_BLOOD, QQ_INFO_SHOW, QQ_INFO_UNKNOW6,
-	QQ_INFO_LAST_2007, QQ_INFO_LAST,
+	QQ_INFO_LAST_2007, QQ_INFO_LAST
 };
 
 enum {
@@ -95,7 +95,7 @@ enum {
 };
 
 enum {
-	QQ_FIELD_LABEL = 0, QQ_FIELD_STRING, QQ_FIELD_MULTI, QQ_FIELD_BOOL, QQ_FIELD_CHOICE,
+	QQ_FIELD_LABEL = 0, QQ_FIELD_STRING, QQ_FIELD_MULTI, QQ_FIELD_BOOL, QQ_FIELD_CHOICE
 };
 
 typedef struct {
============================================================
--- libpurple/protocols/qq/buddy_info.h	1fd0c6472ad045764cd67b04d0f189b31bf3e30e
+++ libpurple/protocols/qq/buddy_info.h	2c37eb65aceb72487ef763c8f503767f55a3552b
@@ -71,7 +71,7 @@ enum {
 	QQ_BUDDY_INFO_MODIFY_BASE,
 	QQ_BUDDY_INFO_MODIFY_EXT,
 	QQ_BUDDY_INFO_MODIFY_ADDR,
-	QQ_BUDDY_INFO_MODIFY_CONTACT,
+	QQ_BUDDY_INFO_MODIFY_CONTACT
 };
 
 gchar *qq_get_icon_name(gint face);
============================================================
--- libpurple/protocols/qq/buddy_opt.c	14b319bd3676f50738aff98ff4d61cdba32619b7
+++ libpurple/protocols/qq/buddy_opt.c	b325b67d6017ad0117e404a57b6ef8ca2266d09c
@@ -46,7 +46,7 @@ enum {
 enum {
 	QQ_MY_AUTH_APPROVE = 0x30,	/* ASCII value of "0" */
 	QQ_MY_AUTH_REJECT = 0x31,	/* ASCII value of "1" */
-	QQ_MY_AUTH_REQUEST = 0x32,	/* ASCII value of "2" */
+	QQ_MY_AUTH_REQUEST = 0x32	/* ASCII value of "2" */
 };
 
 typedef struct _qq_buddy_req {
============================================================
--- libpurple/protocols/qq/buddy_opt.h	b17a43330dcf7104a83027fe2d789031f7dfde5a
+++ libpurple/protocols/qq/buddy_opt.h	f61ba9701960402d062c44e1155edd35549ab7e8
@@ -38,14 +38,14 @@ enum {
 	QQ_AUTH_INFO_TEMP_SESSION = 0x0003,
 	QQ_AUTH_INFO_CLUSTER = 0x0002,
 	QQ_AUTH_INFO_REMOVE_BUDDY = 0x0006,
-	QQ_AUTH_INFO_UPDATE_BUDDY_INFO = 0x0007,
+	QQ_AUTH_INFO_UPDATE_BUDDY_INFO = 0x0007
 };
 
 enum {
 	QQ_QUESTION_GET = 0x01,
 	QQ_QUESTION_SET = 0x02,
 	QQ_QUESTION_REQUEST = 0x03,		/* get question only*/
-	QQ_QUESTION_ANSWER = 0x04,
+	QQ_QUESTION_ANSWER = 0x04
 };
 
 void qq_add_buddy(PurpleConnection *gc, PurpleBuddy *buddy, PurpleGroup *group);
============================================================
--- libpurple/protocols/qq/group.h	65046d1ce1b7c1599ab024b9cfe372a6f5892cc8
+++ libpurple/protocols/qq/group.h	19b1b60b96ec006878764610310b1e1b2609cb99
@@ -37,7 +37,7 @@ typedef enum {
 	QQ_ROOM_ROLE_NO = 0x00,	/* default 0x00 means not member */
 	QQ_ROOM_ROLE_YES,
 	QQ_ROOM_ROLE_REQUESTING,
-	QQ_ROOM_ROLE_ADMIN,
+	QQ_ROOM_ROLE_ADMIN
 } qq_room_role;
 
 typedef struct _qq_room_data qq_room_data;
============================================================
--- libpurple/protocols/qq/group_info.h	d8ae739623bf70a09d61fe7f332fa852ef1c10b5
+++ libpurple/protocols/qq/group_info.h	a61e4fcf8c7fb4b09ce22c5e504c1b414bcc97a4
@@ -31,7 +31,7 @@ enum {
 
 enum {
 	QQ_ROOM_INFO_UPDATE_ONLY = 0,
-	QQ_ROOM_INFO_DISPLAY,
+	QQ_ROOM_INFO_DISPLAY
 };
 
 gint qq_request_room_get_buddies(PurpleConnection *gc, guint32 room_id, gint update_class);
============================================================
--- libpurple/protocols/qq/group_join.c	48e2e185e1764e481acc2fbafe48a37d04f90ce8
+++ libpurple/protocols/qq/group_join.c	114c715265bd0d2a68caf0c3ad30b609baee0522
@@ -44,7 +44,7 @@ enum {
 enum {
 	QQ_ROOM_JOIN_OK = 0x01,
 	QQ_ROOM_JOIN_NEED_AUTH = 0x02,
-	QQ_ROOM_JOIN_DENIED = 0x03,
+	QQ_ROOM_JOIN_DENIED = 0x03
 };
 
 enum {
============================================================
--- libpurple/protocols/qq/im.h	c8c9a0ee6d50b0e3e0c92b0be78f247865b2c84e
+++ libpurple/protocols/qq/im.h	9a8b83b1f7e13adfbc178e333b90e02276bb3dfa
@@ -45,7 +45,7 @@ enum {
 	QQ_MSG_SYS_30 = 0x0030,
 	QQ_MSG_SYS_4C = 0x004C,
 	QQ_MSG_EXTEND = 0x0084,
-	QQ_MSG_EXTEND_85 = 0x0085,
+	QQ_MSG_EXTEND_85 = 0x0085
 };
 
 typedef struct {
============================================================
--- libpurple/protocols/qq/qq_define.h	13c5307e530b1f5a1c7c62b95a9e061fef20c50e
+++ libpurple/protocols/qq/qq_define.h	437a3e33ea93b8af0a9cd7252c5ef90528728ee3
@@ -74,7 +74,7 @@ enum {
 	QQ_CMD_ADD_BUDDY_NO_AUTH_EX = 0x00A7,			/* add friend without auth */
 	QQ_CMD_ADD_BUDDY_AUTH_EX = 0x00A8, 				/* add buddy with auth */
 	QQ_CMD_BUDDY_CHECK_CODE =  0x00B5,
-	QQ_CMD_BUDDY_QUESTION =  0x00B7,
+	QQ_CMD_BUDDY_QUESTION =  0x00B7
 };
 
 const gchar *qq_get_cmd_desc(gint type);
@@ -104,7 +104,7 @@ enum {
 	QQ_ROOM_CMD_TEMP_QUIT = 0x32,
 	QQ_ROOM_CMD_TEMP_GET_INFO = 0x33,
 	QQ_ROOM_CMD_TEMP_SEND_IM = 0x35,
-	QQ_ROOM_CMD_TEMP_GET_MEMBERS = 0x37,
+	QQ_ROOM_CMD_TEMP_GET_MEMBERS = 0x37
 };
 
 const gchar *qq_get_room_cmd_desc(gint room_cmd);
@@ -119,7 +119,7 @@ enum {
 	QQ_SERVER_BUDDY_ADDING_EX = 40,
 	QQ_SERVER_BUDDY_ADD_REQUEST_EX = 41,
 	QQ_SERVER_BUDDY_ADDED_ANSWER = 42,
-	QQ_SERVER_BUDDY_ADDED_EX = 43,
+	QQ_SERVER_BUDDY_ADDED_EX = 43
 };
 
 enum {
@@ -128,7 +128,7 @@ enum {
 	QQ_BUDDY_CHANGE_TO_OFFLINE = 20,
 	QQ_BUDDY_ONLINE_AWAY = 30,
 	QQ_BUDDY_ONLINE_INVISIBLE = 40,
-	QQ_BUDDY_ONLINE_BUSY = 50,
+	QQ_BUDDY_ONLINE_BUSY = 50
 };
 
 gboolean is_online(guint8 status);
============================================================
--- libpurple/protocols/qq/qq_process.h	785653af694fe209081308333c2cb8f5a8065bbc
+++ libpurple/protocols/qq/qq_process.h	1fe1c1eb1b1c51643d952a6943961379f8178740
@@ -35,7 +35,7 @@ enum {
 	QQ_CMD_CLASS_UPDATE_ALL,
 	QQ_CMD_CLASS_UPDATE_ONLINE,
 	QQ_CMD_CLASS_UPDATE_BUDDY,
-	QQ_CMD_CLASS_UPDATE_ROOM,
+	QQ_CMD_CLASS_UPDATE_ROOM
 };
 
 guint8 qq_proc_login_cmds(PurpleConnection *gc,  guint16 cmd, guint16 seq,
============================================================
--- libpurple/protocols/qq/qq_trans.c	685b1c333f6f5f72e93b6572a0eabb6c5f7f98bf
+++ libpurple/protocols/qq/qq_trans.c	00d3b66dd18b97baf3b6c898f9bf0a6faac2a7a2
@@ -39,7 +39,7 @@ enum {
 	QQ_TRANS_IS_SERVER = 0x01,			/* Is server command or client command */
 	QQ_TRANS_IS_IMPORT = 0x02,			/* Only notice if not get reply; or resend, disconn if reties get 0*/
 	QQ_TRANS_REMAINED = 0x04,				/* server command before login*/
-	QQ_TRANS_IS_REPLY = 0x08,				/* server command before login*/
+	QQ_TRANS_IS_REPLY = 0x08				/* server command before login*/
 };
 
 struct _qq_transaction {
============================================================
--- libpurple/protocols/sametime/sametime.c	a0f247d667566e0e68cf5b76be64b0d2f80a30ec
+++ libpurple/protocols/sametime/sametime.c	ad03e93ca6d632a74f7d4edf6b61c20ebae1f884
@@ -158,7 +158,7 @@ enum blist_choice {
   blist_choice_LOCAL = 1, /**< local only */
   blist_choice_MERGE = 2, /**< merge from server */
   blist_choice_STORE = 3, /**< merge from and save to server */
-  blist_choice_SYNCH = 4, /**< sync with server */
+  blist_choice_SYNCH = 4  /**< sync with server */
 };
 
 
============================================================
--- libpurple/protocols/silc10/wb.c	fbd2efacdc539f317f4daff44fa2c1dce2ea667f
+++ libpurple/protocols/silc10/wb.c	1a28fcd994b008d85562d9dab10000bd106510bc
@@ -61,14 +61,14 @@ typedef enum {
 /* Commands */
 typedef enum {
 	SILCPURPLE_WB_DRAW 	= 0x01,
-	SILCPURPLE_WB_CLEAR	= 0x02,
+	SILCPURPLE_WB_CLEAR	= 0x02
 } SilcPurpleWbCommand;
 
 /* Brush size */
 typedef enum {
 	SILCPURPLE_WB_BRUSH_SMALL = 2,
 	SILCPURPLE_WB_BRUSH_MEDIUM = 5,
-	SILCPURPLE_WB_BRUSH_LARGE = 10,
+	SILCPURPLE_WB_BRUSH_LARGE = 10
 } SilcPurpleWbBrushSize;
 
 /* Brush color (XXX Purple should provide default colors) */
@@ -85,7 +85,7 @@ typedef enum {
 	SILCPURPLE_WB_COLOR_TAN		= 12093547,
 	SILCPURPLE_WB_COLOR_BROWN		= 5256485,
 	SILCPURPLE_WB_COLOR_GREY		= 11184810,
-	SILCPURPLE_WB_COLOR_WHITE		= 16777215,
+	SILCPURPLE_WB_COLOR_WHITE		= 16777215
 } SilcPurpleWbColor;
 
 typedef struct {
============================================================
--- libpurple/protocols/yahoo/yahoochat.c	35a6293f4e27f3f1a809f5d35dcffd1e57bab68b
+++ libpurple/protocols/yahoo/yahoochat.c	5a0a04d43c3aaa61c7cfc7fc715d4047e93f6912
@@ -1180,7 +1180,7 @@ enum yahoo_room_type {
 
 enum yahoo_room_type {
 	yrt_yahoo,
-	yrt_user,
+	yrt_user
 };
 
 struct yahoo_chatxml_state {
============================================================
--- libpurple/protocols/yahoo/ycht.h	4adf4967997e80eed690da22871fbb652294eb35
+++ libpurple/protocols/yahoo/ycht.h	4edc3ddcb9c2ac5090d8e87ab53a9dc9b0086a37
@@ -43,7 +43,7 @@ typedef enum {
 	YCHT_SERVICE_CHATMSG = 0x41,
 	YCHT_SERVICE_CHATMSG_EMOTE = 0x43,
 	YCHT_SERVICE_PING = 0x62,
-	YCHT_SERVICE_ONLINE_FRIENDS = 0x68,
+	YCHT_SERVICE_ONLINE_FRIENDS = 0x68
 } ycht_service;
 /*
 yahoo: YCHT Service: 0x11 Version: 0x100
============================================================
--- libpurple/protocols/zephyr/zephyr.c	1170d287caebcc0007f6508b532041a56e0aefc7
+++ libpurple/protocols/zephyr/zephyr.c	4c61853cf1f5dd4145f6386e4b560ff4b196c379
@@ -64,7 +64,7 @@ typedef enum {
 	PURPLE_ZEPHYR_NONE, /* Non-kerberized ZEPH0.2 */
 	PURPLE_ZEPHYR_KRB4, /* ZEPH0.2 w/ KRB4 support */
 	PURPLE_ZEPHYR_TZC,  /* tzc executable proxy */
-	PURPLE_ZEPHYR_INTERGALACTIC_KRB4, /* Kerberized ZEPH0.3 */
+	PURPLE_ZEPHYR_INTERGALACTIC_KRB4 /* Kerberized ZEPH0.3 */
 } zephyr_connection_type;
 
 struct _zephyr_account {
============================================================
--- libpurple/prpl.h	d36fd3a3d9879018f3185684c4f6695da06611ed
+++ libpurple/prpl.h	b6a33591369ebb9f8aa226725e207c8fd6fdd8b2
@@ -189,7 +189,7 @@ typedef enum
 	 * Used as a hint that unknown commands should not be sent as messages.
 	 * @since 2.1.0
 	 */
-	OPT_PROTO_SLASH_COMMANDS_NATIVE = 0x00000400,
+	OPT_PROTO_SLASH_COMMANDS_NATIVE = 0x00000400
 
 } PurpleProtocolOptions;
 
============================================================
--- libpurple/smiley.c	bd10b1ca0899b314a83d2da4e81a87b850649f98
+++ libpurple/smiley.c	fc77c4b1edd160aeb079de830ba4d197780a842e
@@ -288,7 +288,7 @@ enum
 {
 	PROP_0,
 	PROP_SHORTCUT,
-	PROP_IMGSTORE,
+	PROP_IMGSTORE
 };
 
 #define PROP_SHORTCUT_S "shortcut"


More information about the Commits mailing list