Changes 0.8.5:

* Updated Bulgarian, French, Polish, Spanish, German, Italian translations
* Fixed possible crash on systray click
* Fixed accidental dialing on group collapse
* Fixed DTMF from keyboard - invalid keys are filtered
* Cleaner disconnect (unregister all reigstered accounts)
* Contacts are now grouped in account folders
* New iaxclient with tipix Echo Cancellation
* Added support for Italian, Spanish and Hebrew languages
* While calling just press number keys to send DTMF (no need to switch to dialpad)
* Call register shows call duration
* Added icons for registration status tracking
* Added options for muting incoming and outgoing rings
* Added option to run command on incoming call
* Fixed bugs.

11 files changed, 63 insertions, 164 deletions

diff --git a/net/kiax/Makefile b/net/kiax/Makefile
index 3008b04b2e4..cf1dc194ed9 100644
--- a/net/kiax/Makefile
+++ b/net/kiax/Makefile
@@ -1,15 +1,13 @@
-# $NetBSD: Makefile,v 1.6 2006/03/09 21:04:45 jlam Exp $
-#
+# $NetBSD: Makefile,v 1.7 2006/04/14 09:56:03 adam Exp $
 
-DISTNAME=		kiax-0.8.4
-PKGREVISION=		1
-CATEGORIES=		comms net audio
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=kiax/}
-EXTRACT_SUFX=		.tar.bz2
+DISTNAME=	kiax-0.8.5-src
+PKGNAME=	kiax-0.8.5
+CATEGORIES=	comms net audio
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=kiax/}
 
-MAINTAINER=		reinoud@NetBSD.org
-HOMEPAGE=		http://www.kiax.org/
-COMMENT=		Open internet telephony system
+MAINTAINER=	reinoud@NetBSD.org
+HOMEPAGE=	http://www.kiax.org/
+COMMENT=	Open internet telephony system
 
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
diff --git a/net/kiax/PLIST b/net/kiax/PLIST
index c1942a0136c..a53d84f0ccf 100644
--- a/net/kiax/PLIST
+++ b/net/kiax/PLIST
@@ -1,11 +1,18 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/01/25 00:00:03 reinoud Exp $
+@comment $NetBSD: PLIST,v 1.2 2006/04/14 09:56:03 adam Exp $
 bin/kiax
+share/kiax/icons/account-connected.png
+share/kiax/icons/account-connecting.png
+share/kiax/icons/account-rejected.png
+share/kiax/icons/account-small.png
+share/kiax/icons/account-timeout.png
+share/kiax/icons/account.png
 share/kiax/icons/contact.png
 share/kiax/icons/dial.png
 share/kiax/icons/failed.png
 share/kiax/icons/hangup.png
 share/kiax/icons/hold.png
 share/kiax/icons/incoming.png
+share/kiax/icons/kiaxlogo.png
 share/kiax/icons/missed.png
 share/kiax/icons/outgoing.png
 share/kiax/icons/resume.png
diff --git a/net/kiax/distinfo b/net/kiax/distinfo
index fbf38f2126d..e885398e4f1 100644
--- a/net/kiax/distinfo
+++ b/net/kiax/distinfo
@@ -1,14 +1,12 @@
-$NetBSD: distinfo,v 1.3 2006/02/16 20:53:23 joerg Exp $
+$NetBSD: distinfo,v 1.4 2006/04/14 09:56:03 adam Exp $
 
-SHA1 (kiax-0.8.4.tar.bz2) = 8889ad5051b24e4508db404b73431b5f3fcef88f
-RMD160 (kiax-0.8.4.tar.bz2) = 90d214096d447118e9e9bd312ed8745fccef0164
-Size (kiax-0.8.4.tar.bz2) = 606213 bytes
-SHA1 (patch-aa) = 869f66fbbc3c8b99499a12704940c3c5b3187385
-SHA1 (patch-ab) = 93f400d0785d334f5aff46cf96a2df8c416b7144
-SHA1 (patch-ac) = 4dbe2e3fb9c07d8d8fcdc05cded1e9f52aa96d4e
-SHA1 (patch-ad) = 1a79c45d3e67ab271468ec1b7a922071b465591d
-SHA1 (patch-ae) = d22d382ee5f632640dbe739f8a84b55d8aaee299
+SHA1 (kiax-0.8.5-src.tar.gz) = 7838a04b76d5602935676aee47b24a52cd579d9d
+RMD160 (kiax-0.8.5-src.tar.gz) = 7b2f69ad186886594c6f2abb812c06e9332f5d83
+Size (kiax-0.8.5-src.tar.gz) = 1479222 bytes
+SHA1 (patch-aa) = eadfd5525e7f1c18de8c9178905ec40dd7bb651f
+SHA1 (patch-ab) = 0c0ef51b9f4b0e26e354b15568359022a5cf7db0
+SHA1 (patch-ac) = f3f98e74209ab6a5a06e387cae494c08ad7e3238
+SHA1 (patch-ad) = 358978a9999d5ab268c65da5bee812d449dc2f92
+SHA1 (patch-ae) = 3b501b1e935da5e2aa9ae59987a6c3b004b49eda
 SHA1 (patch-af) = b2492a4aff367ec1330948bb4c7dc093152da59c
-SHA1 (patch-ag) = 70bc22a9750f20385a4653a39e16fddf1a88a700
-SHA1 (patch-ah) = c7a2b3464f840f43df787ff7fc4a7f9d0ce44e18
-SHA1 (patch-ai) = 7c7f35c4a62d60a395c922407778a2d49eb4ab0d
+SHA1 (patch-ai) = 347fdc20d43eccabcff1ce5ce185116e49a41a18
diff --git a/net/kiax/patches/patch-aa b/net/kiax/patches/patch-aa
index 75ea0dbd8b2..300333683dd 100644
--- a/net/kiax/patches/patch-aa
+++ b/net/kiax/patches/patch-aa
@@ -1,11 +1,11 @@
-$NetBSD: patch-aa,v 1.1.1.1 2006/01/25 00:00:03 reinoud Exp $
+$NetBSD: patch-aa,v 1.2 2006/04/14 09:56:03 adam Exp $
 
---- lib/Makefile.orig	2005-04-05 23:53:41.000000000 +0200
+--- lib/Makefile.orig	2006-02-05 01:34:34.000000000 +0100
 +++ lib/Makefile
-@@ -160,6 +160,12 @@ OBJS_LINUX=\
- 	portaudio/pa_unix_oss/pa_unix_oss.o \
+@@ -183,6 +183,12 @@ OBJS_NETBSD=\
  	portaudio/pa_unix_oss/pa_unix.o 
  
+ 
 +OBJS_NETBSD=\
 +	unixfuncs.o \
 +	portmixer/px_unix_oss/px_unix_oss.o \
@@ -15,9 +15,9 @@ $NetBSD: patch-aa,v 1.1.1.1 2006/01/25 00:00:03 reinoud Exp $
  OBJS_SOLARIS=\
  	unixfuncs.o \
  	portmixer/px_solaris/px_solaris.o \
-@@ -203,6 +209,9 @@ else
- ifneq (,$(findstring SunOS,$(shell uname)))
- OSTYPE=SOLARIS
+@@ -229,6 +235,9 @@ else
+ ifneq (,$(findstring NetBSD,$(shell uname)))
+ OSTYPE=NETBSD
  else
 +ifneq (,$(findstring NetBSD,$(shell uname)))
 +OSTYPE=NETBSD
@@ -25,7 +25,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2006/01/25 00:00:03 reinoud Exp $
  $(warning OSTYPE cannot be detected, assuming Linux)
  OSTYPE=LINUX
  endif
-@@ -210,6 +219,7 @@ endif
+@@ -237,6 +246,7 @@ endif
  endif
  endif
  endif
@@ -33,7 +33,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2006/01/25 00:00:03 reinoud Exp $
  
  # Setup platform-specific stuff based on gleaning
  ifeq ($(OSTYPE),WIN32)
-@@ -226,6 +236,13 @@ DYNCFLAGS=-fPIC
+@@ -254,6 +264,13 @@ DYNCFLAGS=-fPIC
  DYNLIB=libiaxclient.so
  endif
  
@@ -46,4 +46,4 @@ $NetBSD: patch-aa,v 1.1.1.1 2006/01/25 00:00:03 reinoud Exp $
 +
  ifeq ($(OSTYPE),SOLARIS)
  OBJS:= $(OBJS) $(OBJS_SOLARIS) 
- CFLAGS:= $(CFLAGS) -DALIGN32 
+ # only SPARC solaris machines need the alignment stuff
diff --git a/net/kiax/patches/patch-ab b/net/kiax/patches/patch-ab
index 03ab2e1de12..808950ae7f9 100644
--- a/net/kiax/patches/patch-ab
+++ b/net/kiax/patches/patch-ab
@@ -1,12 +1,12 @@
-$NetBSD: patch-ab,v 1.2 2006/02/16 20:53:23 joerg Exp $
+$NetBSD: patch-ab,v 1.3 2006/04/14 09:56:03 adam Exp $
 
---- lib/portaudio/pa_unix_oss/pa_unix_oss.c.orig	2005-04-05 23:53:41.000000000 +0200
+--- lib/portaudio/pa_unix_oss/pa_unix_oss.c.orig	2006-02-05 00:51:06.000000000 +0100
 +++ lib/portaudio/pa_unix_oss/pa_unix_oss.c
 @@ -43,7 +43,7 @@
  #ifdef __linux__
  #include <linux/soundcard.h>
  #else
--#ifdef __FreeBSD__
+-#if defined(__FreeBSD__) || defined(__NetBSD__)
 +#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
  #include <sys/soundcard.h>
  #else
diff --git a/net/kiax/patches/patch-ac b/net/kiax/patches/patch-ac
index ac8cddfc325..95f3fedf95d 100644
--- a/net/kiax/patches/patch-ac
+++ b/net/kiax/patches/patch-ac
@@ -1,17 +1,13 @@
-$NetBSD: patch-ac,v 1.2 2006/02/16 20:53:23 joerg Exp $
+$NetBSD: patch-ac,v 1.3 2006/04/14 09:56:03 adam Exp $
 
---- lib/portmixer/px_unix_oss/px_unix_oss.c.orig	2005-04-05 23:53:41.000000000 +0200
+--- lib/portmixer/px_unix_oss/px_unix_oss.c.orig	2006-02-05 00:54:14.000000000 +0100
 +++ lib/portmixer/px_unix_oss/px_unix_oss.c
-@@ -38,8 +38,12 @@
+@@ -38,7 +38,7 @@
  #ifdef __linux__
  #include <linux/soundcard.h>
  #else
+-#if defined(__FreeBSD__) || defined(__NetBSD__)
 +#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
-+#include <sys/soundcard.h>
-+#else
+ #include <sys/soundcard.h>
+ #else
  #include <machine/soundcard.h> /* JH20010905 */
- #endif
-+#endif
- 
- #include <stdio.h>
- #include <stdlib.h>
diff --git a/net/kiax/patches/patch-ad b/net/kiax/patches/patch-ad
index b37c97a99e6..383e44e2359 100644
--- a/net/kiax/patches/patch-ad
+++ b/net/kiax/patches/patch-ad
@@ -1,14 +1,13 @@
-$NetBSD: patch-ad,v 1.2 2006/02/16 20:53:23 joerg Exp $
+$NetBSD: patch-ad,v 1.3 2006/04/14 09:56:03 adam Exp $
 
---- lib/libiax2/src/iax-client.h.orig	2005-04-05 23:53:41.000000000 +0200
+--- lib/libiax2/src/iax-client.h.orig	2006-02-05 00:57:52.000000000 +0100
 +++ lib/libiax2/src/iax-client.h
-@@ -19,7 +19,8 @@
+@@ -19,7 +19,7 @@
  #pragma warning(disable:4200)
  #endif
- 
--#ifndef LINUX
+  
+-#if defined(LINUX) || defined(__FreeBSD__) || defined(__NetBSD__)
 +#if defined(LINUX) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
-+#else
+ #else
  #define socklen_t int
  #endif
- 
diff --git a/net/kiax/patches/patch-ae b/net/kiax/patches/patch-ae
index b17b3d49740..4b523d1ce5c 100644
--- a/net/kiax/patches/patch-ae
+++ b/net/kiax/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.2 2006/02/16 20:53:23 joerg Exp $
+$NetBSD: patch-ae,v 1.3 2006/04/14 09:56:03 adam Exp $
 
---- lib/libiax2/src/iax.c.orig	2005-04-13 19:30:39.000000000 +0200
+--- lib/libiax2/src/iax.c.orig	2006-02-05 01:01:33.000000000 +0100
 +++ lib/libiax2/src/iax.c
-@@ -36,6 +36,7 @@ void gettimeofday(struct timeval *tv, st
+@@ -38,6 +38,7 @@ void gettimeofday(struct timeval *tv, vo
  
  #else
  
@@ -10,31 +10,21 @@ $NetBSD: patch-ae,v 1.2 2006/02/16 20:53:23 joerg Exp $
  #include <netdb.h>
  #include <sys/socket.h>
  #include <netinet/in.h>
-@@ -55,9 +56,11 @@ void gettimeofday(struct timeval *tv, st
+@@ -62,7 +63,7 @@ void gettimeofday(struct timeval *tv, vo
  #ifndef MACOSX
  #include <malloc.h>
  #ifndef SOLARIS
+-#if !defined(__NetBSD__) && !defined(__FreeBSD__)
 +#if !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__DragonFly__)
  #include <error.h>
  #endif
  #endif
-+#endif
- 
- #endif
- 
-@@ -87,11 +90,15 @@ void gettimeofday(struct timeval *tv, st
- #else
+@@ -97,7 +98,7 @@ void gettimeofday(struct timeval *tv, vo
  #ifdef SOLARIS
  #define IAX_SOCKOPTS MSG_DONTWAIT
-+#else
+ #else
+-#ifdef __NetBSD__
 +#if defined(__NetBSD__) || defined(__DragonFly__)
-+#define IAX_SOCKOPTS MSG_DONTWAIT
+ #define IAX_SOCKOPTS MSG_DONTWAIT
  #else  /* Linux and others */
  #define IAX_SOCKOPTS MSG_DONTWAIT | MSG_NOSIGNAL
- #endif
- #endif
- #endif
-+#endif
- 
- 
- #ifdef SNOM_HACK
diff --git a/net/kiax/patches/patch-ag b/net/kiax/patches/patch-ag
deleted file mode 100644
index cecea52d498..00000000000
--- a/net/kiax/patches/patch-ag
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-ag,v 1.2 2006/01/25 15:04:30 reinoud Exp $
-
---- lib/portaudio/pa_unix_oss/pa_unix.c.orig	2005-04-05 23:53:41.000000000 +0200
-+++ lib/portaudio/pa_unix_oss/pa_unix.c
-@@ -422,11 +422,13 @@ static PaError PaHost_WatchDogProc( PaHo
-     maxPri = sched_get_priority_max(SCHEDULER_POLICY);
-     if( schp.sched_priority > maxPri ) schp.sched_priority = maxPri;
- 
-+#ifndef __NetBSD__
-     if (sched_setscheduler(0, SCHEDULER_POLICY, &schp) != 0)
-     {
-         ERR_RPT(("PaHost_WatchDogProc: cannot set watch dog priority!\n"));
-         goto killAudio;
-     }
-+#endif
- 
-     /* Compare watchdog time with audio and canary thread times. */
-     /* Sleep for a while or until thread cancelled. */
-@@ -465,6 +467,7 @@ static PaError PaHost_WatchDogProc( PaHo
- lowerAudio:
-     {
-         struct sched_param    schat = { 0 };
-+#ifndef __NetBSD__
-         if( sched_setscheduler(pahsc->pahsc_AudioThreadPID, SCHED_OTHER, &schat) != 0)
-         {
-             ERR_RPT(("PaHost_WatchDogProc: failed to lower audio priority. errno = %d\n", errno ));
-@@ -475,6 +478,9 @@ lowerAudio:
-             ERR_RPT(("PaHost_WatchDogProc: lowered audio priority to prevent hogging of CPU.\n"));
-             goto cleanup;
-         }
-+#else
-+	goto cleanup;
-+#endif
-     }
- 
- killAudio:
diff --git a/net/kiax/patches/patch-ah b/net/kiax/patches/patch-ah
deleted file mode 100644
index 3b83826ddc4..00000000000
--- a/net/kiax/patches/patch-ah
+++ /dev/null
@@ -1,53 +0,0 @@
-$NetBSD: patch-ah,v 1.2 2006/01/25 15:04:30 reinoud Exp $
-
---- lib/unixfuncs.c.orig	2005-04-05 23:53:41.000000000 +0200
-+++ lib/unixfuncs.c
-@@ -88,6 +88,16 @@ int iaxc_prioboostend() {
-     /* TODO */
- }
- 
-+#endif
-+
-+#ifdef __NetBSD__
-+
-+int iaxc_prioboostbegin() {
-+}
-+
-+int iaxc_prioboostend() {
-+}
-+
- #else
- 
- 
-@@ -194,11 +204,13 @@ static int WatchDogProc( prioboost   *b 
-     maxPri = sched_get_priority_max(SCHEDULER_POLICY);
-     if( schp.sched_priority > maxPri ) schp.sched_priority = maxPri;
- 
-+#ifndef __NetBSD__
-     if (pthread_setschedparam(pthread_self(), SCHEDULER_POLICY, &schp) != 0)
-     {
-         ERR_RPT("WatchDogProc: cannot set watch dog priority!\n");
-         goto killAudio;
-     }
-+#endif
- 
-     DBUG("prioboost: WatchDog priority set to level %d!\n", schp.sched_priority);        
- 
-@@ -237,6 +249,7 @@ static int WatchDogProc( prioboost   *b 
-     return 0;
- 
- lowerAudio:
-+#ifndef __NetBSD__
-     {
-         struct sched_param    schat = { 0 };
-         if( pthread_setschedparam(b->ThreadID, SCHED_OTHER, &schat) != 0)
-@@ -250,6 +263,9 @@ lowerAudio:
-             goto cleanup;
-         }
-     }
-+#else
-+	goto cleanup;
-+#endif
- 
- killAudio:
-     ERR_RPT("WatchDogProc: killing hung audio thread!\n");
diff --git a/net/kiax/patches/patch-ai b/net/kiax/patches/patch-ai
index fe518635a1d..facc2d7583e 100644
--- a/net/kiax/patches/patch-ai
+++ b/net/kiax/patches/patch-ai
@@ -1,12 +1,12 @@
-$NetBSD: patch-ai,v 1.2 2006/02/16 20:53:23 joerg Exp $
+$NetBSD: patch-ai,v 1.3 2006/04/14 09:56:03 adam Exp $
 
---- lib/libiax2/src/md5.c.orig	2005-04-05 23:53:41.000000000 +0200
+--- lib/libiax2/src/md5.c.orig	2006-02-05 01:25:25.000000000 +0100
 +++ lib/libiax2/src/md5.c
 @@ -1,7 +1,7 @@
  /* MD5 checksum routines used for authentication.  Not covered by GPL, but
     in the public domain as per the copyright below */
  
--#ifdef FREEBSD
+-#if defined(__FreeBSD__) || defined(__NetBSD__)
 +#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
  # include <machine/endian.h>
  #elif defined(LINUX)