Changeset 0cbef26 for protocols

Timestamp:

2009-10-07T23:37:32Z (15 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

e046390

Parents:

389f7be

Message:

Added some debugging stuff and handling (better said, ignoring) of events
for closed connections where necessary.

File:

• protocols/purple/purple.c (modified) (12 diffs)

protocols/purple/purple.c

@@ -129 +129 @@
 {
         /* TODO: Figure out variables to export via set. */
+        
 }
 
@@ -135 +136 @@
         struct im_connection *ic = imcb_new( acc );
         PurpleAccount *pa;
-        PurpleSavedStatus *ps;
+        //PurpleSavedStatus *ps;
+        GList *i;
         
         /* For now this is needed in the _connected() handlers if using
@@ -149 +151 @@
         purple_account_set_enabled( pa, "BitlBee", TRUE );
         
+        /*
+        for( i = ((PurplePluginProtocolInfo *)pa->gc->prpl->info->extra_info)->protocol_options; i; i = i->next )
+        {
+                PurpleAccountOption *o = i->data;
+                
+                printf( "%s\n", o->pref_name );
+        }
+        */
+        
         //ps = purple_savedstatus_new( NULL, PURPLE_STATUS_AVAILABLE );
         //purple_savedstatus_activate_for_account( ps, pa );
@@ -170 +181 @@
         
         purple_conv_im_send( purple_conversation_get_im_data( conv ), message );
+        
+        return 1;
 }
 
@@ -195 +208 @@
 static int purple_send_typing( struct im_connection *ic, char *who, int typing )
 {
+        return 1;
 }
 
@@ -215 +229 @@
 static void prplcb_conn_progress( PurpleConnection *gc, const char *text, size_t step, size_t step_count )
 {
-        imcb_log( purple_ic_by_gc( gc ), "%s", text );
+        struct im_connection *ic = purple_ic_by_gc( gc );
+        
+        imcb_log( ic, "%s", text );
 }
 
@@ -230 +246 @@
 static void prplcb_conn_disconnected( PurpleConnection *gc )
 {
-        imc_logout( purple_ic_by_gc( gc ), TRUE );
+        struct im_connection *ic = purple_ic_by_gc( gc );
+        
+        if( ic != NULL )
+                imc_logout( ic, TRUE );
 }
 
 static void prplcb_conn_notice( PurpleConnection *gc, const char *text )
 {
-        imcb_log( purple_ic_by_gc( gc ), "%s", text );
+        struct im_connection *ic = purple_ic_by_gc( gc );
+        
+        if( ic != NULL )
+                imcb_log( ic, "%s", text );
 }
 
 static void prplcb_conn_report_disconnect_reason( PurpleConnection *gc, PurpleConnectionError reason, const char *text )
 {
+        struct im_connection *ic = purple_ic_by_gc( gc );
+        
         /* PURPLE_CONNECTION_ERROR_NAME_IN_USE means concurrent login,
            should probably handle that. */
-        imcb_error( purple_ic_by_gc( gc ), "%s", text );
+        if( ic != NULL )
+                imcb_error( ic, "%s", text );
 }
 
@@ -262 +287 @@
         struct im_connection *ic = purple_ic_by_pa( bud->account );
         
-        if( node->type == PURPLE_BLIST_BUDDY_NODE )
+        if( node->type == PURPLE_BLIST_BUDDY_NODE && ic != NULL )
         {
                 imcb_add_buddy( ic, bud->name, NULL );
@@ -273 +298 @@
 {
         PurpleBuddy *bud = (PurpleBuddy*) node;
-        
-        if( node->type == PURPLE_BLIST_BUDDY_NODE )
-        {
-                imcb_buddy_status( purple_ic_by_pa( bud->account ), bud->name,
+        struct im_connection *ic = purple_ic_by_pa( bud->account );
+        
+        if( node->type == PURPLE_BLIST_BUDDY_NODE && ic != NULL  )
+        {
+                imcb_buddy_status( ic, bud->name,
                                    purple_presence_is_online( bud->presence ) ? OPT_LOGGED_IN : 0,
                                    NULL, NULL );
@@ -285 +311 @@
 {
         PurpleBuddy *bud = (PurpleBuddy*) node;
-        
-        if( node->type == PURPLE_BLIST_BUDDY_NODE )
-                imcb_remove_buddy( purple_ic_by_pa( bud->account ), bud->name, NULL );
+        struct im_connection *ic = purple_ic_by_pa( bud->account );
+        
+        if( node->type == PURPLE_BLIST_BUDDY_NODE && ic != NULL  )
+        {
+                imcb_remove_buddy( ic, bud->name, NULL );
+        }
 }
 
@@ -331 +360 @@
 };
 
+static void prplcb_debug_print( PurpleDebugLevel level, const char *category, const char *arg_s )
+{
+        printf( "DEBUG %s: %s", category, arg_s );
+}
+
+static PurpleDebugUiOps bee_debug_uiops =
+{
+        prplcb_debug_print,
+};
+
 static void purple_ui_init()
 {
@@ -336 +375 @@
         purple_connections_set_ui_ops( &bee_conn_uiops );
         purple_conversations_set_ui_ops( &bee_conv_uiops );
+        //purple_debug_set_ui_ops( &bee_debug_uiops );
 }