# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1313997649 0
# Node ID 5876584828e866cd37283507921273859c03120d
# Parent  4f2d99bcb1955007381865bc12077214eed2c5dc
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

diff -r 4f2d99bcb195 -r 5876584828e8 ChangeLog.API
--- a/ChangeLog.API	Mon Aug 22 07:01:27 2011 +0000
+++ b/ChangeLog.API	Mon Aug 22 07:20:49 2011 +0000
@@ -24,6 +24,23 @@
 		  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
diff -r 4f2d99bcb195 -r 5876584828e8 finch/libgnt/gntfilesel.h
--- a/finch/libgnt/gntfilesel.h	Mon Aug 22 07:01:27 2011 +0000
+++ b/finch/libgnt/gntfilesel.h	Mon Aug 22 07:20:49 2011 +0000
@@ -81,7 +81,7 @@
 	void (*gnt_reserved4)(void);
 };
 
-typedef enum _GntFileType
+typedef enum
 {
 	GNT_FILE_REGULAR,
 	GNT_FILE_DIR
diff -r 4f2d99bcb195 -r 5876584828e8 finch/libgnt/gntprogressbar.h
--- a/finch/libgnt/gntprogressbar.h	Mon Aug 22 07:01:27 2011 +0000
+++ b/finch/libgnt/gntprogressbar.h	Mon Aug 22 07:20:49 2011 +0000
@@ -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,
diff -r 4f2d99bcb195 -r 5876584828e8 finch/libgnt/gnttree.h
--- a/finch/libgnt/gnttree.h	Mon Aug 22 07:01:27 2011 +0000
+++ b/finch/libgnt/gnttree.h	Mon Aug 22 07:20:49 2011 +0000
@@ -47,7 +47,7 @@
 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,
diff -r 4f2d99bcb195 -r 5876584828e8 finch/libgnt/gntwidget.h
--- a/finch/libgnt/gntwidget.h	Mon Aug 22 07:01:27 2011 +0000
+++ b/finch/libgnt/gntwidget.h	Mon Aug 22 07:20:49 2011 +0000
@@ -49,7 +49,7 @@
 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 @@
 } 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 @@
 } 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;
diff -r 4f2d99bcb195 -r 5876584828e8 finch/libgnt/gntwm.h
--- a/finch/libgnt/gntwm.h	Mon Aug 22 07:01:27 2011 +0000
+++ b/finch/libgnt/gntwm.h	Mon Aug 22 07:20:49 2011 +0000
@@ -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,
diff -r 4f2d99bcb195 -r 5876584828e8 libpurple/cipher.h
--- a/libpurple/cipher.h	Mon Aug 22 07:01:27 2011 +0000
+++ b/libpurple/cipher.h	Mon Aug 22 07:20:49 2011 +0000
@@ -41,7 +41,7 @@
 /**
  * Modes for batch encrypters
  */
-typedef enum _PurpleCipherBatchMode {
+typedef enum {
 	PURPLE_CIPHER_BATCH_MODE_ECB,
 	PURPLE_CIPHER_BATCH_MODE_CBC
 } PurpleCipherBatchMode;
@@ -49,7 +49,7 @@
 /**
  * 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			*/
diff -r 4f2d99bcb195 -r 5876584828e8 libpurple/cmds.h
--- a/libpurple/cmds.h	Mon Aug 22 07:01:27 2011 +0000
+++ b/libpurple/cmds.h	Mon Aug 22 07:20:49 2011 +0000
@@ -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 @@
  *  #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 enum _PurpleCmdPriority {
+typedef enum {
 	PURPLE_CMD_P_VERY_LOW  = -1000,
 	PURPLE_CMD_P_LOW       =     0,
 	PURPLE_CMD_P_DEFAULT   =  1000,
@@ -85,7 +85,7 @@
  *
  *  @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. */
diff -r 4f2d99bcb195 -r 5876584828e8 libpurple/prefs.h
--- a/libpurple/prefs.h	Mon Aug 22 07:01:27 2011 +0000
+++ b/libpurple/prefs.h	Mon Aug 22 07:20:49 2011 +0000
@@ -32,7 +32,7 @@
 /**
  * Preference data types.
  */
-typedef enum _PurplePrefType
+typedef enum
 {
 	PURPLE_PREF_NONE,        /**< No type.         */
 	PURPLE_PREF_BOOLEAN,     /**< Boolean.         */
diff -r 4f2d99bcb195 -r 5876584828e8 libpurple/privacy.h
--- a/libpurple/privacy.h	Mon Aug 22 07:01:27 2011 +0000
+++ b/libpurple/privacy.h	Mon Aug 22 07:20:49 2011 +0000
@@ -29,7 +29,7 @@
 /**
  * Privacy data types.
  */
-typedef enum _PurplePrivacyType
+typedef enum
 {
 	PURPLE_PRIVACY_ALLOW_ALL = 1,
 	PURPLE_PRIVACY_DENY_ALL,
diff -r 4f2d99bcb195 -r 5876584828e8 libpurple/protocols/bonjour/mdns_types.h
--- a/libpurple/protocols/bonjour/mdns_types.h	Mon Aug 22 07:01:27 2011 +0000
+++ b/libpurple/protocols/bonjour/mdns_types.h	Mon Aug 22 07:20:49 2011 +0000
@@ -37,7 +37,7 @@
 	gchar *msg;
 } BonjourDnsSd;
 
-typedef enum _PublishType {
+typedef enum {
 	PUBLISH_START,
 	PUBLISH_UPDATE
 } PublishType;
diff -r 4f2d99bcb195 -r 5876584828e8 libpurple/sound.h
--- a/libpurple/sound.h	Mon Aug 22 07:01:27 2011 +0000
+++ b/libpurple/sound.h	Mon Aug 22 07:20:49 2011 +0000
@@ -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.                      */
diff -r 4f2d99bcb195 -r 5876584828e8 libpurple/xmlnode.h
--- a/libpurple/xmlnode.h	Mon Aug 22 07:01:27 2011 +0000
+++ b/libpurple/xmlnode.h	Mon Aug 22 07:20:49 2011 +0000
@@ -35,7 +35,7 @@
 /**
  * The valid types for an xmlnode
  */
-typedef enum _XMLNodeType
+typedef enum
 {
 	XMLNODE_TYPE_TAG,		/**< Just a tag */
 	XMLNODE_TYPE_ATTRIB,		/**< Has attributes */
diff -r 4f2d99bcb195 -r 5876584828e8 pidgin/win32/untar.h
--- a/pidgin/win32/untar.h	Mon Aug 22 07:01:27 2011 +0000
+++ b/pidgin/win32/untar.h	Mon Aug 22 07:20:49 2011 +0000
@@ -12,7 +12,7 @@
 extern "C" {
 #endif /* __cplusplus */
 
-typedef enum _untar_opt {
+typedef enum {
 	UNTAR_LISTING =      (1 << 0),
 	UNTAR_QUIET =        (1 << 1),
 	UNTAR_VERBOSE =      (1 << 2),