[libEtPan-commits] CVS: xetpan/src ui-types.h,1.4,1.5

[Melvin H. <mha...@us...>]

Update of /cvsroot/libetpan/xetpan/src
In directory sc8-pr-cvs1:/tmp/cvs-serv27368/src

Modified Files:
	ui-types.h 
Log Message:
Updated XePUIIOWatcher for correct callback declaration
Updated XePUIMain to store remote connection data
Added XETPAN_POLL* enumeration


Index: ui-types.h
===================================================================
RCS file: /cvsroot/libetpan/xetpan/src/ui-types.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ui-types.h	16 Dec 2002 12:37:55 -0000	1.4
+++ ui-types.h	17 Dec 2002 02:59:45 -0000	1.5
@@ -42,7 +42,7 @@
 {
   unsigned int watch_id;
   int fd;
-  int (*callback)(int afd, short int acondition, void *adata);
+  void (*callback)(int afd, short int acondition, void *adata);
   void *data;
   void *channel;
   short int condition;
@@ -65,7 +65,7 @@
   void *statusbar;   /**< The status bar         */
   void *xetpan;      /**< The main XetPan struct */
   int kb_watch_id;   /**< The keyboard watch ID  */
-  int client_fd;     /**< The remote client's socket */
+  void *remote;      /**< The remote client      */
 };
 
 typedef struct XePUICompose_s XePUICompose;
@@ -88,4 +88,15 @@
     XETPAN_EXEC_SYNC,
     XETPAN_EXEC_ASYNC
   };
+
+enum
+  {
+    XETPAN_POLLIN   = 1 << 0,
+    XETPAN_POLLPRI  = 1 << 1,
+    XETPAN_POLLOUT  = 1 << 2,
+    XETPAN_POLLERR  = 1 << 3,
+    XETPAN_POLLHUP  = 1 << 4,
+    XETPAN_POLLNVAL = 1 << 5
+  };
+
 #endif