Changeset 18e1f3b

Timestamp:

2012-05-02T07:58:22Z (12 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

25b80e9c

Parents:

d527913

Message:

Set PACKAGE to BitlBee-LIBPURPLE for the libpurple variant, because in many
ways it's not BitlBee and I'm tired of getting libpurple-related bug reports.

Files:

• bitlbee.h (modified) (1 diff)
• configure (modified) (1 diff)
• ipc.c (modified) (1 diff)
• irc_commands.c (modified) (1 diff)
• irc_send.c (modified) (1 diff)
• irc_user.c (modified) (1 diff)
• unix.c (modified) (3 diffs)

bitlbee.h

@@ -123 +123 @@
 #define DEFAULT_AWAY "Away from computer"
 #define CONTROL_TOPIC "Welcome to the control channel. Type \2help\2 for help information."
-#define IRCD_INFO "BitlBee <http://www.bitlbee.org/>"
+#define IRCD_INFO PACKAGE " <http://www.bitlbee.org/>"
 
 #define MAX_NICK_LENGTH 24

configure

@@ -641 +641 @@
         oscar=0
         yahoo=0
+
+        echo '#undef PACKAGE' >> config.h
+        echo '#define PACKAGE "BitlBee-LIBPURPLE"' >> config.h
         
         if [ "$events" = "libevent" ]; then

ipc.c

@@ -990 +990 @@
         
         ipc_to_children_str( "HELLO\r\n" );
-        ipc_to_children_str( "OPERMSG :New BitlBee master process started (version " BITLBEE_VERSION ")\r\n" );
+        ipc_to_children_str( "OPERMSG :New %s master process started (version %s)\r\n", PACKAGE, BITLBEE_VERSION );
         
         fclose( fp );

irc_commands.c

@@ -682 +682 @@
 static void irc_cmd_version( irc_t *irc, char **cmd )
 {
-        irc_send_num( irc, 351, "bitlbee-%s. %s :%s/%s ",
-                      BITLBEE_VERSION, irc->root->host, ARCH, CPU );
+        irc_send_num( irc, 351, "%s-%s. %s :%s/%s ",
+                      PACKAGE, BITLBEE_VERSION, irc->root->host, ARCH, CPU );
 }
 

irc_send.c

@@ -40 +40 @@
 void irc_send_login( irc_t *irc )
 {
-        irc_send_num( irc,   1, ":Welcome to the BitlBee gateway, %s", irc->user->nick );
-        irc_send_num( irc,   2, ":Host %s is running BitlBee " BITLBEE_VERSION " " ARCH "/" CPU ".", irc->root->host );
+        irc_send_num( irc,   1, ":Welcome to the %s gateway, %s", PACKAGE, irc->user->nick );
+        irc_send_num( irc,   2, ":Host %s is running %s %s %s/%s.", irc->root->host,
+                                PACKAGE, BITLBEE_VERSION, ARCH, CPU );
         irc_send_num( irc,   3, ":%s", IRCD_INFO );
         irc_send_num( irc,   4, "%s %s %s %s", irc->root->host, BITLBEE_VERSION, UMODES UMODES_PRIV, CMODES );

irc_user.c

@@ -233 +233 @@
         {
                 irc_send_msg_f( iu, "NOTICE", iu->irc->user->nick, "\001%s %s\001",
-                                ctcp[0], "BitlBee " BITLBEE_VERSION " " ARCH "/" CPU );
+                                ctcp[0], PACKAGE " " BITLBEE_VERSION " " ARCH "/" CPU );
         }
         else if( g_strcasecmp( ctcp[0], "PING" ) == 0 )

unix.c

@@ -113 +113 @@
         
                 i = bitlbee_inetd_init();
-                log_message( LOGLVL_INFO, "BitlBee %s starting in inetd mode.", BITLBEE_VERSION );
+                log_message( LOGLVL_INFO, "%s %s starting in inetd mode.", PACKAGE, BITLBEE_VERSION );
 
         }
@@ -122 +122 @@
 
                 i = bitlbee_daemon_init();
-                log_message( LOGLVL_INFO, "BitlBee %s starting in daemon mode.", BITLBEE_VERSION );
+                log_message( LOGLVL_INFO, "%s %s starting in daemon mode.", PACKAGE, BITLBEE_VERSION );
         }
         else if( global.conf->runmode == RUNMODE_FORKDAEMON )
@@ -139 +139 @@
                 
                 i = bitlbee_daemon_init();
-                log_message( LOGLVL_INFO, "BitlBee %s starting in forking daemon mode.", BITLBEE_VERSION );
+                log_message( LOGLVL_INFO, "%s %s starting in forking daemon mode.", PACKAGE, BITLBEE_VERSION );
         }
         if( i != 0 )