Changeset 8e5e2e9 for protocols/jabber

Timestamp:

2006-09-24T19:25:06Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

4ecdc69

Parents:

cfbb3a6

Message:

Handling of incoming authorization requests, manual block/allow. (Doesn't
seem to be completely like how it works on other IM networks.)

Location:

protocols/jabber

Files:

• jabber.c (modified) (2 diffs)
• jabber.h (modified) (1 diff)
• jabber_util.c (modified) (1 diff)
• presence.c (modified) (1 diff)

protocols/jabber/jabber.c

@@ -171 +171 @@
         /* Just any whitespace character is enough as a keepalive for XMPP sessions. */
         jabber_write( gc, "\n", 1 );
+}
+
+static void jabber_add_permit( struct gaim_connection *gc, char *who )
+{
+        presence_send_request( gc, who, "subscribed" );
+}
+
+static void jabber_rem_permit( struct gaim_connection *gc, char *who )
+{
+        presence_send_request( gc, who, "unsubscribed" );
+}
+
+static void jabber_add_deny( struct gaim_connection *gc, char *who )
+{
+}
+
+static void jabber_rem_deny( struct gaim_connection *gc, char *who )
+{
 }
 
@@ -194 +212 @@
 //      ret->chat_open = jabber_chat_open;
         ret->keepalive = jabber_keepalive;
-//      ret->add_permit = jabber_add_permit;
-//      ret->rem_permit = jabber_rem_permit;
-//      ret->add_deny = jabber_add_deny;
-//      ret->rem_deny = jabber_rem_deny;
+        ret->add_permit = jabber_add_permit;
+        ret->rem_permit = jabber_rem_permit;
+        ret->add_deny = jabber_add_deny;
+        ret->rem_deny = jabber_rem_deny;
 //      ret->send_typing = jabber_send_typing;
         ret->handle_cmp = g_strcasecmp;

protocols/jabber/jabber.h

@@ -92 +92 @@
 const struct jabber_away_state *jabber_away_state_by_code( char *code );
 const struct jabber_away_state *jabber_away_state_by_name( char *name );
+void jabber_buddy_ask( struct gaim_connection *gc, char *handle );
 
 extern const struct jabber_away_state jabber_away_state_list[];

protocols/jabber/jabber_util.c

@@ -149 +149 @@
         return NULL;
 }
+
+struct jabber_buddy_ask_data
+{
+        struct gaim_connection *gc;
+        char *handle;
+        char *realname;
+};
+
+static void jabber_buddy_ask_yes( gpointer w, struct jabber_buddy_ask_data *bla )
+{
+        presence_send_request( bla->gc, bla->handle, "subscribed" );
+        
+        if( find_buddy( bla->gc, bla->handle ) == NULL )
+                show_got_added( bla->gc, bla->handle, NULL );
+        
+        g_free( bla->handle );
+        g_free( bla );
+}
+
+static void jabber_buddy_ask_no( gpointer w, struct jabber_buddy_ask_data *bla )
+{
+        presence_send_request( bla->gc, bla->handle, "subscribed" );
+        
+        g_free( bla->handle );
+        g_free( bla );
+}
+
+void jabber_buddy_ask( struct gaim_connection *gc, char *handle )
+{
+        struct jabber_buddy_ask_data *bla = g_new0( struct jabber_buddy_ask_data, 1 );
+        char *buf;
+        
+        bla->gc = gc;
+        bla->handle = g_strdup( handle );
+        
+        buf = g_strdup_printf( "The user %s wants to add you to his/her buddy list.", handle );
+        do_ask_dialog( gc, buf, bla, jabber_buddy_ask_yes, jabber_buddy_ask_no );
+}

protocols/jabber/presence.c

@@ -42 +42 @@
         else if( strcmp( type, "unavailable" ) == 0 )
                 serv_got_update( gc, from, 0, 0, 0, 0, 0, 0 );
+        else if( strcmp( type, "subscribe" ) == 0 )
+                jabber_buddy_ask( gc, from );
+        else if( strcmp( type, "subscribed" ) == 0 )
+                serv_got_crap( gc, "%s just accepted your authorization request", from );
+        else if( strcmp( type, "unsubscribe" ) == 0 || strcmp( type, "unsubscribed" ) == 0 )
+        {
+                /* Do nothing here. Plenty of control freaks or over-curious
+                   souls get excited when they can see who still has them in
+                   their buddy list and who finally removed them. Somehow I
+                   got the impression that those are the people who get
+                   removed from many buddy lists for "some" reason...
+                   
+                   If you're one of those people, this is your chance to write
+                   your first line of code in C... */
+        }
         else
         {