diff src/gaim.h @ 5872:059d95c67cda

[gaim-migrate @ 6304] The legendary Header File Cleanup! Files now only include what they need. This should reduce the number of files that must recompile when a header file changes. It's a lot nicer. Trust me on it. I also added a couple new header files. I hope I didn't break TOO much! committer: Tailor Script <[e-mail]>

--- a/src/gaim.h	Sat Jun 14 21:34:31 2003 +0000
+++ b/src/gaim.h	Sat Jun 14 23:21:02 2003 +0000
@@ -22,166 +22,9 @@
 #ifndef _GAIM_H_
 #define _GAIM_H_
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "core.h"
-#include "blist.h"
-#include "ui.h"
-#include "util.h"
-
 #define XPATCH BAD /* Because Kalla Said So */
 
-/* XXX CUI: when this is done being split, the only things below should be things
- * both the core and the uis depend on e.g. the protocol definitions, etc, and
- * it won't include core.h or ui.h (i.e. it'll mostly be #define's) */
-
-/* this is the basis of the CUI protocol. */
-#define CUI_TYPE_META		1
-#define CUI_TYPE_PLUGIN		2
-#define CUI_TYPE_USER		3
-#define CUI_TYPE_CONN		4
-#define CUI_TYPE_BUDDY		5	/* BUDDY_LIST, i.e., both groups and buddies */
-#define CUI_TYPE_MESSAGE	6
-#define CUI_TYPE_CHAT		7
-#define CUI_TYPE_REMOTE         8       
-					/* This is used to send commands to other UI's, 
-					 * like "Open new conversation" or "send IM".
-					 * Even though there's much redundancy with the
-					 * other CUI_TYPES, we're better keeping this stuff
-					 * seperate because it's intended use is so different */
-
-#define CUI_META_LIST		1	
-					/* 1 is always list; this is ignored by the core.
-					   If we move to TCP this can be a keepalive */
-#define CUI_META_QUIT		2
-#define CUI_META_DETACH		3	
-					/* you don't need to send this, you can just close
-					   the socket. the core will understand. */
-#define CUI_META_PING           4
-#define CUI_META_ACK            5
-
-#define CUI_PLUGIN_LIST		1
-#define CUI_PLUGIN_LOAD		2
-#define CUI_PLUGIN_UNLOAD	3
-
-#define CUI_USER_LIST		1
-#define CUI_USER_ADD		2
-#define CUI_USER_REMOVE		3
-#define CUI_USER_MODIFY		4	/* this handles moving them in the list too */
-#define CUI_USER_SIGNON		5
-
-#define CUI_CONN_LIST		1
-#define CUI_CONN_PROGRESS	2
-#define CUI_CONN_ONLINE		3
-#define CUI_CONN_OFFLINE	4	/* this may send a "reason" for why it was killed */
-
-#define CUI_BUDDY_LIST		1
-#define CUI_BUDDY_STATE		2	
-					/* notifies the UI of state changes; UI can use it to
-					   request the current status from the core */
-#define CUI_BUDDY_ADD		3
-#define CUI_BUDDY_REMOVE	4
-#define CUI_BUDDY_MODIFY	5
-
-#define CUI_MESSAGE_LIST	1	/* no idea */
-#define CUI_MESSAGE_SEND	2
-#define CUI_MESSAGE_RECV	3
-
-#define CUI_CHAT_LIST		1
-#define CUI_CHAT_HISTORY	2	/* is this necessary? should we have one for IMs? */
-#define CUI_CHAT_JOIN		3	/* handles other people joining/parting too */
-#define CUI_CHAT_PART		4
-#define CUI_CHAT_SEND		5
-#define CUI_CHAT_RECV		6
-
-#define CUI_REMOTE_CONNECTIONS  2       /* Get a list of gaim_connections */
-#define CUI_REMOTE_URI          3       /* Have the core handle aim:// URI's */
-#define CUI_REMOTE_BLIST        4       /* Return a copy of the buddy list */
-#define CUI_REMOTE_STATE        5       /* Given a buddy, return his presence. */
-#define CUI_REMOTE_NEW_CONVO    6       /* Must give a user, can give an optional message */
-#define CUI_REMOTE_SEND         7       /* Sends a message, a 'quiet' flag determines whether
-					 * a convo window is displayed or not. */
-#define CUI_REMOTE_ADD_BUDDY    8       /* Adds buddy to list */
-#define CUI_REMOTE_REMOVE_BUDDY 9       /* Removes buddy from list */
-#define CUI_REMOTE_JOIN_CHAT    10       /* Joins a chat. */
-                              /* What else?? */
-
-
-#define IM_FLAG_AWAY     0x01
-#define IM_FLAG_CHECKBOX 0x02
-#define IM_FLAG_GAIMUSER 0x04
-
-#define PERMIT_ALL	1
-#define PERMIT_NONE	2
-#define PERMIT_SOME	3
-#define DENY_SOME	4
-
-#define NOT_TYPING 0
-#define TYPING     1
-#define TYPED      2
-
-#define WFLAG_SEND	0x01
-#define WFLAG_RECV	0x02
-#define WFLAG_AUTO	0x04
-#define WFLAG_WHISPER	0x08
-#define WFLAG_FILERECV	0x10
-#define WFLAG_SYSTEM	0x20
-#define WFLAG_NICK	0x40
-#define WFLAG_NOLOG	0x80
-#define WFLAG_COLORIZE  0x100
-
-#define AUTO_RESPONSE "&lt;AUTO-REPLY&gt; : "
-
-#define WEBSITE "http://gaim.sourceforge.net/"
-
-#ifdef ENABLE_NLS
-#  include <libintl.h>
-#  define _(x) gettext(x)
-#  ifdef gettext_noop
-#    define N_(String) gettext_noop (String)
-#  else
-#    define N_(String) (String)
-#  endif
-#else
-#  define N_(String) (String)
-#  define _(x) (x)
-#endif
-
-#define DEFAULT_INFO "Visit the Gaim website at <A HREF=\"http://gaim.sourceforge.net/\">http://gaim.sourceforge.net/</A>."
-
-enum log_event {
-	log_signon = 0,
-	log_signoff,
-	log_away,
-	log_back,
-	log_idle,
-	log_unidle,
-	log_quit
-};
-
-#define OPT_POUNCE_POPUP	0x001
-#define OPT_POUNCE_SEND_IM	0x002
-#define OPT_POUNCE_COMMAND	0x004
-#define OPT_POUNCE_SOUND	0x008
-
-#define OPT_POUNCE_SIGNON	0x010
-#define OPT_POUNCE_UNAWAY	0x020
-#define OPT_POUNCE_UNIDLE	0x040
-#define OPT_POUNCE_TYPING       0x080
-#define OPT_POUNCE_SAVE		0x100
-
-#define OPT_POUNCE_NOTIFY	0x200
-
-/* These should all be runtime selectable */
-
-#define MSG_LEN 2048
-/* The above should normally be the same as BUF_LEN,
- * but just so we're explictly asking for the max message
- * length. */
-#define BUF_LEN MSG_LEN
-#define BUF_LONG BUF_LEN * 2
+#include "connection.h"
 
 /* Globals in main.c */
 extern int opt_away;
@@ -225,52 +68,6 @@
 /* Functions in idle.c */
 extern gint check_idle(gpointer);
 
-/* Functions in server.c */
-/* input to serv */
-extern void serv_login(GaimAccount *);
-extern void serv_close(GaimConnection *);
-extern void serv_touch_idle(GaimConnection *);
-extern int  serv_send_im(GaimConnection *, char *, char *, int, int);
-extern void serv_get_info(GaimConnection *, char *);
-extern void serv_get_dir(GaimConnection *, char *);
-extern void serv_set_idle(GaimConnection *, int);
-extern void serv_set_info(GaimConnection *, char *);
-extern void serv_set_away(GaimConnection *, char *, char *);
-extern void serv_set_away_all(char *);
-extern int  serv_send_typing(GaimConnection *, char *, int);
-extern void serv_change_passwd(GaimConnection *, const char *, const char *);
-extern void serv_add_buddy(GaimConnection *, const char *);
-extern void serv_add_buddies(GaimConnection *, GList *);
-extern void serv_remove_buddy(GaimConnection *, char *, char *);
-extern void serv_remove_buddies(GaimConnection *, GList *, char *);
-extern void serv_add_permit(GaimConnection *, const char *);
-extern void serv_add_deny(GaimConnection *, const char *);
-extern void serv_rem_permit(GaimConnection *, const char *);
-extern void serv_rem_deny(GaimConnection *, const char *);
-extern void serv_set_permit_deny(GaimConnection *);
-extern void serv_warn(GaimConnection *, char *, int);
-extern void serv_set_dir(GaimConnection *, const char *, const char *, const char *, const char *, const char *, const char *, const char *, int);
-extern void serv_dir_search(GaimConnection *, const char *, const char *, const char *, const char *, const char *, const char *, const char *, const char *);
-extern void serv_join_chat(GaimConnection *, GHashTable *);
-extern void serv_chat_invite(GaimConnection *, int, const char *, const char *);
-extern void serv_chat_leave(GaimConnection *, int);
-extern void serv_chat_whisper(GaimConnection *, int, char *, char *);
-extern int  serv_chat_send(GaimConnection *, int, char *);
-extern void serv_got_popup(char *, char *, int, int);
-extern void serv_get_away(GaimConnection *, const char *);
-extern void serv_alias_buddy(struct buddy *);
-extern void serv_move_buddy(struct buddy *, struct group *, struct group *);
-extern void serv_rename_group(GaimConnection *, struct group *, const char *);
-extern void serv_set_buddyicon(GaimConnection *, const char *);
-
-/* Functions in log.h */
-extern FILE *open_log_file (const char *, int);
-extern void system_log(enum log_event, GaimConnection *, struct buddy *, int);
-extern void rm_log(struct log_conversation *);
-extern struct log_conversation *find_log_info(const char *);
-extern void update_log_convs();
-extern void save_convo(GtkWidget *save, GaimConversation *c);
-extern char *html_logize(const char *p);
 
 /*------------------------------------------------------------------------*/
 /*  Multi-Entry dialog and vCard dialog support                           */