Index: /branches/eam_branches/ipp-20130509/Ohana/src/libkapa/Makefile
===================================================================
--- /branches/eam_branches/ipp-20130509/Ohana/src/libkapa/Makefile	(revision 35597)
+++ /branches/eam_branches/ipp-20130509/Ohana/src/libkapa/Makefile	(revision 35598)
@@ -24,5 +24,4 @@
 $(SRC)/IOfuncs.$(ARCH).o  \
 $(SRC)/KiiPicture.$(ARCH).o \
-$(SRC)/KiiOpen.$(ARCH).o \
 $(SRC)/KiiOverlay.$(ARCH).o \
 $(SRC)/KiiCursor.$(ARCH).o \
@@ -31,4 +30,7 @@
 $(SRC)/KapaColors.$(ARCH).o \
 $(SRC)/KapaOpen.$(ARCH).o
+
+# deprecated:
+# $(SRC)/KiiOpen.$(ARCH).o
 
 DRAW = \
Index: /branches/eam_branches/ipp-20130509/Ohana/src/libkapa/include/kapa.h
===================================================================
--- /branches/eam_branches/ipp-20130509/Ohana/src/libkapa/include/kapa.h	(revision 35597)
+++ /branches/eam_branches/ipp-20130509/Ohana/src/libkapa/include/kapa.h	(revision 35598)
@@ -142,9 +142,4 @@
 char *KiiRecvData (int device);
 int KiiWaitAnswer (int device, char *expect);
-
-/* KiiOpen.c */
-int KiiOpen (char *kii_exec, char *name);
-int KiiClose (int socket);
-int KiiWait (char *sockpath);
 
 /* KiiPicture.c */
@@ -271,4 +266,5 @@
 int KapaOpenNamedSocket (char *kapa_exec, char *name);
 int KapaWaitNamedSocket (char *sockpath);
+int KapaClose (int socket);
 
 /* define Kapa names for shared functions */
@@ -281,5 +277,6 @@
 # define KapaPS(fd,s,r,f) KiiPS(fd,s,r,f)
 
-# define KapaClose(socket) KiiClose(socket)
+// deprecated
+// # define KapaClose(socket) KiiClose(socket)
 # define KapaWait(sockpath) KiiWait(sockpath)
 # define KapaSendCommandV(device, length, format, argp) KiiSendCommandV(device, length, format, argp)
Index: /branches/eam_branches/ipp-20130509/Ohana/src/libkapa/src/KapaOpen.c
===================================================================
--- /branches/eam_branches/ipp-20130509/Ohana/src/libkapa/src/KapaOpen.c	(revision 35597)
+++ /branches/eam_branches/ipp-20130509/Ohana/src/libkapa/src/KapaOpen.c	(revision 35598)
@@ -430,2 +430,10 @@
   return (pid);
 }
+
+int KapaClose (int fd) {
+
+  if (fd < 1) return (FALSE);
+  KiiSendCommand (fd, 4, "QUIT");
+  close (fd);
+  return (TRUE);
+}