um_callerid: Only people can have common channels

[solanum.git] / include / s_serv.h

diff --git a/include/s_serv.h b/include/s_serv.h
index 4f697dba7392896f149112aff851c39cb118f9ba..1c15b0144b9e14770f10bfdcb7c75452611a8737 100644 (file)
--- a/include/s_serv.h
+++ b/include/s_serv.h
@@ -20,14 +20,12 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
- *
- *  $Id: s_serv.h 1863 2006-08-27 13:40:37Z jilles $
  */
 
 #ifndef INCLUDED_serv_h
 #define INCLUDED_serv_h
 
-#include "config.h"
+#include "defaults.h"
 #include "capability.h"
 
 /*
@@ -53,11 +51,11 @@ extern struct CapabilityIndex *cli_capindex;
 
 /* register client capabilities with this structure for 3.2 enhanced capability negotiation */
 #define CLICAP_FLAGS_STICKY    0x001
-#define CLICAP_FLAGS_REQACK    0x002
+#define CLICAP_FLAGS_PRIORITY  0x002
 
 struct ClientCapability {
-       int (*visible)(struct Client *);                        /* whether or not to display the capability.  set to NULL or true return value = displayed */
-       const char *(*data)(struct Client *);                   /* any custom data for the capability.  set to NULL or return NULL = no data */
+       bool (*visible)(struct Client *);               /* whether or not to display the capability.  set to NULL or true return value = displayed */
+       const char *(*data)(struct Client *);           /* any custom data for the capability.  set to NULL or return NULL = no data */
        unsigned int flags;
 };