Changeset c5bc47b for protocols/yahoo/yahoo.c

Timestamp:

2009-10-17T17:24:52Z (15 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

c48a033

Parents:

0c41177 (diff), 2e44b1f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merging BitlBee 1.2.4.

File:

• protocols/yahoo/yahoo.c (modified) (9 diffs)

protocols/yahoo/yahoo.c

@@ -197 +197 @@
 {
         struct byahoo_data *yd = (struct byahoo_data *) ic->proto_data;
-        
-        ic->away = NULL;
+        char *away;
+        
+        away = NULL;
         
         if( state && msg && g_strcasecmp( state, msg ) != 0 )
         {
                 yd->current_status = YAHOO_STATUS_CUSTOM;
-                ic->away = "";
+                away = "";
         }
         else if( state )
@@ -212 +213 @@
                 msg = NULL;
                 
-                ic->away = "";
+                away = "";
                 if( g_strcasecmp( state, "Available" ) == 0 )
                 {
                         yd->current_status = YAHOO_STATUS_AVAILABLE;
-                        ic->away = NULL;
+                        away = NULL;
                 }
                 else if( g_strcasecmp( state, "Be Right Back" ) == 0 )
@@ -242 +243 @@
                         yd->current_status = YAHOO_STATUS_AVAILABLE;
                         
-                        ic->away = NULL;
+                        away = NULL;
                 }
         }
@@ -248 +249 @@
                 yd->current_status = YAHOO_STATUS_AVAILABLE;
         
-        yahoo_set_away( yd->y2_id, yd->current_status, msg, ic->away != NULL ? 2 : 0 );
+        yahoo_set_away( yd->y2_id, yd->current_status, msg, away != NULL ? 2 : 0 );
 }
 
 static GList *byahoo_away_states( struct im_connection *ic )
 {
-        GList *m = NULL;
-
-        m = g_list_append( m, "Available" );
-        m = g_list_append( m, "Be Right Back" );
-        m = g_list_append( m, "Busy" );
-        m = g_list_append( m, "Not At Home" );
-        m = g_list_append( m, "Not At Desk" );
-        m = g_list_append( m, "Not In Office" );
-        m = g_list_append( m, "On Phone" );
-        m = g_list_append( m, "On Vacation" );
-        m = g_list_append( m, "Out To Lunch" );
-        m = g_list_append( m, "Stepped Out" );
-        m = g_list_append( m, "Invisible" );
-        m = g_list_append( m, GAIM_AWAY_CUSTOM );
+        static GList *m = NULL;
+
+        if( m == NULL )
+        {
+                m = g_list_append( m, "Available" );
+                m = g_list_append( m, "Be Right Back" );
+                m = g_list_append( m, "Busy" );
+                m = g_list_append( m, "Not At Home" );
+                m = g_list_append( m, "Not At Desk" );
+                m = g_list_append( m, "Not In Office" );
+                m = g_list_append( m, "On Phone" );
+                m = g_list_append( m, "On Vacation" );
+                m = g_list_append( m, "Out To Lunch" );
+                m = g_list_append( m, "Stepped Out" );
+                m = g_list_append( m, "Invisible" );
+                m = g_list_append( m, GAIM_AWAY_CUSTOM );
+        }
         
         return m;
@@ -345 +349 @@
         
         return c;
+}
+
+static void byahoo_auth_allow( struct im_connection *ic, const char *who )
+{
+        struct byahoo_data *yd = (struct byahoo_data *) ic->proto_data;
+        
+        yahoo_accept_buddy_ymsg13( yd->y2_id, NULL, who );
+}
+
+static void byahoo_auth_deny( struct im_connection *ic, const char *who )
+{
+        struct byahoo_data *yd = (struct byahoo_data *) ic->proto_data;
+        
+        yahoo_reject_buddy_ymsg13( yd->y2_id, NULL, who, NULL );
 }
 
@@ -372 +390 @@
         ret->handle_cmp = g_strcasecmp;
         
+        ret->auth_allow = byahoo_auth_allow;
+        ret->auth_deny = byahoo_auth_deny;
+        
         register_protocol(ret);
 }
@@ -451 +472 @@
         struct byahoo_write_ready_data *d = data;
         
-        yahoo_write_ready( d->id, d->fd, d->data );
-        
-        return FALSE;
+        return yahoo_write_ready( d->id, d->fd, d->data );
 }
 
@@ -790 +809 @@
 {
         struct byahoo_conf_invitation *inv = data;
-        
-        yahoo_conference_logon( inv->yid, NULL, inv->members, inv->name );
-        imcb_chat_add_buddy( inv->c, inv->ic->acc->user );
+        struct groupchat *b;
+        
+        for( b = inv->ic->groupchats; b; b = b->next )
+                if( b == inv->c )
+                        break;
+        
+        if( b != NULL )
+        {
+                yahoo_conference_logon( inv->yid, NULL, inv->members, inv->name );
+                imcb_chat_add_buddy( inv->c, inv->ic->acc->user );
+        }
+        else
+        {
+                imcb_log( inv->ic, "Duplicate/corrupted invitation to `%s'.", inv->name );
+        }
+        
         g_free( inv->name );
         g_free( inv );
@@ -908 +940 @@
 }
 
+void ext_yahoo_contact_auth_request( int id, const char *myid, const char *who, const char *msg )
+{
+        struct im_connection *ic = byahoo_get_ic_by_id( id );
+        
+        imcb_ask_auth( ic, who, NULL );
+}
+
 void ext_yahoo_contact_added( int id, const char *myid, const char *who, const char *msg )
 {
-        /* Groups schmoups. If I want to handle groups properly I can get the
-           buddy data from some internal libyahoo2 structure. */
-        imcb_add_buddy( byahoo_get_ic_by_id( id ), (char*) who, NULL );
+        struct im_connection *ic = byahoo_get_ic_by_id( id );
+        
+        imcb_add_buddy( ic, (char*) who, NULL );
 }