/pidgin/main: 358594a1aef9: Remove PurpleMediaCipher and PurpleM...

Changeset: 358594a1aef980bcbb96f5b3fce0421317f4e12a
Author:	 David Woodhouse <[email protected]>
Date:	 2015-04-07 22:40 +0100
Branch:	 release-2.x.y
URL: https://hg.pidgin.im/pidgin/main/rev/358594a1aef9

Description:

Remove PurpleMediaCipher and PurpleMediaAuthentication enums

As noted in commit 37248ac9dbb9, these only exist in 2.x.y and not
master. This was a mistake ? they were removed during review/testing
but I evidently failed to remove them completely when backporting the
changes to 2.x.y. This code really *should* be the same in 2.x.y and
master.

diffstat:

 libpurple/media/enum-types.c |  41 -----------------------------------------
 libpurple/media/enum-types.h |  40 ----------------------------------------
 2 files changed, 0 insertions(+), 81 deletions(-)

diffs (105 lines):

diff --git a/libpurple/media/enum-types.c b/libpurple/media/enum-types.c
--- a/libpurple/media/enum-types.c
+++ b/libpurple/media/enum-types.c
@@ -223,44 +223,3 @@ purple_media_state_changed_get_type()
 	return type;
 }
 
-/*
- * PurpleMediaCipher
- */
-
-GType
-purple_media_cipher_get_type()
-{
-	static GType type = 0;
-	if (type == 0) {
-		static const GEnumValue values[] = {
-			{ PURPLE_MEDIA_CIPHER_NULL,
-				"PURPLE_MEDIA_CIPHER_NULL", "null" },
-			{ PURPLE_MEDIA_CIPHER_AES_128_ICM,
-				"PURPLE_MEDIA_CIPHER_AES_128_ICM", "AES-128-ICM" },
-			{ PURPLE_MEDIA_CIPHER_AES_256_ICM,
-				"PURPLE_MEDIA_CIPHER_AES_256_ICM", "AES-256-ICM" },
-			{ 0, NULL, NULL }
-		};
-		type = g_enum_register_static("PurpleMediaCipher", values);
-	}
-	return type;
-}
-
-GType
-purple_media_authentication_get_type(void)
-{
-	static GType type = 0;
-	if (type == 0) {
-		static const GEnumValue values[] = {
-			{ PURPLE_MEDIA_AUTHENTICATION_NULL,
-				"PURPLE_MEDIA_AUTHENTICATION_NULL", "null" },
-			{ PURPLE_MEDIA_AUTHENTICATION_HMAC_SHA1_32,
-				"PURPLE_MEDIA_AUTHENTICATION_HMAC_SHA1_32", "HMAC_SHA1_32" },
-			{ PURPLE_MEDIA_AUTHENTICATION_HMAC_SHA1_80,
-				"PURPLE_MEDIA_AUTHENTICATION_HMAC_SHA1_80", "HMAC_SHA1_80" },
-			{ 0, NULL, NULL }
-		};
-		type = g_enum_register_static("PurpleMediaAuthentication", values);
-	}
-	return type;
-}
diff --git a/libpurple/media/enum-types.h b/libpurple/media/enum-types.h
--- a/libpurple/media/enum-types.h
+++ b/libpurple/media/enum-types.h
@@ -110,28 +110,6 @@ typedef enum {
 } PurpleMediaState;
 
 /**
- * PurpleMediaCipher:
- *
- * Media ciphers
- */
-typedef enum {
-	PURPLE_MEDIA_CIPHER_NULL,
-	PURPLE_MEDIA_CIPHER_AES_128_ICM,
-	PURPLE_MEDIA_CIPHER_AES_256_ICM
-} PurpleMediaCipher;
-
-/**
- * PurpleMediaAuthentication:
- *
- * Media message authentication algorithms
- */
-typedef enum {
-	PURPLE_MEDIA_AUTHENTICATION_NULL,
-	PURPLE_MEDIA_AUTHENTICATION_HMAC_SHA1_32,
-	PURPLE_MEDIA_AUTHENTICATION_HMAC_SHA1_80
-} PurpleMediaAuthentication;
-
-/**
  * Gets the media candidate type's GType
  *
  * @return The media candidate type's GType.
@@ -185,24 +163,6 @@ GType purple_media_session_type_get_type
  */
 GType purple_media_state_changed_get_type(void);
 
-/**
- * purple_media_cipher_get_type:
- *
- * Gets the type of the cipher enum
- *
- * Returns: The cipher enum's GType
- */
-GType purple_media_cipher_get_type(void);
-
-/**
- * purple_media_authentication_get_type:
- *
- * Gets the type of the authentication enum
- *
- * Returns: The authentication enum's GType
- */
-GType purple_media_authentication_get_type(void);
-
 G_END_DECLS
 
 #endif  /* _PURPLE_MEDIA_ENUM_TYPES_ */