Changeset 6738a67 for protocols/yahoo/yahoo.c

Timestamp:

2008-07-16T23:22:52Z (16 years ago)

Author:

Sven Moritz Hallberg <pesco@…>

Branches:

master

Children:

9b55485

Parents:

9730d72 (diff), 6a78c0e (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:

merge in latest trunk

File:

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

protocols/yahoo/yahoo.c

@@ -163 +163 @@
         g_slist_free( yd->buddygroups );
         
-        if( yd->logged_in )
-                yahoo_logoff( yd->y2_id );
-        else
-                yahoo_close( yd->y2_id );
+        yahoo_logoff( yd->y2_id );
         
         g_free( yd );
@@ -315 +312 @@
         struct byahoo_data *yd = (struct byahoo_data *) c->ic->proto_data;
         
-        yahoo_conference_invite( yd->y2_id, NULL, c->data, c->title, msg );
+        yahoo_conference_invite( yd->y2_id, NULL, c->data, c->title, msg ? msg : "" );
 }
 
@@ -454 +451 @@
 {
         struct byahoo_write_ready_data *d = data;
-        
-        if( !byahoo_get_ic_by_id( d->id ) )
-                /* WTF doesn't libyahoo clean this up? */
-                return FALSE;
         
         yahoo_write_ready( d->id, d->fd, d->data );
@@ -798 +791 @@
 }
 
-static void byahoo_accept_conf( gpointer w, struct byahoo_conf_invitation *inv )
-{
+static void byahoo_accept_conf( void *data )
+{
+        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 );
@@ -806 +801 @@
 }
 
-static void byahoo_reject_conf( gpointer w, struct byahoo_conf_invitation *inv )
-{
+static void byahoo_reject_conf( void *data )
+{
+        struct byahoo_conf_invitation *inv = data;
+        
         yahoo_conference_decline( inv->yid, NULL, inv->members, inv->name, "User rejected groupchat" );
         imcb_chat_free( inv->c );