pidgin: a838619f: Please correct me if I'm wrong, but I do...
markdoliner at pidgin.im
markdoliner at pidgin.im
Mon Aug 22 03:27:14 EDT 2011
----------------------------------------------------------------------
Revision: a838619f39988fb46c2305600984725495b15ee1
Parent: d80abd35956ecd359432f347478ada213ce59fdc
Author: markdoliner at pidgin.im
Date: 08/22/11 03:20:49
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/a838619f39988fb46c2305600984725495b15ee1
Changelog:
Please correct me if I'm wrong, but I don't think we gain anything
from declaring _PurpleBlah versions of enums if we do a typedef
at the same time. I don't think it's necessary.
Fixes #4475
Changes against parent d80abd35956ecd359432f347478ada213ce59fdc
patched ChangeLog.API
patched finch/libgnt/gntfilesel.h
patched finch/libgnt/gntprogressbar.h
patched finch/libgnt/gnttree.h
patched finch/libgnt/gntwidget.h
patched finch/libgnt/gntwm.h
patched libpurple/cipher.h
patched libpurple/cmds.h
patched libpurple/prefs.h
patched libpurple/privacy.h
patched libpurple/protocols/bonjour/mdns_types.h
patched libpurple/sound.h
patched libpurple/xmlnode.h
patched pidgin/win32/untar.h
-------------- next part --------------
============================================================
--- libpurple/sound.h 0a8978edca6b89b5bcb6125057c49c8109b7d29e
+++ libpurple/sound.h 30093629843255e520d88f7c232dd66ab962159e
@@ -38,7 +38,7 @@
* A type of sound.
*/
-typedef enum _PurpleSoundEventID
+typedef enum
{
PURPLE_SOUND_BUDDY_ARRIVE = 0, /**< Buddy signs on. */
PURPLE_SOUND_BUDDY_LEAVE, /**< Buddy signs off. */
============================================================
--- libpurple/privacy.h 189d1f21abd1cdfce1f32b47bb45aef7f938a44a
+++ libpurple/privacy.h 03378ca5a6c6c8af9bbd294ca1bb8c787eb5805e
@@ -29,7 +29,7 @@
/**
* Privacy data types.
*/
-typedef enum _PurplePrivacyType
+typedef enum
{
PURPLE_PRIVACY_ALLOW_ALL = 1,
PURPLE_PRIVACY_DENY_ALL,
============================================================
--- pidgin/win32/untar.h 3995c86f3e70c4d2bacd1ec80a6a9ea1de95c97a
+++ pidgin/win32/untar.h 44679caf79a340f096732ecce741c00ebb97314c
@@ -12,7 +12,7 @@ extern "C" {
extern "C" {
#endif /* __cplusplus */
-typedef enum _untar_opt {
+typedef enum {
UNTAR_LISTING = (1 << 0),
UNTAR_QUIET = (1 << 1),
UNTAR_VERBOSE = (1 << 2),
============================================================
--- libpurple/prefs.h e931ac8159094398e76024b78b7547ffc3ec0414
+++ libpurple/prefs.h e1b30d339896a98a86013a11095fad0c46f76137
@@ -32,7 +32,7 @@
/**
* Preference data types.
*/
-typedef enum _PurplePrefType
+typedef enum
{
PURPLE_PREF_NONE, /**< No type. */
PURPLE_PREF_BOOLEAN, /**< Boolean. */
============================================================
--- libpurple/xmlnode.h 1662f69e937ac1d3b99d0d161d7f0b10fa7d4005
+++ libpurple/xmlnode.h 716b906f1214ba3bcbe0de955e09cc068a716e72
@@ -35,7 +35,7 @@ extern "C" {
/**
* The valid types for an xmlnode
*/
-typedef enum _XMLNodeType
+typedef enum
{
XMLNODE_TYPE_TAG, /**< Just a tag */
XMLNODE_TYPE_ATTRIB, /**< Has attributes */
============================================================
--- ChangeLog.API 899a2adc7ebd64276ec965cde8007f54b737dc4e
+++ ChangeLog.API 311b33193b9fa5ab1525697265fa8befd305bcdb
@@ -24,6 +24,23 @@ version 3.0.0 (??/??/????):
PurpleConnectionError as the second parameter
Removed:
+ * _GntFileType
+ * _GntKeyPressMode
+ * _GntMouseEvent
+ * _GntParamFlags
+ * _GntProgressBarOrientation
+ * _GntTreeColumnFlag
+ * _GntWidgetFlags
+ * _PurpleCipherBatchMode
+ * _PurpleCipherCaps
+ * _PurpleCmdFlag
+ * _PurpleCmdPriority
+ * _PurpleCmdRet
+ * _PurpleCmdStatus
+ * _PurplePrefType
+ * _PurplePrivacyType
+ * _PurpleSoundEventID
+ * _XMLNodeType
* GtkIMHtml.clipboard_html_string
* GtkIMHtml.clipboard_text_string
* pidgin_blist_update_account_error_state
============================================================
--- libpurple/cmds.h cdbf3f9ee14393b410b170eb3fc3b7997b8e9114
+++ libpurple/cmds.h bec0c741e6c534d1614e835d6994c387e967eedc
@@ -32,7 +32,7 @@
/*@{*/
/** The possible results of running a command with purple_cmd_do_command(). */
-typedef enum _PurpleCmdStatus {
+typedef enum {
PURPLE_CMD_STATUS_OK,
PURPLE_CMD_STATUS_FAILED,
PURPLE_CMD_STATUS_NOT_FOUND,
@@ -48,7 +48,7 @@ typedef enum _PurpleCmdStatus {
* #PURPLE_CMD_RET_CONTINUE to cause the core to fall through to other
* commands with the same name.
*/
-typedef enum _PurpleCmdRet {
+typedef enum {
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. */
@@ -68,7 +68,7 @@ typedef guint PurpleCmdId;
*/
typedef guint PurpleCmdId;
-typedef enum _PurpleCmdPriority {
+typedef enum {
PURPLE_CMD_P_VERY_LOW = -1000,
PURPLE_CMD_P_LOW = 0,
PURPLE_CMD_P_DEFAULT = 1000,
@@ -85,7 +85,7 @@ typedef enum _PurpleCmdPriority {
*
* @see purple_cmd_register
*/
-typedef enum _PurpleCmdFlag {
+typedef enum {
/** Command is usable in IMs. */
PURPLE_CMD_FLAG_IM = 0x01,
/** Command is usable in multi-user chats. */
============================================================
--- libpurple/cipher.h 69a89ce60a22ce61da7ecafcb47b10e1c23c1049
+++ libpurple/cipher.h 14a4939f6d71b9ad893a872310cf7f415f9f5b5b
@@ -41,7 +41,7 @@ typedef struct _PurpleCipherContext Purp
/**
* Modes for batch encrypters
*/
-typedef enum _PurpleCipherBatchMode {
+typedef enum {
PURPLE_CIPHER_BATCH_MODE_ECB,
PURPLE_CIPHER_BATCH_MODE_CBC
} PurpleCipherBatchMode;
@@ -49,7 +49,7 @@ typedef enum _PurpleCipherBatchMode {
/**
* The operation flags for a cipher
*/
-typedef enum _PurpleCipherCaps {
+typedef enum {
PURPLE_CIPHER_CAPS_SET_OPT = 1 << 1, /**< Set option flag */
PURPLE_CIPHER_CAPS_GET_OPT = 1 << 2, /**< Get option flag */
PURPLE_CIPHER_CAPS_INIT = 1 << 3, /**< Init flag */
============================================================
--- finch/libgnt/gnttree.h 27e823196a4d7077f2ae6dac0759e333729e0806
+++ finch/libgnt/gnttree.h c011766ef83d7ab18085f95e1c64140b4b23ff50
@@ -47,7 +47,7 @@ typedef struct _GntTreeCol GntTreeCol;
typedef struct _GntTreeRow GntTreeRow;
typedef struct _GntTreeCol GntTreeCol;
-typedef enum _GntTreeColumnFlag {
+typedef enum {
GNT_TREE_COLUMN_INVISIBLE = 1 << 0,
GNT_TREE_COLUMN_FIXED_SIZE = 1 << 1,
GNT_TREE_COLUMN_BINARY_DATA = 1 << 2,
============================================================
--- finch/libgnt/gntwidget.h e99942bee9da195bf60c8f51ce3016570457f863
+++ finch/libgnt/gntwidget.h deae307acceacade01d43d5f03a46dc7c68c5273
@@ -49,7 +49,7 @@ typedef struct _GntWidgetClass GntWidge
typedef struct _GntWidgetPriv GntWidgetPriv;
typedef struct _GntWidgetClass GntWidgetClass;
-typedef enum _GntWidgetFlags
+typedef enum
{
GNT_WIDGET_DESTROYING = 1 << 0,
GNT_WIDGET_CAN_TAKE_FOCUS = 1 << 1,
@@ -69,7 +69,7 @@ typedef enum _GntWidgetFlags
} GntWidgetFlags;
/* XXX: This will probably move elsewhere */
-typedef enum _GntMouseEvent
+typedef enum
{
GNT_LEFT_MOUSE_DOWN = 1,
GNT_RIGHT_MOUSE_DOWN,
@@ -80,7 +80,7 @@ typedef enum _GntMouseEvent
} GntMouseEvent;
/* XXX: I'll have to ask grim what he's using this for in guifications. */
-typedef enum _GntParamFlags
+typedef enum
{
GNT_PARAM_SERIALIZABLE = 1 << G_PARAM_USER_SHIFT
} GntParamFlags;
============================================================
--- finch/libgnt/gntwm.h 98eed7e0a99391a3453fa13d6919a88319231c26
+++ finch/libgnt/gntwm.h 841b32328494ad99de142e3ca9accd2a505d0692
@@ -41,7 +41,7 @@
#define GNT_IS_WM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), GNT_TYPE_WM))
#define GNT_WM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GNT_TYPE_WM, GntWMClass))
-typedef enum _GntKeyPressMode
+typedef enum
{
GNT_KP_MODE_NORMAL,
GNT_KP_MODE_RESIZE,
============================================================
--- finch/libgnt/gntfilesel.h 2dfdd9267b201dfbdace9277964041f2979371ff
+++ finch/libgnt/gntfilesel.h 0a4fd75896edf89e04d217f68e019159fe856d32
@@ -81,7 +81,7 @@ struct _GntFileSelClass
void (*gnt_reserved4)(void);
};
-typedef enum _GntFileType
+typedef enum
{
GNT_FILE_REGULAR,
GNT_FILE_DIR
============================================================
--- libpurple/protocols/bonjour/mdns_types.h 24f7656c36db1674ae8a56c14f632da3e6e57386
+++ libpurple/protocols/bonjour/mdns_types.h c59cd8f36383675cdc8465c1f3a014a2ce28b566
@@ -37,7 +37,7 @@ typedef struct _BonjourDnsSd {
gchar *msg;
} BonjourDnsSd;
-typedef enum _PublishType {
+typedef enum {
PUBLISH_START,
PUBLISH_UPDATE
} PublishType;
============================================================
--- finch/libgnt/gntprogressbar.h 45ad458bc249ee0d3bb9661b13d83c4f28d7eb5a
+++ finch/libgnt/gntprogressbar.h aae9cc27ee11119f80c6737c39f15738d3ae443f
@@ -37,7 +37,7 @@
#define GNT_IS_PROGRESS_BAR_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GNT_TYPE_PROGRESS_BAR))
#define GNT_PROGRESS_BAR_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GNT_TYPE_PROGRESS_BAR, GntProgressBarClass))
-typedef enum _GntProgressBarOrientation
+typedef enum
{
GNT_PROGRESS_LEFT_TO_RIGHT,
GNT_PROGRESS_RIGHT_TO_LEFT,
More information about the Commits
mailing list