Mercurial > pidgin.yaz

changeset 25750:30a686c079d5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove JabberCapsIdentity and just use JabberIdentity everywhere
author Paul Aurich <paul@darkrain42.org>
date Fri, 21 Nov 2008 18:24:31 +0000
parents b5dbf1d9930b
children 27a9672371f1
files libpurple/protocols/jabber/caps.c libpurple/protocols/jabber/caps.h
diffstat 2 files changed, 7 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/protocols/jabber/caps.c	Fri Nov 21 17:52:56 2008 +0000
+++ b/libpurple/protocols/jabber/caps.c	Fri Nov 21 18:24:31 2008 +0000
@@ -70,7 +70,7 @@
 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 @@
 					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 @@
 	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 @@
 	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 @@
 				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 @@
 			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);
--- a/libpurple/protocols/jabber/caps.h	Fri Nov 21 17:52:56 2008 +0000
+++ b/libpurple/protocols/jabber/caps.h	Fri Nov 21 18:24:31 2008 +0000
@@ -29,10 +29,8 @@
 /* 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 * */
 };