Changeset e5d8d21

Timestamp:

2009-11-25T00:45:27Z (15 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

487f555

Parents:

0ac1a375

Message:

Added in-memory help info, which I wanted to implement for ages already.
Sadly the way I'm using it now doesn't work yet since nogaim_init() is
called before help_init(). I'll fix that later. (Have to do that anyway
to at least make ForkDaemon mode work..)

Files:

• help.c (modified) (2 diffs)
• help.h (modified) (1 diff)
• protocols/purple/purple.c (modified) (6 diffs)

help.c

@@ -2 +2 @@
   * BitlBee -- An IRC to other IM-networks gateway                     *
   *                                                                    *
-  * Copyright 2002-2005 Wilmer van der Gaast and others                *
+  * Copyright 2002-2009 Wilmer van der Gaast and others                *
   \********************************************************************/
 
@@ -169 +169 @@
         return NULL;
 }
+
+int help_add_mem( help_t **help, const char *title, const char *content )
+{
+        help_t *h, *l = NULL;
+        
+        for( h = *help; h; h = h->next )
+        {
+                if( g_strcasecmp( h->title, title ) == 0 )
+                        return 0;
+                
+                l = h;
+        }
+        
+        if( l )
+                h = l->next = g_new0( struct help, 1 );
+        else
+                *help = h = g_new0( struct help, 1 );
+        h->fd = -1;
+        h->title = g_strdup( title );
+        h->length = strlen( content );
+        h->offset.mem_offset = g_strdup( content );
+        
+        return 1;
+}

help.h

@@ -46 +46 @@
 void help_free( help_t **help );
 char *help_get( help_t **help, char *title );
+int help_add_mem( help_t **help, const char *title, const char *content_ );
 
 #endif

protocols/purple/purple.c

@@ -23 +23 @@
 
 #include "bitlbee.h"
+#include "help.h"
 
 #include <stdarg.h>
@@ -475 +476 @@
         
         g_free( q );
+        
+        return pqad;
 }
 
@@ -535 +538 @@
         struct prpl funcs;
         GList *prots;
+        GString *help;
         
         if( B_EV_IO_READ != PURPLE_INPUT_READ ||
@@ -574 +578 @@
         funcs.handle_cmp = g_strcasecmp;
         
+        help = g_string_new("BitlBee libpurple module supports the following IM protocols:\n");
+        
         for( prots = purple_plugins_get_protocols(); prots; prots = prots->next )
         {
@@ -584 +590 @@
                         ret->name += 5;
                 register_protocol( ret );
+                
+                g_string_append_printf( help, "\n* %s (%s)", ret->name, prot->info->name );
                 
                 if( g_strcasecmp( prot->info->id, "prpl-aim" ) == 0 )
@@ -593 +601 @@
                 }
         }
-}
+        
+        help_add_mem( &global.help, "purple", help->str );
+        g_string_free( help, TRUE );
+}