Changes in / [a49dcd5:1d2e3c2]

Files:

• bitlbee.c (modified) (2 diffs)
• conf.c (modified) (4 diffs)
• conf.h (modified) (1 diff)
• configure (modified) (5 diffs)
• irc_commands.c (modified) (2 diffs)
• protocols/msn/msn.c (modified) (2 diffs)
• protocols/msn/sb.c (modified) (2 diffs)
• protocols/oscar/service.c (modified) (1 diff)
• root_commands.c (modified) (1 diff)

bitlbee.c

@@ -45 +45 @@
         int i;
         GIOChannel *ch;
+        FILE *fp;
         
         log_link( LOGLVL_ERROR, LOGOUTPUT_SYSLOG );
@@ -118 +119 @@
                 ipc_master_load_state();
         
+        if( ( fp = fopen( global.conf->pidfile, "w" ) ) )
+        {
+                fprintf( fp, "%d\n", (int) getpid() );
+                fclose( fp );
+        }
+        else
+        {
+                log_message( LOGLVL_WARNING, "Warning: Couldn't write PID to `%s'", global.conf->pidfile );
+        }
+        
         return( 0 );
 }

conf.c

@@ -62 +62 @@
         conf->configdir = g_strdup( CONFIG );
         conf->plugindir = g_strdup( PLUGINDIR );
+        conf->pidfile = g_strdup( "/var/run/bitlbee.pid" );
         conf->motdfile = g_strdup( ETCDIR "/motd.txt" );
         conf->ping_interval = 180;
@@ -78 +79 @@
         }
         
-        while( argc > 0 && ( opt = getopt( argc, argv, "i:p:nvIDFc:d:hR:" ) ) >= 0 )
+        while( argc > 0 && ( opt = getopt( argc, argv, "i:p:P:nvIDFc:d:hR:" ) ) >= 0 )
         /*     ^^^^ Just to make sure we skip this step from the REHASH handler. */
         {
@@ -93 +94 @@
                         }
                         conf->port = i;
+                }
+                else if( opt == 'p' )
+                {
+                        g_free( conf->pidfile );
+                        conf->pidfile = g_strdup( optarg );
                 }
                 else if( opt == 'n' )
@@ -184 +190 @@
                                 else
                                         conf->runmode = RUNMODE_INETD;
+                        }
+                        else if( g_strcasecmp( ini->key, "pidfile" ) == 0 )
+                        {
+                                g_free( conf->pidfile );
+                                conf->pidfile = g_strdup( ini->value );
                         }
                         else if( g_strcasecmp( ini->key, "daemoninterface" ) == 0 )

conf.h

@@ -43 +43 @@
         char *configdir;
         char *plugindir;
+        char *pidfile;
         char *motdfile;
         char *primary_storage;

configure

@@ -14 +14 @@
 datadir='$prefix/share/bitlbee/'
 config='/var/lib/bitlbee/'
+pidfile='/var/run/bitlbee.pid'
 plugindir='$prefix/lib/bitlbee'
 
@@ -46 +47 @@
 --datadir=...                                           $datadir
 --plugindir=...                                         $plugindir
+--pidfile=...                                           $pidfile
 --config=...                                            $config
 
@@ -74 +76 @@
 config=`eval echo "$config/" | sed 's/\/\{1,\}/\//g'`
 plugindir=`eval echo "$plugindir/" | sed 's/\/\{1,\}/\//g'`
+pidfile=`eval echo "$pidfile/" | sed 's/\/\{1,\}/\//g'`
 
 cat<<EOF>Makefile.settings
@@ -83 +86 @@
 DATADIR=$datadir
 PLUGINDIR=$plugindir
+PIDFILE=$pidfile
 CONFIG=$config
 
@@ -104 +108 @@
 #define VARDIR "$datadir"
 #define PLUGINDIR "$plugindir"
+#define PIDFILE "$pidfile"
 #define ARCH "$arch"
 #define CPU "$cpu"

irc_commands.c

@@ -415 +415 @@
 {
         user_t *u = user_find( irc, irc->nick );
-        GSList *c = get_connections();
         char *away = cmd[1];
+        account_t *a;
         
         if( !u ) return;
@@ -443 +443 @@
         }
         
-        while( c )
-        {
-                if( ((struct gaim_connection *)c->data)->flags & OPT_LOGGED_IN )
-                        proto_away( c->data, u->away );
-                
-                c = c->next;
+        for( a = irc->accounts; a; a = a->next )
+        {
+                struct gaim_connection *gc = a->gc;
+                
+                if( gc && gc->flags & OPT_LOGGED_IN )
+                        proto_away( gc, u->away );
         }
 }

protocols/msn/msn.c

@@ -84 +84 @@
                 {
                         m = l->data;
+                
+                        serv_got_crap( gc, "Warning: Closing down MSN connection with unsent message to %s, you'll have to resend it.", m->who );
                         g_free( m->who );
                         g_free( m->text );
@@ -89 +91 @@
                 }
                 g_slist_free( md->msgq );
-                
-                serv_got_crap( gc, "Warning: Closing down MSN connection with unsent message(s), you'll have to resend them." );
         }
         

protocols/msn/sb.c

@@ -213 +213 @@
                 {
                         m = l->data;
+
                         g_free( m->who );
                         g_free( m->text );
@@ -219 +220 @@
                 g_slist_free( sb->msgq );
                 
-                serv_got_crap( gc, "Warning: Closing down MSN switchboard connection with unsent message(s), you'll have to resend them." );
+                serv_got_crap( gc, "Warning: Closing down MSN switchboard connection with "
+                                   "unsent message to %s, you'll have to resend it.",
+                                   m->who ? m->who : "(unknown)" );
         }
         

protocols/oscar/service.c

@@ -736 +736 @@
 
         tlvlen = aim_addtlvtochain32(&tl, 0x0006, data);
-
-        printf("%d\n", tlvlen);
 
         if (!(fr = aim_tx_new(sess, conn, AIM_FRAMETYPE_FLAP, 0x02, 10 + 8)))

root_commands.c

@@ -601 +601 @@
         {
                 set_setstr( irc, cmd[1], cmd[2] );
+                
+                if( ( strcmp( cmd[2], "=" ) ) == 0 && cmd[3] )
+                        irc_usermsg( irc, "Warning: Correct syntax: \002set <variable> <value>\002 (without =)" );
         }
         if( cmd[1] ) /* else 'forgotten' on purpose.. Must show new value after changing */