gobjectification: 47d15827: Use PURPLE_TYPE_X consistently.
sadrul at pidgin.im
sadrul at pidgin.im
Wed Jul 14 13:30:57 EDT 2010
----------------------------------------------------------------------
Revision: 47d158270a19780403c75e59f02cadb72e764a93
Parent: 979e31044227d826816a51a0eea1e47535144bc8
Author: sadrul at pidgin.im
Date: 07/14/10 13:13:48
Branch: im.pidgin.gobjectification
URL: http://d.pidgin.im/viewmtn/revision/info/47d158270a19780403c75e59f02cadb72e764a93
Changelog:
Use PURPLE_TYPE_X consistently.
Instead of some PURPLE_TYPE_X and some PURPLE_X_TYPE, always use
PURPLE_TYPE_X.
Changes against parent 979e31044227d826816a51a0eea1e47535144bc8
patched libpurple/blist-node.c
patched libpurple/blist-node.h
patched libpurple/blist.c
patched libpurple/buddy.c
patched libpurple/buddy.h
patched libpurple/chat.c
patched libpurple/chat.h
patched libpurple/contact.c
patched libpurple/contact.h
patched libpurple/group.c
patched libpurple/group.h
-------------- next part --------------
============================================================
--- libpurple/blist.c edfa81f242fc2463a0ddfe3412803854260f4534
+++ libpurple/blist.c 7909e99778f02790409f8bd400bf3ed6e85339a2
@@ -38,12 +38,12 @@ typedef struct _PurpleBuddyListClass Pur
/** @copydoc _PurpleBlist */
typedef struct _PurpleBuddyList PurpleBuddyList;
typedef struct _PurpleBuddyListClass PurpleBuddyListClass;
-#define PURPLE_BUDDY_LIST_TYPE (purple_blist_get_gtype ())
-#define PURPLE_BUDDY_LIST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PURPLE_BUDDY_LIST_TYPE, PurpleBuddyList))
-#define PURPLE_IS_BUDDY_LIST(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PURPLE_BUDDY_LIST_TYPE))
-#define PURPLE_BUDDY_LIST_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PURPLE_BUDDY_LIST_TYPE, PurpleBuddyListClass))
-#define PURPLE_IS_BUDDY_LIST_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PURPLE_BUDDY_LIST_TYPE))
-#define PURPLE_GET_BUDDY_LIST_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PURPLE_BUDDY_LIST_TYPE, PurpleBuddyListClass))
+#define PURPLE_TYPE_BUDDY_LIST (purple_blist_get_gtype ())
+#define PURPLE_BUDDY_LIST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PURPLE_TYPE_BUDDY_LIST, PurpleBuddyList))
+#define PURPLE_IS_BUDDY_LIST(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PURPLE_TYPE_BUDDY_LIST))
+#define PURPLE_BUDDY_LIST_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PURPLE_TYPE_BUDDY_LIST, PurpleBuddyListClass))
+#define PURPLE_IS_BUDDY_LIST_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PURPLE_TYPE_BUDDY_LIST))
+#define PURPLE_GET_BUDDY_LIST_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PURPLE_TYPE_BUDDY_LIST, PurpleBuddyListClass))
#define PURPLE_BLIST (purple_blist_get_list())
@@ -112,7 +112,7 @@ purple_blist_get_list()
if(!list){
GList *account;
PurpleBlistUiOps *ui_ops = purple_blist_get_ui_ops();
- list = g_object_new(PURPLE_BUDDY_LIST_TYPE, NULL);
+ list = g_object_new(PURPLE_TYPE_BUDDY_LIST, NULL);
purple_blist_load();
for (account = purple_accounts_all(); account != NULL; account = account->next) {
@@ -1511,13 +1511,13 @@ purple_blist_class_init(PurpleBuddyListC
/* When a new group gets created, we add it to the list. We also update the
* 'groups_cache' hashtable in the list. We update the list and the hashtable
* when the group gets removed or renamed. (TODO) */
- purple_g_signal_connect(PURPLE_GROUP_TYPE, "new", G_CALLBACK(new_group_added), NULL);
- purple_g_signal_connect(PURPLE_GROUP_TYPE, "destroying", G_CALLBACK(group_destroyed), NULL);
+ purple_g_signal_connect(PURPLE_TYPE_GROUP, "new", G_CALLBACK(new_group_added), NULL);
+ purple_g_signal_connect(PURPLE_TYPE_GROUP, "destroying", G_CALLBACK(group_destroyed), NULL);
/* When a new buddy gets created, we update the 'buddies' and 'buddies_cache'
* hashtables. We also update the hashtables when the buddy gets removed, moved
* or renamed. (TODO) */
- purple_g_signal_connect(PURPLE_BUDDY_TYPE, "new", G_CALLBACK(new_buddy_added), NULL);
+ purple_g_signal_connect(PURPLE_TYPE_BUDDY, "new", G_CALLBACK(new_buddy_added), NULL);
}
static void
============================================================
--- libpurple/blist-node.c c509e72c41b6fada28d6765917602119e1d22ef0
+++ libpurple/blist-node.c 72110be4c24ca99c6589df824f20a5e7c9d12b03
@@ -42,7 +42,7 @@ static guint signals[SIG_LAST] = { 0 };
};
static guint signals[SIG_LAST] = { 0 };
-#define PURPLE_BLIST_NODE_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), PURPLE_BLIST_NODE_TYPE, PurpleBlistNodePrivate))
+#define PURPLE_BLIST_NODE_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), PURPLE_TYPE_BLIST_NODE, PurpleBlistNodePrivate))
typedef struct _PurpleBlistNodePrivate PurpleBlistNodePrivate;
struct _PurpleBlistNodePrivate
@@ -777,25 +777,25 @@ purple_blist_node_class_init(PurpleBlist
G_SIGNAL_ACTION, 0, NULL, NULL,
g_cclosure_marshal_VOID__OBJECT,
G_TYPE_NONE,
- 1, PURPLE_BLIST_NODE_TYPE); /* The child that updated */
+ 1, PURPLE_TYPE_BLIST_NODE); /* The child that updated */
signals[SIG_CHILD_ADDED] = g_signal_new("child-added", G_OBJECT_CLASS_TYPE(klass),
G_SIGNAL_ACTION, 0, NULL, NULL,
g_cclosure_marshal_VOID__OBJECT,
G_TYPE_NONE,
- 1, PURPLE_BLIST_NODE_TYPE); /* The child added */
+ 1, PURPLE_TYPE_BLIST_NODE); /* The child added */
signals[SIG_CHILD_REMOVED] = g_signal_new("child-removed", G_OBJECT_CLASS_TYPE(klass),
G_SIGNAL_ACTION, 0, NULL, NULL,
g_cclosure_marshal_VOID__OBJECT,
G_TYPE_NONE,
- 1, PURPLE_BLIST_NODE_TYPE); /* The child removed */
+ 1, PURPLE_TYPE_BLIST_NODE); /* The child removed */
signals[SIG_PARENT_SET] = g_signal_new("parent-set", G_OBJECT_CLASS_TYPE(klass),
G_SIGNAL_ACTION, 0, NULL, NULL,
purple_smarshal_VOID__OBJECT_OBJECT,
G_TYPE_NONE,
- 2, PURPLE_BLIST_NODE_TYPE, PURPLE_BLIST_NODE_TYPE); /* New parent, Old parent */
+ 2, PURPLE_TYPE_BLIST_NODE, PURPLE_TYPE_BLIST_NODE); /* New parent, Old parent */
}
static void
============================================================
--- libpurple/buddy.c 24af7351c14fba9ce7383993dc03f2ca7edf18ea
+++ libpurple/buddy.c cd6d85a7b73b3d7f419e21e2265db20ee9451691
@@ -32,7 +32,7 @@
#include "xmlnode.h"
#include "buddy.h"
-#define PURPLE_BUDDY_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), PURPLE_BUDDY_TYPE, PurpleBuddyPrivate))
+#define PURPLE_BUDDY_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), PURPLE_TYPE_BUDDY, PurpleBuddyPrivate))
typedef struct _PurpleBuddyPrivate PurpleBuddyPrivate;
static PurpleBlistNodeClass *parent_class = NULL;
@@ -530,7 +530,7 @@ PurpleBuddy *purple_buddy_new(PurpleAcco
g_return_val_if_fail(account != NULL, NULL);
g_return_val_if_fail(name != NULL, NULL);
- buddy = g_object_new(PURPLE_BUDDY_TYPE,
+ buddy = g_object_new(PURPLE_TYPE_BUDDY,
PROP_ACCOUNT_S, account,
PROP_NAME_S, name,
PROP_ALIAS_S, alias,
@@ -587,7 +587,7 @@ purple_buddy_get_group(PurpleBuddy *budd
{
g_return_val_if_fail(buddy != NULL, NULL);
- return PURPLE_GROUP(purple_blist_node_find_container(PURPLE_BLIST_NODE(buddy), PURPLE_GROUP_TYPE));
+ return PURPLE_GROUP(purple_blist_node_find_container(PURPLE_BLIST_NODE(buddy), PURPLE_TYPE_GROUP));
}
@@ -696,7 +696,7 @@ purple_buddy_get_type(void)
NULL /* value_table */
};
- type = g_type_register_static(PURPLE_BLIST_NODE_TYPE,
+ type = g_type_register_static(PURPLE_TYPE_BLIST_NODE,
"PurpleBuddy",
&info, 0);
}
============================================================
--- libpurple/chat.c 4b870c34526854bf18d22cc9acf1d6f25876149b
+++ libpurple/chat.c be54890dbd017ca9c06e0429cbab5a4177767321
@@ -30,7 +30,7 @@
#include "chat.h"
#include "blist.h"
-#define PURPLE_CHAT_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), PURPLE_CHAT_TYPE, PurpleChatPrivate))
+#define PURPLE_CHAT_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), PURPLE_TYPE_CHAT, PurpleChatPrivate))
typedef struct _PurpleChatPrivate PurpleChatPrivate;
struct _PurpleChatPrivate {
@@ -294,7 +294,7 @@ PurpleChat *purple_chat_new(PurpleAccoun
g_return_val_if_fail(account != NULL, NULL);
g_return_val_if_fail(components != NULL, NULL);
- chat = g_object_new(PURPLE_CHAT_TYPE,
+ chat = g_object_new(PURPLE_TYPE_CHAT,
PROP_ACCOUNT_S, account,
PROP_ALIAS_S, alias,
PROP_COMPONENTS_S, components,
@@ -395,7 +395,7 @@ purple_chat_get_group(PurpleChat *chat)
{
g_return_val_if_fail(PURPLE_IS_CHAT(chat), NULL);
- return PURPLE_GROUP(purple_blist_node_find_container(PURPLE_BLIST_NODE(chat), PURPLE_GROUP_TYPE));
+ return PURPLE_GROUP(purple_blist_node_find_container(PURPLE_BLIST_NODE(chat), PURPLE_TYPE_GROUP));
}
static void
@@ -429,7 +429,7 @@ purple_chat_get_type(void)
NULL /* value_table */
};
- type = g_type_register_static(PURPLE_BLIST_NODE_TYPE,
+ type = g_type_register_static(PURPLE_TYPE_BLIST_NODE,
"PurpleChat",
&info, 0);
}
============================================================
--- libpurple/contact.c 769befe8a3a02112beceded10a1157a8d913c6cc
+++ libpurple/contact.c d67426f798f84484ccea0f14bf0e75f286fe2f93
@@ -30,7 +30,7 @@
#include "signals.h"
#include "xmlnode.h"
-#define PURPLE_CONTACT_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), PURPLE_CONTACT_TYPE, PurpleContactPrivate))
+#define PURPLE_CONTACT_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), PURPLE_TYPE_CONTACT, PurpleContactPrivate))
typedef struct _PurpleContactPrivate PurpleContactPrivate;
struct _PurpleContactPrivate {
@@ -208,7 +208,7 @@ PurpleContact *purple_contact_new()
PurpleContact *purple_contact_new()
{
- return g_object_new(PURPLE_CONTACT_TYPE, NULL);
+ return g_object_new(PURPLE_TYPE_CONTACT, NULL);
}
PurpleContact *purple_buddy_get_contact(PurpleBuddy *buddy)
@@ -543,7 +543,7 @@ purple_contact_get_type(void)
NULL /* value_table */
};
- type = g_type_register_static(PURPLE_BLIST_NODE_TYPE,
+ type = g_type_register_static(PURPLE_TYPE_BLIST_NODE,
"PurpleContact",
&info, 0);
}
============================================================
--- libpurple/group.c 024e018048d92bdda0bbedd5789528e21fd57e35
+++ libpurple/group.c 6cc987ef69b1f59391842fafba1fe0fc1d8cde18
@@ -30,7 +30,7 @@
#include "signals.h"
#include "xmlnode.h"
-#define PURPLE_GROUP_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), PURPLE_GROUP_TYPE, PurpleGroupPrivate))
+#define PURPLE_GROUP_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), PURPLE_TYPE_GROUP, PurpleGroupPrivate))
typedef struct _PurpleGroupPrivate PurpleGroupPrivate;
static PurpleBlistNodeClass *parent_class = NULL;
@@ -324,7 +324,7 @@ PurpleGroup *purple_group_new(const char
if (group != NULL)
return group;
- group = g_object_new(PURPLE_GROUP_TYPE,
+ group = g_object_new(PURPLE_TYPE_GROUP,
PROP_NAME_S, name,
NULL);
@@ -462,7 +462,7 @@ purple_group_get_type(void)
NULL /* value_table */
};
- type = g_type_register_static(PURPLE_BLIST_NODE_TYPE,
+ type = g_type_register_static(PURPLE_TYPE_BLIST_NODE,
"PurpleGroup",
&info, 0);
}
============================================================
--- libpurple/blist-node.h 162811e27f33e7c13e88e5716e008ccbe9521e92
+++ libpurple/blist-node.h 42eaba9f44afeee582105e34ab4f16fca97218eb
@@ -50,12 +50,12 @@ typedef struct _PurpleBlistNodeClass Pur
#include "pobject.h"
-#define PURPLE_BLIST_NODE_TYPE (purple_blist_node_get_gtype ())
-#define PURPLE_BLIST_NODE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PURPLE_BLIST_NODE_TYPE, PurpleBlistNode))
-#define PURPLE_IS_BLIST_NODE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PURPLE_BLIST_NODE_TYPE))
-#define PURPLE_BLIST_NODE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PURPLE_BLIST_NODE_TYPE, PurpleBlistNodeClass))
-#define PURPLE_IS_BLIST_NODE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PURPLE_BLIST_NODE_TYPE))
-#define PURPLE_GET_BLIST_NODE_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PURPLE_BLIST_NODE_TYPE, PurpleBlistNodeClass))
+#define PURPLE_TYPE_BLIST_NODE (purple_blist_node_get_gtype ())
+#define PURPLE_BLIST_NODE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PURPLE_TYPE_BLIST_NODE, PurpleBlistNode))
+#define PURPLE_IS_BLIST_NODE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PURPLE_TYPE_BLIST_NODE))
+#define PURPLE_BLIST_NODE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PURPLE_TYPE_BLIST_NODE, PurpleBlistNodeClass))
+#define PURPLE_IS_BLIST_NODE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PURPLE_TYPE_BLIST_NODE))
+#define PURPLE_GET_BLIST_NODE_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PURPLE_TYPE_BLIST_NODE, PurpleBlistNodeClass))
/**
* A Buddy list node. This can represent a group, a buddy, or anything else.
============================================================
--- libpurple/buddy.h cc4235c8a4dc9287a0af0f120052ca0b5ae42748
+++ libpurple/buddy.h 328b94525f46f98b98c9858cfae14b12966ab053
@@ -38,12 +38,12 @@ typedef struct _PurpleBuddyClass PurpleB
#include "status.h"
#include "group.h"
-#define PURPLE_BUDDY_TYPE (purple_buddy_get_type ())
-#define PURPLE_BUDDY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PURPLE_BUDDY_TYPE, PurpleBuddy))
-#define PURPLE_IS_BUDDY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PURPLE_BUDDY_TYPE))
-#define PURPLE_BUDDY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PURPLE_BUDDY_TYPE, PurpleBuddyClass))
-#define PURPLE_IS_BUDDY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PURPLE_BUDDY_TYPE))
-#define PURPLE_GET_BUDDY_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PURPLE_BUDDY_TYPE, PurpleBuddyClass))
+#define PURPLE_TYPE_BUDDY (purple_buddy_get_type ())
+#define PURPLE_BUDDY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PURPLE_TYPE_BUDDY, PurpleBuddy))
+#define PURPLE_IS_BUDDY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PURPLE_TYPE_BUDDY))
+#define PURPLE_BUDDY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PURPLE_TYPE_BUDDY, PurpleBuddyClass))
+#define PURPLE_IS_BUDDY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PURPLE_TYPE_BUDDY))
+#define PURPLE_GET_BUDDY_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PURPLE_TYPE_BUDDY, PurpleBuddyClass))
/**
* A buddy. This contains everything Purple will ever need to know about someone on the buddy list. Everything.
============================================================
--- libpurple/chat.h 1157d083c6006a63e3ed2140986e8f7fc4376f13
+++ libpurple/chat.h 6b10e3aed28d5270dadf61531d1f1fd5b9512668
@@ -36,12 +36,12 @@ typedef struct _PurpleChatClass PurpleCh
#include "account.h"
#include "xmlnode.h"
-#define PURPLE_CHAT_TYPE (purple_chat_get_type ())
-#define PURPLE_CHAT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PURPLE_CHAT_TYPE, PurpleChat))
-#define PURPLE_IS_CHAT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PURPLE_CHAT_TYPE))
-#define PURPLE_CHAT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PURPLE_CHAT_TYPE, PurpleChatClass))
-#define PURPLE_IS_CHAT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PURPLE_CHAT_TYPE))
-#define PURPLE_GET_CHAT_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PURPLE_CHAT_TYPE, PurpleChatClass))
+#define PURPLE_TYPE_CHAT (purple_chat_get_type ())
+#define PURPLE_CHAT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PURPLE_TYPE_CHAT, PurpleChat))
+#define PURPLE_IS_CHAT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PURPLE_TYPE_CHAT))
+#define PURPLE_CHAT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PURPLE_TYPE_CHAT, PurpleChatClass))
+#define PURPLE_IS_CHAT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PURPLE_TYPE_CHAT))
+#define PURPLE_GET_CHAT_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PURPLE_TYPE_CHAT, PurpleChatClass))
/**
* A chat. This contains everything Purple needs to put a chat room in the
============================================================
--- libpurple/contact.h 6722f41df967d59c3ca1aacb52badd5c4e992124
+++ libpurple/contact.h e479c78a795d8df308e1bf0a1fc752e62a844dab
@@ -35,12 +35,12 @@ typedef struct _PurpleContactClass Purpl
#include "buddy.h"
-#define PURPLE_CONTACT_TYPE (purple_contact_get_type ())
-#define PURPLE_CONTACT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PURPLE_CONTACT_TYPE, PurpleContact))
-#define PURPLE_IS_CONTACT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PURPLE_CONTACT_TYPE))
-#define PURPLE_CONTACT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PURPLE_CONTACT_TYPE, PurpleContactClass))
-#define PURPLE_IS_CONTACT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PURPLE_CONTACT_TYPE))
-#define PURPLE_GET_CONTACT_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PURPLE_CONTACT_TYPE, PurpleContactClass))
+#define PURPLE_TYPE_CONTACT (purple_contact_get_type ())
+#define PURPLE_CONTACT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PURPLE_TYPE_CONTACT, PurpleContact))
+#define PURPLE_IS_CONTACT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PURPLE_TYPE_CONTACT))
+#define PURPLE_CONTACT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PURPLE_TYPE_CONTACT, PurpleContactClass))
+#define PURPLE_IS_CONTACT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PURPLE_TYPE_CONTACT))
+#define PURPLE_GET_CONTACT_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PURPLE_TYPE_CONTACT, PurpleContactClass))
/**
* A contact. This contains everything Purple will ever need to know about a contact.
============================================================
--- libpurple/group.h 5c6036687bd12bbd1b710f8a1ea676f42f840656
+++ libpurple/group.h cea1365ef0b650175598aeee65c2e16cc1a101f7
@@ -38,12 +38,12 @@ typedef struct _PurpleGroupClass PurpleG
#include "contact.h"
#include "blist-node.h"
-#define PURPLE_GROUP_TYPE (purple_group_get_type ())
-#define PURPLE_GROUP(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PURPLE_GROUP_TYPE, PurpleGroup))
-#define PURPLE_IS_GROUP(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PURPLE_GROUP_TYPE))
-#define PURPLE_GROUP_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PURPLE_GROUP_TYPE, PurpleGroupClass))
-#define PURPLE_IS_GROUP_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PURPLE_GROUP_TYPE))
-#define PURPLE_GET_GROUP_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PURPLE_GROUP_TYPE, PurpleGroupClass))
+#define PURPLE_TYPE_GROUP (purple_group_get_type ())
+#define PURPLE_GROUP(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PURPLE_TYPE_GROUP, PurpleGroup))
+#define PURPLE_IS_GROUP(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PURPLE_TYPE_GROUP))
+#define PURPLE_GROUP_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PURPLE_TYPE_GROUP, PurpleGroupClass))
+#define PURPLE_IS_GROUP_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PURPLE_TYPE_GROUP))
+#define PURPLE_GET_GROUP_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PURPLE_TYPE_GROUP, PurpleGroupClass))
/**
* A group. This contains everything Purple will ever need to know about a group.
More information about the Commits
mailing list