cpw.darkrain42.xmpp.bosh: d9ec5605: Remove JabberCapsIdentity and just use J...

[paul at darkrain42.org]

-----------------------------------------------------------------
Revision: d9ec56055774d33760d531cd472a2916cf616b12
Ancestor: 2ebe3ceabe670de5e509d574e52f78e813bf3de7
Author: paul at darkrain42.org
Date: 2008-11-21T18:24:31
Branch: im.pidgin.cpw.darkrain42.xmpp.bosh
URL: http://d.pidgin.im/viewmtn/revision/info/d9ec56055774d33760d531cd472a2916cf616b12

Modified files:
        libpurple/protocols/jabber/caps.c
        libpurple/protocols/jabber/caps.h

ChangeLog: 

Remove JabberCapsIdentity and just use JabberIdentity everywhere

-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/caps.c	a072ffa55353ef0e98d83b69ee05ec763bc5ee5c
+++ libpurple/protocols/jabber/caps.c	0f78cb11a415c7a5c583726ef2315e25e36d4c74
@@ -70,7 +70,7 @@ static void jabber_caps_destroy_value(gp
 static void jabber_caps_destroy_value(gpointer value) {
 	JabberCapsValue *valuestruct = value;
 	while(valuestruct->identities) {
-		JabberCapsIdentity *id = valuestruct->identities->data;
+		JabberIdentity *id = valuestruct->identities->data;
 		g_free(id->category);
 		g_free(id->type);
 		g_free(id->name);
@@ -153,7 +153,7 @@ static void jabber_caps_load(void) {
 					const char *type = xmlnode_get_attrib(child, "type");
 					const char *name = xmlnode_get_attrib(child, "name");
 					
-					JabberCapsIdentity *id = g_new0(JabberCapsIdentity, 1);
+					JabberIdentity *id = g_new0(JabberIdentity, 1);
 					id->category = g_strdup(category);
 					id->type = g_strdup(type);
 					id->name = g_strdup(name);
@@ -207,7 +207,7 @@ static void jabber_caps_store_client(gpo
 	xmlnode_set_attrib(client, "ver", clientinfo->ver);
 	xmlnode_set_attrib(client, "hash", clientinfo->hash);
 	for(iter = props->identities; iter; iter = g_list_next(iter)) {
-		JabberCapsIdentity *id = iter->data;
+		JabberIdentity *id = iter->data;
 		xmlnode *identity = xmlnode_new_child(client, "identity");
 		xmlnode_set_attrib(identity, "category", id->category);
 		xmlnode_set_attrib(identity, "type", id->type);
@@ -307,7 +307,7 @@ void jabber_caps_free_clientinfo(JabberC
 	if(!clientinfo)
 		return;
 	while(clientinfo->identities) {
-		JabberCapsIdentity *id = clientinfo->identities->data;
+		JabberIdentity *id = clientinfo->identities->data;
 		g_free(id->category);
 		g_free(id->type);
 		g_free(id->name);
@@ -493,7 +493,7 @@ static void jabber_caps_client_iqcb(Jabb
 				const char *type = xmlnode_get_attrib(child, "type");
 				const char *name = xmlnode_get_attrib(child, "name");
 				
-				JabberCapsIdentity *id = g_new0(JabberCapsIdentity, 1);
+				JabberIdentity *id = g_new0(JabberIdentity, 1);
 				id->category = g_strdup(category);
 				id->type = g_strdup(type);
 				id->name = g_strdup(name);
@@ -678,7 +678,7 @@ JabberCapsClientInfo *jabber_caps_parse_
 			const char *type = xmlnode_get_attrib(child, "type");
 			const char *name = xmlnode_get_attrib(child, "name");
 
-			JabberCapsIdentity *id = g_new0(JabberCapsIdentity, 1);
+			JabberIdentity *id = g_new0(JabberIdentity, 1);
 			id->category = g_strdup(category);
 			id->type = g_strdup(type);
 			id->name = g_strdup(name);
============================================================
--- libpurple/protocols/jabber/caps.h	117a01db83012832600d1d277219ceb4d72f69c4
+++ libpurple/protocols/jabber/caps.h	7d8158a217be5bfc28c885e7ee0d65a00f48566c
@@ -29,10 +29,8 @@ extern GHashTable *capstable;
 /* Implementation of XEP-0115 */
 extern GHashTable *capstable;
 
-typedef struct _JabberIdentity JabberCapsIdentity;
-
 struct _JabberCapsClientInfo {
-	GList *identities; /* JabberCapsIdentity */
+	GList *identities; /* JabberIdentity */
 	GList *features; /* char * */
 	GList *forms; /* xmlnode * */
 };