/soc/2013/ankitkv/gobjectification: 3acdd397a9c1: Removed reserv...
Ankit Vani
a at nevitus.org
Tue Jul 2 11:34:13 EDT 2013
Changeset: 3acdd397a9c16de7509f09e8a19d6b0b9b8c7169
Author: Ankit Vani <a at nevitus.org>
Date: 2013-07-02 21:03 +0530
Branch: soc.2013.gobjectification
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/3acdd397a9c1
Description:
Removed reserved fields from instance structs.
These are unnecessary as it is very unlikely you would ever need to add members here.
You would want to add members to the private structure (hidden in the API) and add functions to manipulate them.
diffstat:
libpurple/account.h | 6 ------
libpurple/accounts.h | 1 +
libpurple/cipher.h | 5 -----
libpurple/ciphers/aescipher.h | 7 ++-----
libpurple/ciphers/des3cipher.h | 7 ++-----
libpurple/ciphers/descipher.h | 5 -----
libpurple/ciphers/hmaccipher.h | 7 ++-----
libpurple/ciphers/md4hash.h | 7 ++-----
libpurple/ciphers/md5hash.h | 7 ++-----
libpurple/ciphers/pbkdf2cipher.h | 7 ++-----
libpurple/ciphers/rc4cipher.h | 7 ++-----
libpurple/ciphers/sha1hash.h | 7 ++-----
libpurple/ciphers/sha256hash.h | 7 ++-----
libpurple/circularbuffer.h | 7 ++-----
libpurple/conversation.h | 5 -----
libpurple/conversationtypes.h | 15 ---------------
libpurple/hash.h | 5 -----
libpurple/media.h | 5 -----
libpurple/smiley.h | 7 ++-----
libpurple/sound-theme-loader.h | 7 ++-----
libpurple/sound-theme.h | 7 ++-----
libpurple/theme-loader.h | 8 +++-----
libpurple/theme-manager.h | 7 ++-----
libpurple/theme.h | 7 ++-----
24 files changed, 34 insertions(+), 126 deletions(-)
diffs (truncated from 491 to 300 lines):
diff --git a/libpurple/account.h b/libpurple/account.h
--- a/libpurple/account.h
+++ b/libpurple/account.h
@@ -1,7 +1,6 @@
/**
* @file account.h Account API
* @ingroup core
- * @see @ref account-signals
*/
/* purple
@@ -101,11 +100,6 @@ struct _PurpleAccount
* field provided to the UIs -- it is not used by the libpurple core.
*/
gpointer ui_data;
-
- void (*_purple_reserved1)(void);
- void (*_purple_reserved2)(void);
- void (*_purple_reserved3)(void);
- void (*_purple_reserved4)(void);
};
/**
diff --git a/libpurple/accounts.h b/libpurple/accounts.h
--- a/libpurple/accounts.h
+++ b/libpurple/accounts.h
@@ -1,6 +1,7 @@
/**
* @file accounts.h Accounts API
* @ingroup core
+ * @see @ref account-signals
*/
/* purple
diff --git a/libpurple/cipher.h b/libpurple/cipher.h
--- a/libpurple/cipher.h
+++ b/libpurple/cipher.h
@@ -63,11 +63,6 @@ typedef enum {
struct _PurpleCipher {
/*< private >*/
GObject gparent;
-
- void (*_purple_reserved1)(void);
- void (*_purple_reserved2)(void);
- void (*_purple_reserved3)(void);
- void (*_purple_reserved4)(void);
};
/**
diff --git a/libpurple/ciphers/aescipher.h b/libpurple/ciphers/aescipher.h
--- a/libpurple/ciphers/aescipher.h
+++ b/libpurple/ciphers/aescipher.h
@@ -39,15 +39,12 @@ typedef struct _PurpleAESCipher Purple
typedef struct _PurpleAESCipherClass PurpleAESCipherClass;
struct _PurpleAESCipher {
+ /*< private >*/
PurpleCipher gparent;
-
- void (*_purple_reserved1)(void);
- void (*_purple_reserved2)(void);
- void (*_purple_reserved3)(void);
- void (*_purple_reserved4)(void);
};
struct _PurpleAESCipherClass {
+ /*< private >*/
PurpleCipherClass gparent;
void (*_purple_reserved1)(void);
diff --git a/libpurple/ciphers/des3cipher.h b/libpurple/ciphers/des3cipher.h
--- a/libpurple/ciphers/des3cipher.h
+++ b/libpurple/ciphers/des3cipher.h
@@ -39,15 +39,12 @@ typedef struct _PurpleDES3Cipher Purpl
typedef struct _PurpleDES3CipherClass PurpleDES3CipherClass;
struct _PurpleDES3Cipher {
+ /*< private >*/
PurpleCipher gparent;
-
- void (*_purple_reserved1)(void);
- void (*_purple_reserved2)(void);
- void (*_purple_reserved3)(void);
- void (*_purple_reserved4)(void);
};
struct _PurpleDES3CipherClass {
+ /*< private >*/
PurpleCipherClass gparent;
void (*_purple_reserved1)(void);
diff --git a/libpurple/ciphers/descipher.h b/libpurple/ciphers/descipher.h
--- a/libpurple/ciphers/descipher.h
+++ b/libpurple/ciphers/descipher.h
@@ -41,11 +41,6 @@ typedef struct _PurpleDESCipherClass
struct _PurpleDESCipher {
/*< private >*/
PurpleCipher gparent;
-
- void (*_purple_reserved1)(void);
- void (*_purple_reserved2)(void);
- void (*_purple_reserved3)(void);
- void (*_purple_reserved4)(void);
};
struct _PurpleDESCipherClass {
diff --git a/libpurple/ciphers/hmaccipher.h b/libpurple/ciphers/hmaccipher.h
--- a/libpurple/ciphers/hmaccipher.h
+++ b/libpurple/ciphers/hmaccipher.h
@@ -40,15 +40,12 @@ typedef struct _PurpleHMACCipher Purp
typedef struct _PurpleHMACCipherClass PurpleHMACCipherClass;
struct _PurpleHMACCipher {
+ /*< private >*/
PurpleCipher gparent;
-
- void (*_purple_reserved1)(void);
- void (*_purple_reserved2)(void);
- void (*_purple_reserved3)(void);
- void (*_purple_reserved4)(void);
};
struct _PurpleHMACCipherClass {
+ /*< private >*/
PurpleCipherClass gparent;
void (*_purple_reserved1)(void);
diff --git a/libpurple/ciphers/md4hash.h b/libpurple/ciphers/md4hash.h
--- a/libpurple/ciphers/md4hash.h
+++ b/libpurple/ciphers/md4hash.h
@@ -38,15 +38,12 @@ typedef struct _PurpleMD4Hash PurpleM
typedef struct _PurpleMD4HashClass PurpleMD4HashClass;
struct _PurpleMD4Hash {
+ /*< private >*/
PurpleHash parent;
-
- void (*_purple_reserved1)(void);
- void (*_purple_reserved2)(void);
- void (*_purple_reserved3)(void);
- void (*_purple_reserved4)(void);
};
struct _PurpleMD4HashClass {
+ /*< private >*/
PurpleHashClass parent;
void (*_purple_reserved1)(void);
diff --git a/libpurple/ciphers/md5hash.h b/libpurple/ciphers/md5hash.h
--- a/libpurple/ciphers/md5hash.h
+++ b/libpurple/ciphers/md5hash.h
@@ -39,15 +39,12 @@ typedef struct _PurpleMD5Hash PurpleM
typedef struct _PurpleMD5HashClass PurpleMD5HashClass;
struct _PurpleMD5Hash {
+ /*< private >*/
PurpleHash gparent;
-
- void (*_purple_reserved1)(void);
- void (*_purple_reserved2)(void);
- void (*_purple_reserved3)(void);
- void (*_purple_reserved4)(void);
};
struct _PurpleMD5HashClass {
+ /*< private >*/
PurpleHashClass gparent;
void (*_purple_reserved1)(void);
diff --git a/libpurple/ciphers/pbkdf2cipher.h b/libpurple/ciphers/pbkdf2cipher.h
--- a/libpurple/ciphers/pbkdf2cipher.h
+++ b/libpurple/ciphers/pbkdf2cipher.h
@@ -40,15 +40,12 @@ typedef struct _PurplePBKDF2Cipher Pur
typedef struct _PurplePBKDF2CipherClass PurplePBKDF2CipherClass;
struct _PurplePBKDF2Cipher {
+ /*< private >*/
PurpleCipher gparent;
-
- void (*_purple_reserved1)(void);
- void (*_purple_reserved2)(void);
- void (*_purple_reserved3)(void);
- void (*_purple_reserved4)(void);
};
struct _PurplePBKDF2CipherClass {
+ /*< private >*/
PurpleCipherClass gparent;
void (*_purple_reserved1)(void);
diff --git a/libpurple/ciphers/rc4cipher.h b/libpurple/ciphers/rc4cipher.h
--- a/libpurple/ciphers/rc4cipher.h
+++ b/libpurple/ciphers/rc4cipher.h
@@ -39,15 +39,12 @@ typedef struct _PurpleRC4Cipher Purpl
typedef struct _PurpleRC4CipherClass PurpleRC4CipherClass;
struct _PurpleRC4Cipher {
+ /*< private >*/
PurpleCipher gparent;
-
- void (*_purple_reserved1)(void);
- void (*_purple_reserved2)(void);
- void (*_purple_reserved3)(void);
- void (*_purple_reserved4)(void);
};
struct _PurpleRC4CipherClass {
+ /*< private >*/
PurpleCipherClass gparent;
void (*_purple_reserved1)(void);
diff --git a/libpurple/ciphers/sha1hash.h b/libpurple/ciphers/sha1hash.h
--- a/libpurple/ciphers/sha1hash.h
+++ b/libpurple/ciphers/sha1hash.h
@@ -39,15 +39,12 @@ typedef struct _PurpleSHA1Hash Purple
typedef struct _PurpleSHA1HashClass PurpleSHA1HashClass;
struct _PurpleSHA1Hash {
+ /*< private >*/
PurpleHash gparent;
-
- void (*_purple_reserved1)(void);
- void (*_purple_reserved2)(void);
- void (*_purple_reserved3)(void);
- void (*_purple_reserved4)(void);
};
struct _PurpleSHA1HashClass {
+ /*< private >*/
PurpleHashClass gparent;
void (*_purple_reserved1)(void);
diff --git a/libpurple/ciphers/sha256hash.h b/libpurple/ciphers/sha256hash.h
--- a/libpurple/ciphers/sha256hash.h
+++ b/libpurple/ciphers/sha256hash.h
@@ -39,15 +39,12 @@ typedef struct _PurpleSHA256Hash Purpl
typedef struct _PurpleSHA256HashClass PurpleSHA256HashClass;
struct _PurpleSHA256Hash {
+ /*< private >*/
PurpleHash gparent;
-
- void (*_purple_reserved1)(void);
- void (*_purple_reserved2)(void);
- void (*_purple_reserved3)(void);
- void (*_purple_reserved4)(void);
};
struct _PurpleSHA256HashClass {
+ /*< private >*/
PurpleHashClass gparent;
void (*_purple_reserved1)(void);
diff --git a/libpurple/circularbuffer.h b/libpurple/circularbuffer.h
--- a/libpurple/circularbuffer.h
+++ b/libpurple/circularbuffer.h
@@ -38,15 +38,12 @@ typedef struct _PurpleCircularBuffer
typedef struct _PurpleCircularBufferClass PurpleCircularBufferClass;
struct _PurpleCircularBuffer {
+ /*< private >*/
GObject parent;
-
- void (*purple_reserved1)(void);
- void (*purple_reserved2)(void);
- void (*purple_reserved3)(void);
- void (*purple_reserved4)(void);
};
struct _PurpleCircularBufferClass {
+ /*< private >*/
GObjectClass parent;
void (*grow)(PurpleCircularBuffer *buffer, gsize len);
diff --git a/libpurple/conversation.h b/libpurple/conversation.h
--- a/libpurple/conversation.h
+++ b/libpurple/conversation.h
@@ -123,11 +123,6 @@ struct _PurpleConversation
* field provided to the UIs -- it is not used by the libpurple core.
*/
gpointer ui_data;
-
- void (*_purple_reserved1)(void);
- void (*_purple_reserved2)(void);
- void (*_purple_reserved3)(void);
- void (*_purple_reserved4)(void);
};
/** Base class for all #PurpleConversation's */
diff --git a/libpurple/conversationtypes.h b/libpurple/conversationtypes.h
--- a/libpurple/conversationtypes.h
+++ b/libpurple/conversationtypes.h
@@ -102,11 +102,6 @@ struct _PurpleIMConversation
{
/*< private >*/
PurpleConversation parent_object;
-
- void (*_purple_reserved1)(void);
- void (*_purple_reserved2)(void);
- void (*_purple_reserved3)(void);
More information about the Commits
mailing list