Merging a bunch of patches from Trac, collected by dx.

7 files changed, 28 insertions, 23 deletions

diff --git a/Makefile b/Makefile
index e1dc397b..26eeb2ad 100644
--- a/Makefile
+++ b/Makefile
@@ -90,17 +90,17 @@ endif
 
 install-bin:
 	mkdir -p $(DESTDIR)$(SBINDIR)
-	install -m 0755 $(OUTFILE) $(DESTDIR)$(SBINDIR)/$(OUTFILE)
+	$(INSTALL) -m 0755 $(OUTFILE) $(DESTDIR)$(SBINDIR)/$(OUTFILE)
 
 uninstall-bin:
 	rm -f $(DESTDIR)$(SBINDIR)/$(OUTFILE)
 
 install-dev:
 	mkdir -p $(DESTDIR)$(INCLUDEDIR)
-	install -m 0644 config.h $(DESTDIR)$(INCLUDEDIR)
-	for i in $(headers); do install -m 0644 $(_SRCDIR_)$$i $(DESTDIR)$(INCLUDEDIR); done
+	$(INSTALL) -m 0644 config.h $(DESTDIR)$(INCLUDEDIR)
+	for i in $(headers); do $(INSTALL) -m 0644 $(_SRCDIR_)$$i $(DESTDIR)$(INCLUDEDIR); done
 	mkdir -p $(DESTDIR)$(PCDIR)
-	install -m 0644 bitlbee.pc $(DESTDIR)$(PCDIR)
+	$(INSTALL) -m 0644 bitlbee.pc $(DESTDIR)$(PCDIR)
 
 uninstall-dev:
 	rm -f $(foreach hdr,$(headers),$(DESTDIR)$(INCLUDEDIR)/$(hdr))
@@ -109,8 +109,8 @@ uninstall-dev:
 
 install-etc:
 	mkdir -p $(DESTDIR)$(ETCDIR)
-	install -m 0644 $(_SRCDIR_)motd.txt $(DESTDIR)$(ETCDIR)/motd.txt
-	install -m 0644 $(_SRCDIR_)bitlbee.conf $(DESTDIR)$(ETCDIR)/bitlbee.conf
+	$(INSTALL) -m 0644 $(_SRCDIR_)motd.txt $(DESTDIR)$(ETCDIR)/motd.txt
+	$(INSTALL) -m 0644 $(_SRCDIR_)bitlbee.conf $(DESTDIR)$(ETCDIR)/bitlbee.conf
 
 uninstall-etc:
 	rm -f $(DESTDIR)$(ETCDIR)/motd.txt
@@ -122,18 +122,18 @@ install-plugins: install-plugin-otr install-plugin-skype
 install-plugin-otr:
 ifdef OTR_PI
 	mkdir -p $(DESTDIR)$(PLUGINDIR)
-	install -m 0755 otr.so $(DESTDIR)$(PLUGINDIR)
+	$(INSTALL) -m 0755 otr.so $(DESTDIR)$(PLUGINDIR)
 endif
 
 install-plugin-skype:
 ifdef SKYPE_PI
 	mkdir -p $(DESTDIR)$(PLUGINDIR)
-	install -m 0755 skype.so $(DESTDIR)$(PLUGINDIR)
+	$(INSTALL) -m 0755 skype.so $(DESTDIR)$(PLUGINDIR)
 	mkdir -p $(DESTDIR)$(ETCDIR)/../skyped $(DESTDIR)$(BINDIR)
-	install -m 0644 $(_SRCDIR_)protocols/skype/skyped.cnf $(DESTDIR)$(ETCDIR)/../skyped/skyped.cnf
-	install -m 0644 $(_SRCDIR_)protocols/skype/skyped.conf.dist $(DESTDIR)$(ETCDIR)/../skyped/skyped.conf
-	install -m 0755 $(_SRCDIR_)protocols/skype/skyped.py $(DESTDIR)$(BINDIR)/skyped
-	make -C protocols/skype install-doc
+	$(INSTALL) -m 0644 $(_SRCDIR_)protocols/skype/skyped.cnf $(DESTDIR)$(ETCDIR)/../skyped/skyped.cnf
+	$(INSTALL) -m 0644 $(_SRCDIR_)protocols/skype/skyped.conf.dist $(DESTDIR)$(ETCDIR)/../skyped/skyped.conf
+	$(INSTALL) -m 0755 $(_SRCDIR_)protocols/skype/skyped.py $(DESTDIR)$(BINDIR)/skyped
+	$(MAKE) -C protocols/skype install-doc
 endif
 
 systemd:
@@ -146,9 +146,9 @@ install-systemd:
 ifdef SYSTEMDSYSTEMUNITDIR
 ifeq ($(shell id -u),0)
 	mkdir -p $(DESTDIR)$(SYSTEMDSYSTEMUNITDIR)
-	install -m 0644 init/bitlbee.service $(DESTDIR)$(SYSTEMDSYSTEMUNITDIR)
-	install -m 0644 init/bitlbee@.service $(DESTDIR)$(SYSTEMDSYSTEMUNITDIR)
-	install -m 0644 init/bitlbee.socket $(DESTDIR)$(SYSTEMDSYSTEMUNITDIR)
+	$(INSTALL) -m 0644 init/bitlbee.service $(DESTDIR)$(SYSTEMDSYSTEMUNITDIR)
+	$(INSTALL) -m 0644 init/bitlbee@.service $(DESTDIR)$(SYSTEMDSYSTEMUNITDIR)
+	$(INSTALL) -m 0644 init/bitlbee.socket $(DESTDIR)$(SYSTEMDSYSTEMUNITDIR)
 else
 	@echo Not root, so not installing systemd files.
 endif
diff --git a/configure b/configure
index bc1719bc..b190b205 100755
--- a/configure
+++ b/configure
@@ -479,6 +479,7 @@ if [ "$gcov" = "1" ]; then
 fi
 
 if [ "$plugins" = 0 ]; then
+	plugindir=""
 	echo '#undef WITH_PLUGINS' >> config.h
 else
 	echo '#define WITH_PLUGINS' >> config.h
@@ -570,6 +571,7 @@ fi
 cat <<EOF>bitlbee.pc
 prefix=$prefix
 includedir=$includedir
+plugindir=$plugindir
 
 Name: bitlbee
 Description: IRC to IM gateway
diff --git a/init/bitlbee.socket b/init/bitlbee.socket
index e5ceb475..51c59a2b 100644
--- a/init/bitlbee.socket
+++ b/init/bitlbee.socket
@@ -2,7 +2,8 @@
 Conflicts=bitlbee.service
 
 [Socket]
-ListenStream=127.0.0.1:6667
+ListenStream=6667
+BindToDevice=lo
 Accept=yes
 
 [Install]
diff --git a/irc_im.c b/irc_im.c
index 940f93bd..62f5a54b 100644
--- a/irc_im.c
+++ b/irc_im.c
@@ -625,7 +625,7 @@ static gboolean bee_irc_chat_msg( bee_t *bee, struct groupchat *c, bee_user_t *b
 	irc_t *irc = bee->ui_data;
 	irc_user_t *iu = bu->ui_data;
 	irc_channel_t *ic = c->ui_data;
-	char *ts = NULL;
+	char *wrapped, *ts = NULL;
 	
 	if( ic == NULL )
 		return FALSE;
@@ -633,7 +633,8 @@ static gboolean bee_irc_chat_msg( bee_t *bee, struct groupchat *c, bee_user_t *b
 	if( sent_at > 0 && set_getbool( &bee->set, "display_timestamps" ) )
 		ts = irc_format_timestamp( irc, sent_at );
 	
-	irc_send_msg( iu, "PRIVMSG", ic->name, msg, ts );
+	wrapped = word_wrap( msg, 425 );
+	irc_send_msg( iu, "PRIVMSG", ic->name, wrapped, ts );
 	g_free( ts );
 	
 	return TRUE;
diff --git a/nick.c b/nick.c
index 54e180da..dd8b0ddf 100644
--- a/nick.c
+++ b/nick.c
@@ -209,7 +209,7 @@ char *nick_gen( bee_user_t *bu )
 			part = asc = g_convert_with_fallback( part, -1, "ASCII//TRANSLIT",
 			                                      "UTF-8", "", NULL, NULL, NULL );
 		
-		if( chop && ( s = strchr( part, chop ) ) )
+		if( part && chop && ( s = strchr( part, chop ) ) )
 			len = MIN( len, s - part );
 		
 		if( part )
diff --git a/protocols/jabber/jabber_util.c b/protocols/jabber/jabber_util.c
index 4a71567a..67aa378a 100644
--- a/protocols/jabber/jabber_util.c
+++ b/protocols/jabber/jabber_util.c
@@ -288,7 +288,7 @@ static void jabber_buddy_ask_no( void *data )
 {
 	struct jabber_buddy_ask_data *bla = data;
 	
-	presence_send_request( bla->ic, bla->handle, "subscribed" );
+	presence_send_request( bla->ic, bla->handle, "unsubscribed" );
 	
 	g_free( bla->handle );
 	g_free( bla );
diff --git a/tests/check_nick.c b/tests/check_nick.c
index 6c4267cd..3c11810e 100644
--- a/tests/check_nick.c
+++ b/tests/check_nick.c
@@ -6,6 +6,7 @@
 #include "irc.h"
 #include "set.h"
 #include "misc.h"
+#include "bitlbee.h"
 
 START_TEST(test_nick_strip)
 {
@@ -30,7 +31,7 @@ START_TEST(test_nick_strip)
 	for (i = 0; get[i]; i++) {
 		char copy[60];
 		strcpy(copy, get[i]);
-		nick_strip(copy);
+		nick_strip(NULL, copy);
 		fail_unless (strcmp(copy, expected[i]) == 0, 
 					 "(%d) nick_strip broken: %s -> %s (expected: %s)", 
 					 i, get[i], copy, expected[i]);
@@ -45,7 +46,7 @@ START_TEST(test_nick_ok_ok)
 	int i;
 
 	for (i = 0; nicks[i]; i++) {
-		fail_unless (nick_ok(nicks[i]) == 1,
+		fail_unless (nick_ok(NULL, nicks[i]) == 1,
 					 "nick_ok() failed: %s", nicks[i]);
 	}
 }
@@ -58,7 +59,7 @@ START_TEST(test_nick_ok_notok)
 	int i;
 
 	for (i = 0; nicks[i]; i++) {
-		fail_unless (nick_ok(nicks[i]) == 0,
+		fail_unless (nick_ok(NULL, nicks[i]) == 0,
 					 "nick_ok() succeeded for invalid: %s", nicks[i]);
 	}
 }