diff options
| author | Wilmer van der Gaast <wilmer@gaast.net> | 2006-04-08 16:10:29 +0200 |
|---|---|---|
| committer | Wilmer van der Gaast <wilmer@gaast.net> | 2006-04-08 16:10:29 +0200 |
| commit | 11bcee97b781bac6e38db4e1630ac6934209e73b (patch) | |
| tree | d1377a6ebef982752ce3e9afd3137b370d87d1c1 /protocols/nogaim.h | |
| parent | f8de26f98e3c38d3deacb674e533c588e6b48548 (diff) | |
| parent | 9e08d5d5ba8958807158d7afaedd40e60cfb40ff (diff) | |
Misc. merges. (Main thing: "$blah is not in your list yet, would you like to add him?")
Diffstat (limited to 'protocols/nogaim.h')
| -rw-r--r-- | protocols/nogaim.h | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/protocols/nogaim.h b/protocols/nogaim.h index 894b5b05..4699f69f 100644 --- a/protocols/nogaim.h +++ b/protocols/nogaim.h @@ -14,7 +14,7 @@ * * Copyright (C) 1998-1999, Mark Spencer <markster@marko.net> * (and possibly other members of the Gaim team) - * Copyright 2002-2004 Wilmer van der Gaast <lintux@lintux.cx> + * Copyright 2002-2004 Wilmer van der Gaast <wilmer@gaast.net> */ /* @@ -51,22 +51,12 @@ #define SELF_ALIAS_LEN 400 #define BUDDY_ALIAS_MAXLEN 388 /* because MSN names can be 387 characters */ -#define PERMIT_ALL 1 -#define PERMIT_NONE 2 -#define PERMIT_SOME 3 -#define DENY_SOME 4 - #define WEBSITE "http://www.bitlee.org/" #define IM_FLAG_AWAY 0x0020 #define OPT_CONN_HTML 0x00000001 #define OPT_LOGGED_IN 0x00010000 #define GAIM_AWAY_CUSTOM "Custom" -#define GAIM_LOGO 0 -#define GAIM_ERROR 1 -#define GAIM_WARNING 2 -#define GAIM_INFO 3 - /* ok. now the fun begins. first we create a connection structure */ struct gaim_connection { |