/soc/2013/ankitkv/gobjectification: 491f8d2fa318: Merged soc.201...

Ankit Vani a at nevitus.org
Sat Oct 12 11:26:38 EDT 2013


Changeset: 491f8d2fa318bd927e578c8d78cd82365079fe33
Author:	 Ankit Vani <a at nevitus.org>
Date:	 2013-10-12 20:56 +0530
Branch:	 soc.2013.gobjectification.plugins
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/491f8d2fa318

Description:

Merged soc.2013.gobjectification branch

diffstat:

 ChangeLog.API                         |   4 ++++
 finch/gntroomlist.c                   |   8 ++++----
 libpurple/ciphers/aescipher.c         |   2 +-
 libpurple/ciphers/aescipher.h         |   4 ++--
 libpurple/ciphers/des3cipher.c        |   2 +-
 libpurple/ciphers/des3cipher.h        |   4 ++--
 libpurple/ciphers/hmaccipher.c        |   2 +-
 libpurple/ciphers/hmaccipher.h        |   4 ++--
 libpurple/ciphers/md4hash.c           |   2 +-
 libpurple/ciphers/md4hash.h           |   4 ++--
 libpurple/ciphers/md5hash.c           |   2 +-
 libpurple/ciphers/md5hash.h           |   4 ++--
 libpurple/ciphers/pbkdf2cipher.c      |   2 +-
 libpurple/ciphers/pbkdf2cipher.h      |   4 ++--
 libpurple/ciphers/rc4cipher.c         |   2 +-
 libpurple/ciphers/rc4cipher.h         |   4 ++--
 libpurple/ciphers/sha1hash.c          |   2 +-
 libpurple/ciphers/sha1hash.h          |   4 ++--
 libpurple/ciphers/sha256hash.c        |   2 +-
 libpurple/ciphers/sha256hash.h        |   4 ++--
 libpurple/protocols/yahoo/yahoochat.c |   2 +-
 libpurple/roomlist.c                  |   8 ++++----
 libpurple/roomlist.h                  |  12 ++++++------
 pidgin/gtkmenutray.c                  |   2 +-
 pidgin/gtkmenutray.h                  |   4 ++--
 pidgin/gtkroomlist.c                  |  20 ++++++++++----------
 26 files changed, 59 insertions(+), 55 deletions(-)

diffs (truncated from 577 to 300 lines):

diff --git a/ChangeLog.API b/ChangeLog.API
--- a/ChangeLog.API
+++ b/ChangeLog.API
@@ -298,6 +298,10 @@ version 3.0.0 (??/??/????):
 		* proto_chat_entry has been renamed to PurpleProtocolChatEntry
 		* PurpleRoomlist is now a GObject. Please see the documentation for
 		  details.
+		* purple_roomlist_room_get_type is now
+		  purple_roomlist_room_get_room_type
+		* purple_roomlist_field_get_type is now
+		  purple_roomlist_field_get_field_type
 		* purple_srv_resolve now takes a PurpleAccount as the first parameter
 		* PurpleStatus is now a GObject. Please see the documentation for
 		  details.
diff --git a/finch/gntroomlist.c b/finch/gntroomlist.c
--- a/finch/gntroomlist.c
+++ b/finch/gntroomlist.c
@@ -142,7 +142,7 @@ roomlist_activated(GntWidget *widget)
 	if (!room)
 		return;
 
-	switch (purple_roomlist_room_get_type(room)) {
+	switch (purple_roomlist_room_get_room_type(room)) {
 		case PURPLE_ROOMLIST_ROOMTYPE_ROOM:
 			purple_roomlist_room_join(froomlist.roomlist, room);
 			break;
@@ -187,7 +187,7 @@ roomlist_selection_changed(GntWidget *wi
 				purple_roomlist_field_get_label(f), GNT_TEXT_FLAG_BOLD);
 		gnt_text_view_append_text_with_flags(tv, ": ", GNT_TEXT_FLAG_BOLD);
 
-		switch (purple_roomlist_field_get_type(f)) {
+		switch (purple_roomlist_field_get_field_type(f)) {
 			case PURPLE_ROOMLIST_FIELD_BOOL:
 				label = g_strdup(iter->data ? "True" : "False");
 				break;
@@ -203,7 +203,7 @@ roomlist_selection_changed(GntWidget *wi
 		first = FALSE;
 	}
 
-	if (purple_roomlist_room_get_type(room) == PURPLE_ROOMLIST_ROOMTYPE_CATEGORY) {
+	if (purple_roomlist_room_get_room_type(room) == PURPLE_ROOMLIST_ROOMTYPE_CATEGORY) {
 		if (!first)
 			gnt_text_view_append_text_with_flags(tv, "\n", GNT_TEXT_FLAG_NORMAL);
 		gnt_text_view_append_text_with_flags(tv,
@@ -361,7 +361,7 @@ fl_add_room(PurpleRoomlist *roomlist, Pu
 	if (froomlist.roomlist != roomlist)
 		return;
 
-	category = (purple_roomlist_room_get_type(room) == PURPLE_ROOMLIST_ROOMTYPE_CATEGORY);
+	category = (purple_roomlist_room_get_room_type(room) == PURPLE_ROOMLIST_ROOMTYPE_CATEGORY);
 	gnt_tree_remove(GNT_TREE(froomlist.tree), room);
 	gnt_tree_add_row_after(GNT_TREE(froomlist.tree), room,
 			gnt_tree_create_row(GNT_TREE(froomlist.tree),
diff --git a/libpurple/ciphers/aescipher.c b/libpurple/ciphers/aescipher.c
--- a/libpurple/ciphers/aescipher.c
+++ b/libpurple/ciphers/aescipher.c
@@ -613,7 +613,7 @@ purple_aes_cipher_init(PurpleCipher *cip
  * API
  *****************************************************************************/
 GType
-purple_aes_cipher_get_gtype(void) {
+purple_aes_cipher_get_type(void) {
 	static GType type = 0;
 
 	if(type == 0) {
diff --git a/libpurple/ciphers/aescipher.h b/libpurple/ciphers/aescipher.h
--- a/libpurple/ciphers/aescipher.h
+++ b/libpurple/ciphers/aescipher.h
@@ -28,7 +28,7 @@
 
 #include "cipher.h"
 
-#define PURPLE_TYPE_AES_CIPHER				(purple_aes_cipher_get_gtype())
+#define PURPLE_TYPE_AES_CIPHER				(purple_aes_cipher_get_type())
 #define PURPLE_AES_CIPHER(obj)				(G_TYPE_CHECK_INSTANCE_CAST((obj), PURPLE_TYPE_AES_CIPHER, PurpleAESCipher))
 #define PURPLE_AES_CIPHER_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST((klass), PURPLE_TYPE_AES_CIPHER, PurpleAESCipherClass))
 #define PURPLE_IS_AES_CIPHER(obj)			(G_TYPE_CHECK_INSTANCE_TYPE((obj), PURPLE_TYPE_AES_CIPHER))
@@ -55,7 +55,7 @@ struct _PurpleAESCipherClass {
 
 G_BEGIN_DECLS
 
-GType purple_aes_cipher_get_gtype(void);
+GType purple_aes_cipher_get_type(void);
 
 PurpleCipher *purple_aes_cipher_new(void);
 
diff --git a/libpurple/ciphers/des3cipher.c b/libpurple/ciphers/des3cipher.c
--- a/libpurple/ciphers/des3cipher.c
+++ b/libpurple/ciphers/des3cipher.c
@@ -485,7 +485,7 @@ purple_des3_cipher_init(PurpleCipher *ci
  * API
  *****************************************************************************/
 GType
-purple_des3_cipher_get_gtype(void) {
+purple_des3_cipher_get_type(void) {
 	static GType type = 0;
 
 	if(type == 0) {
diff --git a/libpurple/ciphers/des3cipher.h b/libpurple/ciphers/des3cipher.h
--- a/libpurple/ciphers/des3cipher.h
+++ b/libpurple/ciphers/des3cipher.h
@@ -28,7 +28,7 @@
 
 #include "cipher.h"
 
-#define PURPLE_TYPE_DES3_CIPHER				(purple_des3_cipher_get_gtype())
+#define PURPLE_TYPE_DES3_CIPHER				(purple_des3_cipher_get_type())
 #define PURPLE_DES3_CIPHER(obj)				(G_TYPE_CHECK_INSTANCE_CAST((obj), PURPLE_TYPE_DES3_CIPHER, PurpleDES3Cipher))
 #define PURPLE_DES3_CIPHER_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST((klass), PURPLE_TYPE_DES3_CIPHER, PurpleDES3CipherClass))
 #define PURPLE_IS_DES3_CIPHER(obj)			(G_TYPE_CHECK_INSTANCE_TYPE((obj), PURPLE_TYPE_DES3_CIPHER))
@@ -55,7 +55,7 @@ struct _PurpleDES3CipherClass {
 
 G_BEGIN_DECLS
 
-GType purple_des3_cipher_get_gtype(void);
+GType purple_des3_cipher_get_type(void);
 
 PurpleCipher *purple_des3_cipher_new(void);
 
diff --git a/libpurple/ciphers/hmaccipher.c b/libpurple/ciphers/hmaccipher.c
--- a/libpurple/ciphers/hmaccipher.c
+++ b/libpurple/ciphers/hmaccipher.c
@@ -287,7 +287,7 @@ purple_hmac_cipher_class_init(PurpleHMAC
  * PurpleHMACCipher API
  *****************************************************************************/
 GType
-purple_hmac_cipher_get_gtype(void) {
+purple_hmac_cipher_get_type(void) {
 	static GType type = 0;
 
 	if(type == 0) {
diff --git a/libpurple/ciphers/hmaccipher.h b/libpurple/ciphers/hmaccipher.h
--- a/libpurple/ciphers/hmaccipher.h
+++ b/libpurple/ciphers/hmaccipher.h
@@ -29,7 +29,7 @@
 #include "cipher.h"
 #include "hash.h"
 
-#define PURPLE_TYPE_HMAC_CIPHER				(purple_hmac_cipher_get_gtype())
+#define PURPLE_TYPE_HMAC_CIPHER				(purple_hmac_cipher_get_type())
 #define PURPLE_HMAC_CIPHER(obj)				(G_TYPE_CHECK_INSTANCE_CAST((obj), PURPLE_TYPE_HMAC_CIPHER, PurpleHMACCipher))
 #define PURPLE_HMAC_CIPHER_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST((klass), PURPLE_TYPE_HMAC_CIPHER, PurpleHMACCipherClass))
 #define PURPLE_IS_HMAC_CIPHER(obj)			(G_TYPE_CHECK_INSTANCE_TYPE((obj), PURPLE_TYPE_HMAC_CIPHER))
@@ -56,7 +56,7 @@ struct _PurpleHMACCipherClass {
 
 G_BEGIN_DECLS
 
-GType purple_hmac_cipher_get_gtype(void);
+GType purple_hmac_cipher_get_type(void);
 
 PurpleCipher *purple_hmac_cipher_new(PurpleHash *hash);
 
diff --git a/libpurple/ciphers/md4hash.c b/libpurple/ciphers/md4hash.c
--- a/libpurple/ciphers/md4hash.c
+++ b/libpurple/ciphers/md4hash.c
@@ -279,7 +279,7 @@ purple_md4_hash_class_init(PurpleMD4Hash
  * API
  *****************************************************************************/
 GType
-purple_md4_hash_get_gtype(void) {
+purple_md4_hash_get_type(void) {
 	static GType type = 0;
 
 	if(type == 0) {
diff --git a/libpurple/ciphers/md4hash.h b/libpurple/ciphers/md4hash.h
--- a/libpurple/ciphers/md4hash.h
+++ b/libpurple/ciphers/md4hash.h
@@ -27,7 +27,7 @@
 
 #include "hash.h"
 
-#define PURPLE_TYPE_MD4_HASH				(purple_md4_hash_get_gtype())
+#define PURPLE_TYPE_MD4_HASH				(purple_md4_hash_get_type())
 #define PURPLE_MD4_HASH(obj)				(G_TYPE_CHECK_INSTANCE_CAST((obj), PURPLE_TYPE_MD4_HASH, PurpleMD4Hash))
 #define PURPLE_MD4_HASH_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST((klass), PURPLE_TYPE_MD4_HASH, PurpleMD4HashClass))
 #define PURPLE_IS_MD4_HASH(obj)				(G_TYPE_CHECK_INSTANCE_TYPE((obj), PURPLE_TYPE_MD4_HASH))
@@ -54,7 +54,7 @@ struct _PurpleMD4HashClass {
 
 G_BEGIN_DECLS
 
-GType purple_md4_hash_get_gtype(void);
+GType purple_md4_hash_get_type(void);
 
 PurpleHash *purple_md4_hash_new(void);
 
diff --git a/libpurple/ciphers/md5hash.c b/libpurple/ciphers/md5hash.c
--- a/libpurple/ciphers/md5hash.c
+++ b/libpurple/ciphers/md5hash.c
@@ -159,7 +159,7 @@ purple_md5_hash_init(PurpleHash *hash)
  * API
  *****************************************************************************/
 GType
-purple_md5_hash_get_gtype(void) {
+purple_md5_hash_get_type(void) {
 	static GType type = 0;
 
 	if(type == 0) {
diff --git a/libpurple/ciphers/md5hash.h b/libpurple/ciphers/md5hash.h
--- a/libpurple/ciphers/md5hash.h
+++ b/libpurple/ciphers/md5hash.h
@@ -28,7 +28,7 @@
 
 #include "hash.h"
 
-#define PURPLE_TYPE_MD5_HASH				(purple_md5_hash_get_gtype())
+#define PURPLE_TYPE_MD5_HASH				(purple_md5_hash_get_type())
 #define PURPLE_MD5_HASH(obj)				(G_TYPE_CHECK_INSTANCE_CAST((obj), PURPLE_TYPE_MD5_HASH, PurpleMD5Hash))
 #define PURPLE_MD5_HASH_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST((klass), PURPLE_TYPE_MD5_HASH, PurpleMD5HashClass))
 #define PURPLE_IS_MD5_HASH(obj)				(G_TYPE_CHECK_INSTANCE_TYPE((obj), PURPLE_TYPE_MD5_HASH))
@@ -55,7 +55,7 @@ struct _PurpleMD5HashClass {
 
 G_BEGIN_DECLS
 
-GType purple_md5_hash_get_gtype(void);
+GType purple_md5_hash_get_type(void);
 
 PurpleHash *purple_md5_hash_new(void);
 
diff --git a/libpurple/ciphers/pbkdf2cipher.c b/libpurple/ciphers/pbkdf2cipher.c
--- a/libpurple/ciphers/pbkdf2cipher.c
+++ b/libpurple/ciphers/pbkdf2cipher.c
@@ -361,7 +361,7 @@ purple_pbkdf2_cipher_init(PurpleCipher *
  * API
  *****************************************************************************/
 GType
-purple_pbkdf2_cipher_get_gtype(void) {
+purple_pbkdf2_cipher_get_type(void) {
 	static GType type = 0;
 
 	if(type == 0) {
diff --git a/libpurple/ciphers/pbkdf2cipher.h b/libpurple/ciphers/pbkdf2cipher.h
--- a/libpurple/ciphers/pbkdf2cipher.h
+++ b/libpurple/ciphers/pbkdf2cipher.h
@@ -29,7 +29,7 @@
 #include "cipher.h"
 #include "hash.h"
 
-#define PURPLE_TYPE_PBKDF2_CIPHER				(purple_pbkdf2_cipher_get_gtype())
+#define PURPLE_TYPE_PBKDF2_CIPHER				(purple_pbkdf2_cipher_get_type())
 #define PURPLE_PBKDF2_CIPHER(obj)				(G_TYPE_CHECK_INSTANCE_CAST((obj), PURPLE_TYPE_PBKDF2_CIPHER, PurplePBKDF2Cipher))
 #define PURPLE_PBKDF2_CIPHER_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST((klass), PURPLE_TYPE_PBKDF2_CIPHER, PurplePBKDF2CipherClass))
 #define PURPLE_IS_PBKDF2_CIPHER(obj)			(G_TYPE_CHECK_INSTANCE_TYPE((obj), PURPLE_TYPE_PBKDF2_CIPHER))
@@ -56,7 +56,7 @@ struct _PurplePBKDF2CipherClass {
 
 G_BEGIN_DECLS
 
-GType purple_pbkdf2_cipher_get_gtype(void);
+GType purple_pbkdf2_cipher_get_type(void);
 
 PurpleCipher *purple_pbkdf2_cipher_new(PurpleHash *hash);
 
diff --git a/libpurple/ciphers/rc4cipher.c b/libpurple/ciphers/rc4cipher.c
--- a/libpurple/ciphers/rc4cipher.c
+++ b/libpurple/ciphers/rc4cipher.c
@@ -200,7 +200,7 @@ purple_rc4_cipher_init(PurpleCipher *cip
  * API
  *****************************************************************************/
 GType
-purple_rc4_cipher_get_gtype(void) {
+purple_rc4_cipher_get_type(void) {
 	static GType type = 0;
 
 	if(type == 0) {
diff --git a/libpurple/ciphers/rc4cipher.h b/libpurple/ciphers/rc4cipher.h
--- a/libpurple/ciphers/rc4cipher.h
+++ b/libpurple/ciphers/rc4cipher.h
@@ -28,7 +28,7 @@
 
 #include "cipher.h"
 
-#define PURPLE_TYPE_RC4_CIPHER				(purple_rc4_cipher_get_gtype())
+#define PURPLE_TYPE_RC4_CIPHER				(purple_rc4_cipher_get_type())
 #define PURPLE_RC4_CIPHER(obj)				(G_TYPE_CHECK_INSTANCE_CAST((obj), PURPLE_TYPE_RC4_CIPHER, PurpleRC4Cipher))
 #define PURPLE_RC4_CIPHER_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST((klass), PURPLE_TYPE_RC4_CIPHER, PurpleRC4CipherClass))
 #define PURPLE_IS_RC4_CIPHER(obj)			(G_TYPE_CHECK_INSTANCE_TYPE((obj), PURPLE_TYPE_RC4_CIPHER))
@@ -55,7 +55,7 @@ struct _PurpleRC4CipherClass {
 
 G_BEGIN_DECLS
 
-GType purple_rc4_cipher_get_gtype(void);
+GType purple_rc4_cipher_get_type(void);
 
 PurpleCipher *purple_rc4_cipher_new(void);
 
diff --git a/libpurple/ciphers/sha1hash.c b/libpurple/ciphers/sha1hash.c
--- a/libpurple/ciphers/sha1hash.c
+++ b/libpurple/ciphers/sha1hash.c
@@ -159,7 +159,7 @@ purple_sha1_hash_init(PurpleHash *hash)
  * API
  *****************************************************************************/
 GType
-purple_sha1_hash_get_gtype(void) {
+purple_sha1_hash_get_type(void) {
 	static GType type = 0;
 
 	if(type == 0) {
diff --git a/libpurple/ciphers/sha1hash.h b/libpurple/ciphers/sha1hash.h
--- a/libpurple/ciphers/sha1hash.h
+++ b/libpurple/ciphers/sha1hash.h
@@ -28,7 +28,7 @@



More information about the Commits mailing list