Handling of presence-error packets (only useful for groupchats now), moved

jabber_chat_by_jid() (with the right name) to conference.c, I don't know
what it was doing in jabber_util.c.

1 files changed, 5 insertions, 18 deletions

diff --git a/protocols/jabber/jabber_util.c b/protocols/jabber/jabber_util.c
index 453e5930..9d84e099 100644
--- a/protocols/jabber/jabber_util.c
+++ b/protocols/jabber/jabber_util.c
@@ -613,23 +613,6 @@ int jabber_buddy_remove_bare( struct im_connection *ic, char *bare_jid )
 	}
 }
 
-struct groupchat *jabber_chat_by_name( struct im_connection *ic, const char *name )
-{
-	char *normalized = jabber_normalize( name );
-	struct groupchat *ret;
-	struct jabber_chat *jc;
-	
-	for( ret = ic->groupchats; ret; ret = ret->next )
-	{
-		jc = ret->data;
-		if( strcmp( normalized, jc->name ) == 0 )
-			break;
-	}
-	g_free( normalized );
-	
-	return ret;
-}
-
 time_t jabber_get_timestamp( struct xt_node *xt )
 {
 	struct tm tp, utc;
@@ -681,10 +664,14 @@ time_t jabber_get_timestamp( struct xt_node *xt )
 
 struct jabber_error *jabber_error_parse( struct xt_node *node, char *xmlns )
 {
-	struct jabber_error *err = g_new0( struct jabber_error, 1 );
+	struct jabber_error *err;
 	struct xt_node *c;
 	char *s;
 	
+	if( node == NULL )
+		return NULL;
+	
+	err = g_new0( struct jabber_error, 1 );
 	err->type = xt_find_attr( node, "type" );
 	
 	for( c = node->children; c; c = c->next )