Changeset 674a01d

Timestamp:

2010-09-06T00:20:01Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

3c9b095

Parents:

d6657ce

Message:

Move whatsnew stuff into help.txt. Stop putting too much string content
into the executable.

Files:

• bitlbee.h (modified) (2 diffs)
• doc/user-guide/misc.xml (modified) (1 diff)
• help.c (modified) (3 diffs)
• help.h (modified) (1 diff)
• irc.c (modified) (1 diff)
• irc_commands.c (modified) (1 diff)
• irc_send.c (modified) (1 diff)
• root_commands.c (modified) (1 diff)

bitlbee.h

@@ -137 +137 @@
 #include "log.h"
 #include "ini.h"
-#include "help.h"
 #include "query.h"
 #include "sock.h"
@@ -147 +146 @@
         int listen_socket;
         gint listen_watch_source_id;
-        help_t *help;
+        struct help *help;
         char *conf_file;
         conf_t *conf;

doc/user-guide/misc.xml

@@ -268 +268 @@
 </sect1>
 
+<sect1 id="whatsnew010206">
+<title>New stuff in BitlBee 1.2.6</title>
+
+<para>
+Twitter support. See <emphasis>help account add twitter</emphasis>.
+</para>
+</sect1>
+
+<sect1 id="whatsnew010300">
+<title>New stuff in BitlBee 1.3dev</title>
+
+<para>
+Support for multiple configurable control channels, each with a subset of
+your contact list. See <emphasis>help channels</emphasis> for more
+information.
+</para>
+
+<para>
+File transfer support for some protocols (more if you use libpurple). Just
+/DCC SEND stuff. Incoming files also become DCC transfers.
+</para>
+
+<para>
+Only if you run your own BitlBee instance: You can build a BitlBee that uses
+libpurple for connecting to IM networks instead of its own code, adding
+support for some of the more obscure IM protocols and features.
+</para>
+
+<para>
+Many more things, briefly described in <emphasis>help news1.3</emphasis>.
+</para>
+</sect1>
+
 <sect1 id="news1.3">
-<title>New stuff in BitlBee 1.3dev</title>
+<title>New stuff in BitlBee 1.3dev (details)</title>
 
 <para>

help.c

@@ -2 +2 @@
   * BitlBee -- An IRC to other IM-networks gateway                     *
   *                                                                    *
-  * Copyright 2002-2009 Wilmer van der Gaast and others                *
+  * Copyright 2002-2010 Wilmer van der Gaast and others                *
   \********************************************************************/
 
@@ -26 +26 @@
 #define BITLBEE_CORE
 #include "bitlbee.h"
+#include "help.h"
 #undef read 
 #undef write
@@ -194 +195 @@
         return 1;
 }
+
+char *help_get_whatsnew( help_t **help, int old )
+{
+        GString *ret = NULL;
+        help_t *h;
+        int v;
+        
+        for( h = *help; h; h = h->next )
+                if( h->title != NULL && strncmp( h->title, "whatsnew", 8 ) == 0 &&
+                    sscanf( h->title + 8, "%x", &v ) == 1 && v > old )
+                {
+                        char *s = help_get( &h, h->title );
+                        if( ret == NULL )
+                                ret = g_string_new( s );
+                        else
+                                g_string_append_printf( ret, "\n\n%s", s );
+                        g_free( s );
+                }
+        
+        return ret ? g_string_free( ret, FALSE ) : NULL;
+}

help.h

@@ -47 +47 @@
 char *help_get( help_t **help, char *title );
 int help_add_mem( help_t **help, const char *title, const char *content_ );
+char *help_get_whatsnew( help_t **help, int old );
 
 #endif

irc.c

@@ -112 +112 @@
         s = set_add( &b->set, "last_version", NULL, NULL, irc );
         s->flags |= SET_HIDDEN;
+        s->value = g_strdup_printf( "%d", BITLBEE_VERSION_CODE );
         s = set_add( &b->set, "lcnicks", "true", set_eval_bool, irc );
         s = set_add( &b->set, "nick_format", "%-@nick", NULL, irc );

irc_commands.c

@@ -26 +26 @@
 #define BITLBEE_CORE
 #include "bitlbee.h"
+#include "help.h"
 #include "ipc.h"
 

irc_send.c

@@ -114 +114 @@
         irc_channel_t *ic = NULL;
         irc_user_t *iu = irc->root;
-        char text[1024];
+        char text[1100];
         va_list params;
         char *dst;

root_commands.c

@@ -1293 +1293 @@
 {
         int last = set_getint( &irc->b->set, "last_version" );
-        GString *msg = g_string_new( "" );
-        char s[16];
+        char s[16], *msg;
         
         if( last >= BITLBEE_VERSION_CODE )
                 return;
         
-        if( last < 0x010206 ) /* 1.2.6 */
-        {
-                g_string_append( msg,
-                        "Twitter support. See \x02help account add twitter\x02.\n" );
-        }
-        if( last < 0x010300 ) /* 1.3dev */
-        {
-                g_string_append( msg,
-                        "Support for multiple configurable control channels, "
-                        "each with a subset of your contact list. See "
-                        "\x02help channels\x02 for more information.\n"
-                        "File transfer support for some protocols (more if "
-                        "you use libpurple). Just /DCC SEND stuff. Incoming "
-                        "files also become DCC transfers.\n"
-                        "Many more things, briefly described in "
-                        "\x02help news1.3\x02.\n" );
-        }
-        
-        if( msg->len > 0 )
+        msg = help_get_whatsnew( &(global.help), last );
+        
+        if( msg )
                 irc_usermsg( irc, "%s: This seems to be your first time using this "
                                   "this version of BitlBee. Here's a list of new "
                                   "features you may like to know about:\n\n%s\n",
-                                  irc->user->nick, msg->str );
-        
-        g_string_free( msg, TRUE );
+                                  irc->user->nick, msg );
+        
+        g_free( msg );
+        
         g_snprintf( s, sizeof( s ), "%d", BITLBEE_VERSION_CODE );
         set_setstr( &irc->b->set, "last_version", s );