Changeset 8e9e2b7 for root_commands.c

Timestamp:

2010-10-03T02:45:26Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

04f0c10

Parents:

88de0c9 (diff), 2af3e23 (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 mainline, which includes a huge msnp13 merge.

Not 100% sure about the OpenSSL merge, should double check that but I'm
currently offline.

File:

• root_commands.c (modified) (1 diff)

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 );