Changeset fd03770

Timestamp:

2006-06-25T19:43:14Z (19 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

c9f0c79

Parents:

6ee9d2d (diff), 9b63df6 (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 from devel/Jelmer.

Files:

• .bzrignore (modified) (1 diff)
• Makefile (modified) (1 diff)
• configure (modified) (1 diff)
• lib/proxy.c (modified) (1 diff)
• nick.c (modified) (2 diffs)
• protocols/msn/msn.c (modified) (1 diff)
• protocols/nogaim.c (modified) (1 diff)
• tests/Makefile (added)
• tests/check.c (added)
• tests/check_nick.c (added)
• tests/check_util.c (added)
• user.c (modified) (1 diff)

.bzrignore

@@ -12 +12 @@
 bitlbee.pc
 .gdb_history
+tests/check

Makefile

@@ -46 +46 @@
         rm -f Makefile.settings config.h
         find . -name 'DEADJOE' -o -name '*.orig' -o -name '*.rej' -o -name '*~' -exec rm -f {} \;
+
+check:
+        $(MAKE) -C tests
 
 install-doc:

configure

@@ -207 +207 @@
 echo 'EVENT_HANDLER=events_'$events'.o' >> Makefile.settings
 
+if [ "$events" = "libevent" ]; then
+        if ! [ -e "${libevent}include/event.h" ]; then
+                echo
+                echo 'Warning: Could not find event.h, you might have to install it and/or specify'
+                echo 'its location using the --libevent= argument. (Example: If event.h is in'
+                echo '/usr/local/include and binaries are in /usr/local/lib: --libevent=/usr/local)'
+        fi
+        
+        echo '#define EVENTS_LIBEVENT' >> config.h
+        cat <<EOF>>Makefile.settings
+EFLAGS+=-levent -L${libevent}lib
+CFLAGS+=-I${libevent}include
+EOF
+elif [ "$events" = "glib" ]; then
+        ## We already use glib anyway, so this is all we need (and in fact not even this, but just to be sure...):
+        echo '#define EVENTS_GLIB' >> config.h
+else
+        echo
+        echo 'ERROR: Unknown event handler specified.'
+        exit 1
+fi
+echo 'EVENT_HANDLER=events_'$events'.o' >> Makefile.settings
+
 detect_gnutls()
 {

lib/proxy.c

@@ -539 +539 @@
         phb->data = data;
         
-#ifndef _WIN32
-        sethostent(1);
-#endif
-        
         if ((proxytype == PROXY_NONE) || !proxyhost || !proxyhost[0] || !proxyport || (proxyport == -1))
                 return proxy_connect_none(host, port, phb);

nick.c

@@ -163 +163 @@
         int i, j;
         
-        for( i = j = 0; nick[i] && i < MAX_NICK_LENGTH; i++ )
+        for( i = j = 0; nick[i] && j < MAX_NICK_LENGTH; i++ )
         {
                 if( strchr( nick_lc_chars, nick[i] ) || 
@@ -172 +172 @@
                 }
         }
-        while( j < MAX_NICK_LENGTH )
+        while( j <= MAX_NICK_LENGTH )
                 nick[j++] = '\0';
 }

protocols/msn/msn.c

@@ -94 +94 @@
                         g_slist_free( md->msgq );
                 }
+                
+                g_free( md->grouplist );
                 
                 g_free( md );

protocols/nogaim.c

@@ -294 +294 @@
         
         serv_got_crap( gc, "Signing off.." );
+        
+        b_event_remove( gc->keepalive );
         gc->flags |= OPT_LOGGING_OUT;
         
-        b_event_remove( gc->keepalive );
         gc->keepalive = 0;
         gc->prpl->close( gc );

user.c

@@ -106 +106 @@
                         if( u->nick != u->host ) g_free( u->host );
                         if( u->nick != u->realname ) g_free( u->realname );
-                        if( u->away ) g_free( u->away );
-                        if( u->handle ) g_free( u->handle );
-                        if( u->sendbuf ) g_free( u->sendbuf );
+                        g_free( u->group );
+                        g_free( u->away );
+                        g_free( u->handle );
+                        g_free( u->sendbuf );
                         if( u->sendbuf_timer ) b_event_remove( u->sendbuf_timer );
                         g_free( u );