Changeset 995913b for protocols/jabber/jabber.c

Timestamp:

2006-10-02T17:46:57Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

6266fca

Parents:

501b4e0

Message:

Added some error handling for the (not very complete yet) privacy list code.

File:

• protocols/jabber/jabber.c (modified) (2 diffs)

protocols/jabber/jabber.c

@@ -42 +42 @@
         s = set_add( &acc->set, "priority", "0", set_eval_priority, acc );
         
-        s = set_add( &acc->set, "privacy_list", NULL, NULL, acc );
-        /* TODO: Add evaluator. */
+        s = set_add( &acc->set, "privacy_list", NULL, set_eval_privacy_list, acc );
         
         s = set_add( &acc->set, "resource", "BitlBee", NULL, acc );
@@ -232 +231 @@
 static void jabber_add_permit( struct gaim_connection *gc, char *who )
 {
-        presence_send_request( gc, who, "subscribed" );
+        struct jabber_data *jd = gc->proto_data;
+        
+        if( jd->flags & JFLAG_PRIVACY_BROKEN )
+        {
+                serv_got_crap( gc, "Privacy lists not supported by this server" );
+                return;
+        }
 }
 
 static void jabber_rem_permit( struct gaim_connection *gc, char *who )
 {
-        presence_send_request( gc, who, "unsubscribed" );
+        struct jabber_data *jd = gc->proto_data;
+        
+        if( jd->flags & JFLAG_PRIVACY_BROKEN )
+        {
+                serv_got_crap( gc, "Privacy lists not supported by this server" );
+                return;
+        }
 }