Changes in / [c289b6f:c48a033]

Files:

• account.c (modified) (1 diff)
• bitlbee.h (modified) (1 diff)
• chat.c (modified) (1 diff)
• chat.h (modified) (2 diffs)
• configure (modified) (3 diffs)
• doc/user-guide/misc.xml (modified) (1 diff)
• irc_commands.c (modified) (1 diff)
• lib/misc.c (modified) (1 diff)
• protocols/jabber/jabber.h (modified) (1 diff)
• protocols/nogaim.c (modified) (1 diff)
• protocols/nogaim.h (modified) (1 diff)
• root_commands.c (modified) (1 diff)
• storage_xml.c (modified) (1 diff)

account.c

@@ -27 +27 @@
 #include "bitlbee.h"
 #include "account.h"
-#include "chat.h"
 
 account_t *account_add( irc_t *irc, struct prpl *prpl, char *user, char *pass )

bitlbee.h

@@ -129 +129 @@
 #include "account.h"
 #include "nick.h"
+#include "chat.h"
 #include "conf.h"
 #include "log.h"

chat.c

@@ -25 +25 @@
 
 #include "bitlbee.h"
-#include "chat.h"
 
 struct chat *chat_add( irc_t *irc, account_t *acc, char *handle, char *channel )

chat.h

@@ -24 +24 @@
 */
 
-#ifndef _CHAT_H
-#define _CHAT_H
-
 struct chat
 {
@@ -48 +45 @@
 
 int chat_join( irc_t *irc, struct chat *c, const char *password );
-
-#endif

configure

@@ -267 +267 @@
 detect_ldap()
 {
-        TMPFILE=$(mktemp)
+        TMPFILE=`mktemp`
         if $CC -o $TMPFILE -shared -lldap 2>/dev/null >/dev/null; then
                 cat<<EOF>>Makefile.settings
@@ -280 +280 @@
                 ret=0
         fi
-}
-
-RESOLV_TESTCODE='
-#include <arpa/nameser.h>
-#include <resolv.h> 
-
-int main()
-{
-        ns_initparse( NULL, 0, NULL );
-        ns_parserr( NULL, ns_s_an, 0, NULL );
-}
-'
-
-detect_resolv_dynamic()
-{
-        echo "$RESOLV_TESTCODE" | $CC -o /dev/null -x c - -lresolv >/dev/null 2>/dev/null
-        if [ "$?" = "0" ]; then
-                echo 'EFLAGS+=-lresolv' >> Makefile.settings
-                return 0
-        fi
-
-        return 1
-}
-
-detect_resolv_static()
-{
-        for i in $systemlibdirs; do
-                if [ -f $i/libresolv.a ]; then
-                        echo "$RESOLV_TESTCODE" | $CC -o /dev/null -x c - -Wl,$i/libresolv.a >/dev/null 2>/dev/null
-                        if [ "$?" = "0" ]; then
-                                echo 'EFLAGS+='$i'/libresolv.a' >> Makefile.settings
-                                return 0
-                        fi
-                fi
-        done
-
-        return 1
 }
 
@@ -386 +349 @@
 echo 'SSL_CLIENT=ssl_'$ssl'.o' >> Makefile.settings
 
-if detect_resolv_dynamic || detect_resolv_static; then
-        echo '#define HAVE_RESOLV_A' >> config.h
-fi
+for i in $systemlibdirs; do
+        if [ -f $i/libresolv.a ]; then
+                echo '#define HAVE_RESOLV_A' >> config.h
+                echo 'EFLAGS+='$i'/libresolv.a' >> Makefile.settings
+                break
+        fi
+done
 
 STORAGES="text xml"

doc/user-guide/misc.xml

@@ -77 +77 @@
 
 <para>
-Some protocols (like Jabber) also support named groupchats. BitlBee now supports these too. You can use the <emphasis>chat add</emphasis> command to join them. See <emphasis>help chat add</emphasis> for more information.
+Some protocols (like Jabber) also support named groupchats. BitlBee now supports these too. You can use the <emphasis>chat add</emphasis> command to join them. See <emphasis>help chat_add</emphasis> for more information.
 </para>
 

irc_commands.c

@@ -27 +27 @@
 #include "bitlbee.h"
 #include "ipc.h"
-#include "chat.h"
 
 static void irc_cmd_pass( irc_t *irc, char **cmd )

lib/misc.c

@@ -46 +46 @@
 #endif
 
-#include "md5.h"
 #include "ssl_client.h"
 

protocols/jabber/jabber.h

@@ -27 +27 @@
 #include <glib.h>
 
+#include "xmltree.h"
 #include "bitlbee.h"
-#include "md5.h"
-#include "xmltree.h"
 
 extern GSList *jabber_connections;

protocols/nogaim.c

@@ -33 +33 @@
 
 #define BITLBEE_CORE
+#include "nogaim.h"
 #include <ctype.h>
-
-#include "nogaim.h"
-#include "chat.h"
 
 static int remove_chat_buddy_silent( struct groupchat *b, const char *handle );

protocols/nogaim.h

@@ -39 +39 @@
 #define _NOGAIM_H
 
-#include <stdint.h>
-
 #include "bitlbee.h"
 #include "account.h"
 #include "proxy.h"
 #include "query.h"
+#include "md5.h"
 
 #define BUDDY_ALIAS_MAXLEN 388   /* because MSN names can be 387 characters */

root_commands.c

@@ -29 +29 @@
 #include "bitlbee.h"
 #include "help.h"
-#include "chat.h"
 
 #include <string.h>

storage_xml.c

@@ -29 +29 @@
 #include "arc.h"
 #include "md5.h"
-#include "chat.h"
 
 #if GLIB_CHECK_VERSION(2,8,0)