Menu
▾
▴
[Gaim-commits] CVS: gaim/src internal.h,NONE,1.1 log.h,NONE,1.1 server.h,NONE,1.1 about.c,1.88,1.89 account.c,1.33,1.34 account.h,1.11,1.12 away.c,1.106,1.107 blist.c,1.29,1.30 browser.c,1.50,1.51 buddy_chat.c,1.201,1.202 connection.c,1.18,1.19 connection.h,1.5,1.6 conversation.c,1.525,1.526 conversation.h,1.16,1.17 core.c,1.44,1.45 core.h,1.57,1.58 dialogs.c,1.481,1.482 ft.c,1.38,1.39 ft.h,1.14,1.15 gaim-remote.c,1.9,1.10 gaim.h,1.401,1.402 gaimrc.c,1.202,1.203 gtkaccount.c,1.66,1.67 gtkblist.c,1.53,1.54 gtkblist.h,1.8,1.9 gtkconn.c,1.2,1.3 gtkconv.c,1.139,1.140 gtkconv.h,1.17,1.18 gtkdebug.c,1.19,1.20 gtkdebug.h,1.3,1.4 gtkft.c,1.29,1.30 gtkft.h,1.5,1.6 gtknotify.c,1.9,1.10 gtkpounce.c,1.20,1.21 gtkprefs.c,1.41,1.42 gtkrequest.c,1.17,1.18 gtksound.c,1.2,1.3 gtkutils.c,1.22,1.23 gtkutils.h,1.8,1.9 html.c,1.49,1.50 idle.c,1.47,1.48 log.c,1.22,1.23 main.c,1.58,1.59 multi.h,1.55,1.56 plugin.c,1.19,1.20 pounce.c,1.13,1.14 privacy.h,1.2,1.3 proxy.c,1.68,1.69 proxy.h,1.19,1.20 prpl.c,1.116,1.117 prpl.h,1.114,1.115 server.c,1.335,1.336 session.c,1.7,1.8 sound.c,1.87,1.88 stock.c,1.13,1.14 themes.c,1.22,1.23 ui.h,1.120,1.121 util.c,1.200,1.201 util.h,1.10,1.11
Update of /cvsroot/gaim/gaim/src In directory sc8-pr-cvs1:/tmp/cvs-serv11332/src Modified Files: about.c account.c account.h away.c blist.c browser.c buddy_chat.c connection.c connection.h conversation.c conversation.h core.c core.h dialogs.c ft.c ft.h gaim-remote.c gaim.h gaimrc.c gtkaccount.c gtkblist.c gtkblist.h gtkconn.c gtkconv.c gtkconv.h gtkdebug.c gtkdebug.h gtkft.c gtkft.h gtknotify.c gtkpounce.c gtkprefs.c gtkrequest.c gtksound.c gtkutils.c gtkutils.h html.c idle.c log.c main.c multi.h plugin.c pounce.c privacy.h proxy.c proxy.h prpl.c prpl.h server.c session.c sound.c stock.c themes.c ui.h util.c util.h Added Files: internal.h log.h server.h Log Message: 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! --- NEW FILE: internal.h --- /** * @file internal.h Internal definitions and includes * @ingroup gtkui * * gaim * * Copyright (C) 2003 Christian Hammond <ch...@gn...> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef _GAIM_INTERNAL_H_ #define _GAIM_INTERNAL_H_ #ifdef HAVE_CONFIG_H #include <config.h> #endif #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 #ifdef HAVE_ENDIAN_H # include <endian.h> #endif #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 <sys/stat.h> #include <sys/time.h> #include <sys/types.h> #include <sys/wait.h> #include <ctype.h> #include <errno.h> #include <fcntl.h> #include <math.h> #include <stdio.h> #include <stdlib.h> #include <string.h> #include <time.h> #ifdef HAVE_ICONV #include <iconv.h> #endif #ifdef HAVE_LANGINFO_CODESET #include <langinfo.h> #endif #ifdef GAIM_PLUGINS # include <gmodule.h> # ifndef _WIN32 # include <dlfcn.h> # endif #endif #ifdef _WIN32 # include <gdk/gdkwin32.h> # include <winsock.h> # include "win32dep.h" # include <direct.h> # include <winsock.h> # include <io.h> #else # include <arpa/inet.h> # include <netinet/in.h> # include <sys/socket.h> # include <sys/un.h> # include <sys/utsname.h> # include <gdk/gdkx.h> # include <netdb.h> # include <signal.h> # include <unistd.h> #endif #ifndef MAXPATHLEN # define MAXPATHLEN 1024 #endif #ifndef HOST_NAME_MAX # define HOST_NAME_MAX 255 #endif #define PATHSIZE 1024 #include <gtk/gtk.h> #include <glib.h> #define WEBSITE "http://gaim.sourceforge.net/" #endif /* _GAIM_INTERNAL_H_ */ --- NEW FILE: log.h --- /** * @file log.h Logging API * @ingroup core * * gaim * * Copyright (C) 2003 Christian Hammond <ch...@gn...> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef _GAIM_LOG_H_ #define _GAIM_LOG_H_ #include "blist.h" #include "connection.h" #include "conversation.h" /* XXX Temporary! */ #define OPT_LOG_BUDDY_SIGNON 0x00000004 #define OPT_LOG_BUDDY_IDLE 0x00000008 #define OPT_LOG_BUDDY_AWAY 0x00000010 #define OPT_LOG_MY_SIGNON 0x00000020 enum log_event { log_signon = 0, log_signoff, log_away, log_back, log_idle, log_unidle, log_quit }; struct log_conversation { char name[80]; char filename[512]; struct log_conversation *next; }; extern GList *log_conversations; FILE *open_log_file (const char *, int); void system_log(enum log_event, GaimConnection *, struct buddy *, int); void rm_log(struct log_conversation *); struct log_conversation *find_log_info(const char *); void update_log_convs(); void save_convo(GtkWidget *save, GaimConversation *c); char *html_logize(const char *p); #endif /* _GAIM_LOG_H_ */ --- NEW FILE: server.h --- /** * @file server.h Server API * @ingroup core * * gaim * * Copyright (C) 2003 Christian Hammond <ch...@gn...> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef _GAIM_SERVER_H_ #define _GAIM_SERVER_H_ #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 IM_FLAG_AWAY 0x01 #define IM_FLAG_CHECKBOX 0x02 #define IM_FLAG_GAIMUSER 0x04 /* * Really user states are controlled by the PRPLs now. We just * use this for event_away */ #define UC_UNAVAILABLE 1 #include "account.h" #include "conversation.h" void serv_login(GaimAccount *); void serv_close(GaimConnection *); void serv_touch_idle(GaimConnection *); int serv_send_im(GaimConnection *, char *, char *, int, int); void serv_get_info(GaimConnection *, char *); void serv_get_dir(GaimConnection *, char *); void serv_set_idle(GaimConnection *, int); void serv_set_info(GaimConnection *, char *); void serv_set_away(GaimConnection *, char *, char *); void serv_set_away_all(char *); int serv_send_typing(GaimConnection *, char *, int); void serv_change_passwd(GaimConnection *, const char *, const char *); void serv_add_buddy(GaimConnection *, const char *); void serv_add_buddies(GaimConnection *, GList *); void serv_remove_buddy(GaimConnection *, char *, char *); void serv_remove_buddies(GaimConnection *, GList *, char *); void serv_add_permit(GaimConnection *, const char *); void serv_add_deny(GaimConnection *, const char *); void serv_rem_permit(GaimConnection *, const char *); void serv_rem_deny(GaimConnection *, const char *); void serv_set_permit_deny(GaimConnection *); void serv_warn(GaimConnection *, char *, int); void serv_set_dir(GaimConnection *, const char *, const char *, const char *, const char *, const char *, const char *, const char *, int); void serv_dir_search(GaimConnection *, const char *, const char *, const char *, const char *, const char *, const char *, const char *, const char *); void serv_join_chat(GaimConnection *, GHashTable *); void serv_chat_invite(GaimConnection *, int, const char *, const char *); void serv_chat_leave(GaimConnection *, int); void serv_chat_whisper(GaimConnection *, int, char *, char *); int serv_chat_send(GaimConnection *, int, char *); void serv_got_popup(char *, char *, int, int); void serv_get_away(GaimConnection *, const char *); void serv_alias_buddy(struct buddy *); void serv_got_alias(GaimConnection *gc, const char *who, const char *alias); void serv_move_buddy(struct buddy *, struct group *, struct group *); void serv_rename_group(GaimConnection *, struct group *, const char *); void serv_got_eviled(GaimConnection *gc, const char *name, int lev); void serv_got_typing(GaimConnection *gc, const char *name, int timeout, GaimTypingState state); void serv_set_buddyicon(GaimConnection *gc, const char *filename); void serv_got_typing_stopped(GaimConnection *gc, const char *name); void serv_got_im(GaimConnection *gc, const char *who, const char *msg, guint32 flags, time_t mtime, gint len); void serv_got_update(GaimConnection *gc, const char *name, int loggedin, int evil, time_t signon, time_t idle, int type); void serv_finish_login(GaimConnection *gc); void serv_got_chat_invite(GaimConnection *gc, const char *name, const char *who, const char *message, GHashTable *data); GaimConversation *serv_got_joined_chat(GaimConnection *gc, int id, const char *name); void serv_got_chat_left(GaimConnection *g, int id); void serv_got_chat_in(GaimConnection *g, int id, char *who, int whisper, char *message, time_t mtime); #endif /* _GAIM_SERVER_H_ */ Index: about.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/about.c,v retrieving revision 1.88 retrieving revision 1.89 diff -u -d -r1.88 -r1.89 --- about.c 5 Apr 2003 05:01:27 -0000 1.88 +++ about.c 14 Jun 2003 23:21:00 -0000 1.89 @@ -19,17 +19,14 @@ * */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif -#include <string.h> -#include <stdio.h> -#include <stdlib.h> -#include <time.h> +#include "internal.h" +#include "gtkimhtml.h" +#include "gtkutils.h" +#include "stock.h" +#include "ui.h" -#include <gtk/gtk.h> +/* XXX For WEBSITE */ #include "gaim.h" -#include "gtkimhtml.h" static GtkWidget *about = NULL; @@ -38,21 +35,6 @@ if (about) gtk_widget_destroy(about); about = NULL; -} - -char *name() -{ - return PACKAGE; -} - -char *description() -{ - return WEBSITE; -} - -char *version() -{ - return VERSION; } void show_about(GtkWidget *w, void *data) Index: account.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/account.c,v retrieving revision 1.33 retrieving revision 1.34 diff -u -d -r1.33 -r1.34 --- account.c 14 Jun 2003 20:23:20 -0000 1.33 +++ account.c 14 Jun 2003 23:21:00 -0000 1.34 @@ -20,23 +20,13 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - -#include <string.h> -#include <stdio.h> -#include <stdlib.h> -#include <sys/stat.h> -#include <sys/types.h> -#include <glib.h> - +#include "internal.h" #include "account.h" #include "debug.h" #include "prefs.h" #include "prpl.h" +#include "server.h" #include "util.h" -#include "gaim.h" typedef enum { Index: account.h =================================================================== RCS file: /cvsroot/gaim/gaim/src/account.h,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- account.h 7 Jun 2003 00:30:09 -0000 1.11 +++ account.h 14 Jun 2003 23:21:00 -0000 1.12 @@ -29,6 +29,14 @@ #include "proxy.h" #include "prpl.h" +enum +{ + PERMIT_ALL = 1, + PERMIT_NONE, + PERMIT_SOME, + DENY_SOME +}; + struct _GaimAccount { char *username; /**< The username. */ Index: away.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/away.c,v retrieving revision 1.106 retrieving revision 1.107 diff -u -d -r1.106 -r1.107 --- away.c 2 Jun 2003 21:51:00 -0000 1.106 +++ away.c 14 Jun 2003 23:21:00 -0000 1.107 @@ -16,24 +16,25 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * + * */ +#include "internal.h" -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif -#include <string.h> -#include <stdio.h> -#include <stdlib.h> -#include <time.h> +#include "conversation.h" +#include "debug.h" +#include "plugin.h" +#include "prefs.h" +#include "prpl.h" +#include "util.h" -#include <gtk/gtk.h> +/* XXX Until we can get rid of the message queue stuff... */ #include "gaim.h" -#include "prpl.h" -#include "gtkimhtml.h" + #include "gtkblist.h" -#include "plugin.h" -#include "prefs.h" +#include "gtkimhtml.h" +#include "gtkprefs.h" +#include "gtkutils.h" +#include "ui.h" GtkWidget *imaway = NULL; Index: blist.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/blist.c,v retrieving revision 1.29 retrieving revision 1.30 diff -u -d -r1.29 -r1.30 --- blist.c 13 Jun 2003 17:54:59 -0000 1.29 +++ blist.c 14 Jun 2003 23:21:00 -0000 1.30 @@ -19,29 +19,16 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * */ - -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif -#include <string.h> -#include <stdlib.h> -#include <sys/types.h> -#include <sys/stat.h> -#ifndef _WIN32 -#include <unistd.h> -#else -#include <direct.h> -#endif -#include <ctype.h> -#include "gaim.h" -#include "prpl.h" +#include "internal.h" #include "blist.h" +#include "conversation.h" +#include "debug.h" #include "notify.h" #include "prefs.h" - -#ifdef _WIN32 -#include "win32dep.h" -#endif +#include "privacy.h" +#include "prpl.h" +#include "server.h" +#include "util.h" #define PATHSIZE 1024 Index: browser.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/browser.c,v retrieving revision 1.50 retrieving revision 1.51 diff -u -d -r1.50 -r1.51 --- browser.c 30 May 2003 03:25:39 -0000 1.50 +++ browser.c 14 Jun 2003 23:21:00 -0000 1.51 @@ -25,41 +25,18 @@ * their protocol. Nifty. * */ +#include "internal.h" - -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif -#ifdef _WIN32 -#include <gdk/gdkwin32.h> -#else -#include <unistd.h> -#ifndef HOST_NAME_MAX -#define HOST_NAME_MAX 255 -#endif -#include <gdk/gdkx.h> -#endif -#include <stdio.h> -#include <stdlib.h> -#include <string.h> - - - - -#include <gtk/gtk.h> #include <gdk/gdkprivate.h> -#include "gaim.h" + +#include "debug.h" #include "notify.h" #include "prefs.h" +#include "util.h" #ifndef _WIN32 - - - - #include <X11/Xlib.h> #include <X11/Xatom.h> - static const char *progname = "gaim"; static const char *expected_mozilla_version = "1.1"; Index: buddy_chat.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/buddy_chat.c,v retrieving revision 1.201 retrieving revision 1.202 diff -u -d -r1.201 -r1.202 --- buddy_chat.c 3 Jun 2003 19:55:42 -0000 1.201 +++ buddy_chat.c 14 Jun 2003 23:21:00 -0000 1.202 @@ -18,26 +18,20 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * */ +#include "internal.h" -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif -#include <string.h> -#include <sys/time.h> -#include <unistd.h> -#include <ctype.h> -#include <stdio.h> -#include <stdlib.h> -#include <gtk/gtk.h> -#include "gtkimhtml.h" - -#include "prpl.h" -#include "notify.h" -#include "gaim.h" +#include "debug.h" #include "multi.h" +#include "notify.h" +#include "prpl.h" +#include "server.h" + +#include "gtkimhtml.h" +#include "gtkutils.h" +#include "ui.h" #ifdef _WIN32 -#include "wspell.h" +# include "wspell.h" #endif static GList *chatentries = NULL; Index: connection.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/connection.c,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- connection.c 14 Jun 2003 06:06:40 -0000 1.18 +++ connection.c 14 Jun 2003 23:21:00 -0000 1.19 @@ -20,15 +20,25 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ - +#include "internal.h" +#include "blist.h" #include "connection.h" #include "debug.h" -#include "gaim.h" +#include "log.h" +#include "notify.h" +#include "prefs.h" +#include "request.h" +#include "server.h" +#include "sound.h" + +/* XXX UI stuff! */ +#include "ui.h" static GList *connections = NULL; static GList *connections_connecting = NULL; static GaimConnectionUiOps *connection_ui_ops = NULL; + GaimConnection * gaim_connection_new(GaimAccount *account) { @@ -144,6 +154,7 @@ gaim_request_close_with_handle(gc); gaim_notify_close_with_handle(gc); + /* XXX UI stuff! */ update_privacy_connections(); } @@ -153,10 +164,11 @@ if (connections != NULL) return; - destroy_all_dialogs(); + /* XXX destroy_all_dialogs(); */ + gaim_blist_destroy(); - show_login(); + /* XXX show_login(); */ } /* @@ -196,7 +208,7 @@ gaim_blist_show(); gaim_blist_add_account(gc->account); - /* I hate this. -- ChipX86 */ + /* XXX I hate this. UI code. -- ChipX86 */ gaim_setup(gc); /* Index: connection.h =================================================================== RCS file: /cvsroot/gaim/gaim/src/connection.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- connection.h 4 Jun 2003 05:22:05 -0000 1.5 +++ connection.h 14 Jun 2003 23:21:00 -0000 1.6 @@ -31,6 +31,10 @@ #include "account.h" #include "plugin.h" +#define OPT_CONN_HTML 0x00000001 +/* set this flag on a gc if you want serv_got_im to autoreply when away */ +#define OPT_CONN_AUTO_RESP 0x00000002 + typedef enum { GAIM_DISCONNECTED = 0, /**< Disconnected. */ Index: conversation.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/conversation.c,v retrieving revision 1.525 retrieving revision 1.526 diff -u -d -r1.525 -r1.526 --- conversation.c 14 Jun 2003 06:38:30 -0000 1.525 +++ conversation.c 14 Jun 2003 23:21:00 -0000 1.526 @@ -18,26 +18,17 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * */ - -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - -#include <string.h> -#include <stdlib.h> -#include <sys/stat.h> -#include <errno.h> -#include <ctype.h> +#include "internal.h" +#include "blist.h" #include "conversation.h" -#include "gaim.h" -#include "multi.h" -#include "prpl.h" +#include "debug.h" #include "notify.h" #include "prefs.h" +#include "prpl.h" +#include "util.h" -#ifdef _WIN32 -#include "win32dep.h" -#endif +/* XXX */ +#include "ui.h" typedef struct { @@ -148,7 +139,7 @@ im = GAIM_IM(c); - gaim_im_set_typing_state(im, NOT_TYPING); + gaim_im_set_typing_state(im, GAIM_NOT_TYPING); gaim_im_update_typing(im); gaim_im_stop_typing_timeout(im); @@ -169,7 +160,7 @@ gaim_im_set_type_again(GAIM_IM(conv), TRUE); /* XXX Somebody add const stuff! */ - serv_send_typing(gc, (char *)name, TYPED); + serv_send_typing(gc, (char *)name, GAIM_TYPED); gaim_debug(GAIM_DEBUG_MISC, "conversation", "typed...\n"); } @@ -962,7 +953,7 @@ if (gaim_conversation_get_type(conv) == GAIM_CONV_IM) { if (gaim_prefs_get_bool("/core/conversations/im/send_typing")) - serv_send_typing(gc, (char *)name, NOT_TYPING); + serv_send_typing(gc, (char *)name, GAIM_NOT_TYPING); if (gc && prpl_info->convo_closed != NULL) prpl_info->convo_closed(gc, (char *)name); @@ -1483,7 +1474,7 @@ if (gaim_conversation_get_type(conv) == GAIM_CONV_IM) { if ((flags & WFLAG_RECV) == WFLAG_RECV) - gaim_im_set_typing_state(GAIM_IM(conv), NOT_TYPING); + gaim_im_set_typing_state(GAIM_IM(conv), GAIM_NOT_TYPING); } if (gaim_window_get_active_conversation(win) != conv) { Index: conversation.h =================================================================== RCS file: /cvsroot/gaim/gaim/src/conversation.h,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- conversation.h 13 Jun 2003 23:49:26 -0000 1.16 +++ conversation.h 14 Jun 2003 23:21:00 -0000 1.17 @@ -24,8 +24,6 @@ #ifndef _GAIM_CONVERSATION_H_ #define _GAIM_CONVERSATION_H_ -#include "account.h" - /**************************************************************************/ /** Data Structures */ /**************************************************************************/ @@ -33,6 +31,7 @@ typedef enum _GaimConversationType GaimConversationType; typedef enum _GaimUnseenState GaimUnseenState; typedef enum _GaimConvUpdateType GaimConvUpdateType; +typedef enum _GaimTypingState GaimTypingState; typedef struct _GaimWindowUiOps GaimWindowUiOps; typedef struct _GaimWindow GaimWindow; typedef struct _GaimConversationUiOps GaimConversationUiOps; @@ -87,6 +86,21 @@ }; /** + * The typing state of a user. + */ +enum _GaimTypingState +{ + GAIM_NOT_TYPING = 0, /**< Not typing. */ + GAIM_TYPING, /**< Currently typing. */ + GAIM_TYPED /**< Stopped typing momentarily. */ +}; + + +#include "account.h" +#include "server.h" + + +/** * Conversation window operations. * * Any UI representing a window must assign a filled-out gaim_window_ops @@ -161,7 +175,7 @@ { GaimConversation *conv; /**< The parent conversation. */ - int typing_state; /**< The current typing state. */ + GaimTypingState typing_state; /**< The current typing state. */ guint typing_timeout; /**< The typing timer handle. */ time_t type_again; /**< The type again time. */ guint type_again_timeout; /**< The type again timer handle. */ @@ -1156,6 +1170,11 @@ * @return A filled-out GaimWindowUiOps structure. */ GaimWindowUiOps *gaim_get_win_ui_ops(void); + +/** + * Initializes the conversation subsystem. + */ +void gaim_conversation_init(void); /*@}*/ Index: core.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/core.c,v retrieving revision 1.44 retrieving revision 1.45 diff -u -d -r1.44 -r1.45 --- core.c 14 Jun 2003 06:06:40 -0000 1.44 +++ core.c 14 Jun 2003 23:21:00 -0000 1.45 @@ -18,13 +18,8 @@ * */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include <glib.h> -#include <stdio.h> -#include <stdlib.h> -#include <sys/types.h> - +/* + * NOTE - I'd like to see this entire file just go away! -- ChipX86 + */ +/* DONE! */ Index: core.h =================================================================== RCS file: /cvsroot/gaim/gaim/src/core.h,v retrieving revision 1.57 retrieving revision 1.58 diff -u -d -r1.57 -r1.58 --- core.h 14 Jun 2003 07:48:44 -0000 1.57 +++ core.h 14 Jun 2003 23:21:00 -0000 1.58 @@ -24,96 +24,6 @@ #ifndef _CORE_H_ #define _CORE_H_ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - -#include <sys/types.h> -#ifdef HAVE_ICONV -#include <iconv.h> -#endif - -#ifdef HAVE_LANGINFO_CODESET -#include <langinfo.h> -#endif - -#include <stdio.h> -#include <time.h> -#include <glib.h> -#include <gmodule.h> - -struct group; -struct buddy; - - -#include "debug.h" -#include "conversation.h" -#include "ft.h" -#include "privacy.h" -#include "plugin.h" -#include "event.h" -#include "notify.h" -#include "request.h" - -/* XXX Temporary! */ -#define OPT_LOG_BUDDY_SIGNON 0x00000004 -#define OPT_LOG_BUDDY_IDLE 0x00000008 -#define OPT_LOG_BUDDY_AWAY 0x00000010 -#define OPT_LOG_MY_SIGNON 0x00000020 - -/* Really user states are controlled by the PRPLs now. We just use this for event_away */ -#define UC_UNAVAILABLE 1 - -/* This is far too long to be practical, but MSN users are probably used to long aliases */ -#define SELF_ALIAS_LEN 400 - -#if 0 -GaimAccount { - char username[64]; - char alias[SELF_ALIAS_LEN]; - char password[32]; - char user_info[2048]; - int options; - int protocol; - /* prpls can use this to save information about the user, - * like which server to connect to, etc */ - char proto_opt[7][256]; - - /* buddy icon file */ - char iconfile[256]; - - - GaimConnection *gc; - gboolean connecting; - - GSList *permit; - GSList *deny; - int permdeny; -}; -#endif - -/* XXX Temporary, until we have better account-specific prefs. */ -#define GAIM_ACCOUNT_CHECK_MAIL(account) \ - ((account)->options & OPT_ACCT_MAIL_CHECK) - -/* Functions in gaimrc.c */ -extern void load_prefs(); -extern void load_pounces(); -extern void save_prefs(); - -/* Functions in server.c */ -extern void serv_got_update(GaimConnection *, const char *, int, int, time_t, time_t, int); -extern void serv_got_im(GaimConnection *, const char *, const char *, guint32, time_t, gint); -extern void serv_got_typing(GaimConnection *, const char *, int, int); -extern void serv_got_typing_stopped(GaimConnection *, const char *); -extern void serv_got_eviled(GaimConnection *, const char *, int); -extern void serv_got_chat_invite(GaimConnection *, const char *, const char *, const char *, GHashTable *); -extern GaimConversation *serv_got_joined_chat(GaimConnection *, int, const char *); -extern void serv_got_chat_left(GaimConnection *, int); -extern void serv_got_chat_in(GaimConnection *, int, char *, int, char *, time_t); -extern void serv_got_alias(GaimConnection *, const char *, const char *); -extern void serv_finish_login(); - #endif /* _CORE_H_ */ /* Index: dialogs.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/dialogs.c,v retrieving revision 1.481 retrieving revision 1.482 diff -u -d -r1.481 -r1.482 --- dialogs.c 3 Jun 2003 19:55:43 -0000 1.481 +++ dialogs.c 14 Jun 2003 23:21:00 -0000 1.482 @@ -18,46 +18,29 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * */ +#include "internal.h" -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif -#include <string.h> -#include <stdio.h> -#include <stdlib.h> -#include <sys/types.h> -#include <sys/stat.h> -#include <fcntl.h> -#include <ctype.h> - -#ifdef _WIN32 -#include <winsock.h> -#else -#include <sys/socket.h> -#include <time.h> -#include <netdb.h> -#include <netinet/in.h> -#include <unistd.h> -#include <arpa/inet.h> -#endif - -#include <errno.h> -#include <math.h> - -#include <gtk/gtk.h> -#include "gaim.h" -#include "gtkimhtml.h" -#include "prpl.h" -#include "gtkblist.h" +#include "debug.h" +#include "log.h" +#include "multi.h" #include "notify.h" #include "prefs.h" -#include "multi.h" +#include "privacy.h" +#include "prpl.h" +#include "request.h" +#include "util.h" -#ifdef _WIN32 -#include "win32dep.h" -#endif +#include "gtkblist.h" +#include "gtkconv.h" +#include "gtkimhtml.h" +#include "gtkprefs.h" +#include "gtkutils.h" +#include "stock.h" -#define PATHSIZE 1024 +#include "ui.h" + +/* XXX For the soon-to-be-deprecated MultiEntryDlg stuff */ +#include "gaim.h" static GtkWidget *imdialog = NULL; /*I only want ONE of these :) */ static GList *dialogwindows = NULL; Index: ft.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/ft.c,v retrieving revision 1.38 retrieving revision 1.39 diff -u -d -r1.38 -r1.39 --- ft.c 3 Jun 2003 02:00:21 -0000 1.38 +++ ft.c 14 Jun 2003 23:21:00 -0000 1.39 @@ -3,7 +3,7 @@ * * gaim * - * Copyright (C) 2002-2003, Christian Hammond <ch...@gn...> + * Copyright (C) 2003 Christian Hammond <ch...@gn...> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,24 +20,10 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * */ - -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - -#include <sys/stat.h> -#include <unistd.h> -#include <errno.h> -#include <string.h> - -#include <gtk/gtk.h> -#include "gaim.h" -#include "proxy.h" +#include "internal.h" +#include "ft.h" #include "notify.h" - -#ifdef _WIN32 -#include "win32dep.h" -#endif +#include "proxy.h" static struct gaim_xfer_ui_ops *xfer_ui_ops = NULL; Index: ft.h =================================================================== RCS file: /cvsroot/gaim/gaim/src/ft.h,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- ft.h 30 May 2003 09:38:21 -0000 1.14 +++ ft.h 14 Jun 2003 23:21:00 -0000 1.15 @@ -28,6 +28,8 @@ /**************************************************************************/ struct gaim_xfer; +#include "account.h" + /** * Types of file transfers. */ Index: gaim-remote.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/gaim-remote.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- gaim-remote.c 14 Jun 2003 06:06:40 -0000 1.9 +++ gaim-remote.c 14 Jun 2003 23:21:00 -0000 1.10 @@ -21,10 +21,9 @@ * */ -#include "gaim.h" +#include "internal.h" + #include <getopt.h> -#include <unistd.h> -#include <string.h> #include <locale.h> #include <gaim-remote/remote.h> Index: gaim.h =================================================================== RCS file: /cvsroot/gaim/gaim/src/gaim.h,v retrieving revision 1.401 retrieving revision 1.402 diff -u -d -r1.401 -r1.402 --- gaim.h 12 Jun 2003 22:19:00 -0000 1.401 +++ gaim.h 14 Jun 2003 23:21:00 -0000 1.402 @@ -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 "<AUTO-REPLY> : " - -#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 */ Index: gaimrc.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/gaimrc.c,v retrieving revision 1.202 retrieving revision 1.203 diff -u -d -r1.202 -r1.203 --- gaimrc.c 14 Jun 2003 15:25:02 -0000 1.202 +++ gaimrc.c 14 Jun 2003 23:21:00 -0000 1.203 @@ -18,36 +18,24 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * */ +#include "internal.h" -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif -#include <string.h> - -#ifndef _WIN32 -#include <sys/time.h> -#include <unistd.h> -#endif - -#include <sys/types.h> -#include <sys/stat.h> - -#include <ctype.h> -#include <stdio.h> -#include <stdlib.h> -#include "gaim.h" -#include "prpl.h" +#include "account.h" +#include "debug.h" +#include "log.h" +#include "notify.h" +#include "pounce.h" #include "prefs.h" #include "proxy.h" +#include "prpl.h" #include "sound.h" -#include "gtksound.h" -#include "pounce.h" -#include "gtkpounce.h" -#include "notify.h" +#include "ui.h" +#include "util.h" -#ifdef _WIN32 -#include "win32dep.h" -#endif +#include "gaim.h" + +#include "gtkpounce.h" +#include "gtksound.h" /* for people like myself, who are too lazy to add an away msg :) */ #define BORING_DEFAULT_AWAY_MSG _("sorry, i ran out for a while. bbl") Index: gtkaccount.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/gtkaccount.c,v retrieving revision 1.66 retrieving revision 1.67 diff -u -d -r1.66 -r1.67 --- gtkaccount.c 14 Jun 2003 20:23:20 -0000 1.66 +++ gtkaccount.c 14 Jun 2003 23:21:00 -0000 1.67 @@ -20,32 +20,27 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include "internal.h" -#include <sys/types.h> -#include <sys/stat.h> -#include <unistd.h> - -#include <gtk/gtk.h> - -#include "gtkaccount.h" #include "account.h" #include "accountopt.h" +#include "debug.h" #include "event.h" -#include "prefs.h" #include "plugin.h" -#include "stock.h" -#include "gtkblist.h" +#include "prefs.h" +#include "request.h" +#include "util.h" + #include "gaim-disclosure.h" -#include "gaim.h" +#include "gtkaccount.h" +#include "gtkblist.h" +#include "gtkutils.h" +#include "stock.h" -#ifdef _WIN32 -# include <gdk/gdkwin32.h> -#else -# include <unistd.h> -# include <gdk/gdkx.h> -#endif +#include "ui.h" -#include <string.h> +/* XXX for do_quit() */ +#include "gaim.h" enum { Index: gtkblist.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/gtkblist.c,v retrieving revision 1.53 retrieving revision 1.54 diff -u -d -r1.53 -r1.54 --- gtkblist.c 11 Jun 2003 17:25:22 -0000 1.53 +++ gtkblist.c 14 Jun 2003 23:21:00 -0000 1.54 @@ -18,48 +18,31 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * */ +#include "internal.h" -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif -#ifdef GAIM_PLUGINS -#ifndef _WIN32 -#include <dlfcn.h> -#endif -#endif /* GAIM_PLUGINS */ -#include <string.h> -#include <stdio.h> -#include <stdlib.h> -#include <ctype.h> -#include <sys/types.h> -#include <sys/stat.h> -#include <unistd.h> -#include <math.h> -#include <time.h> - -#ifdef _WIN32 -#include <gdk/gdkwin32.h> -#else -#include <unistd.h> -#include <gdk/gdkx.h> -#endif - -#include <gdk/gdkkeysyms.h> -#include <gtk/gtk.h> +#include "debug.h" +#include "multi.h" #include "prpl.h" +#include "prefs.h" #include "sound.h" -#include "gaim.h" +#include "stock.h" +#include "util.h" + #include "gtkaccount.h" #include "gtkblist.h" +#include "gtkconv.h" #include "gtkdebug.h" #include "gtkft.h" #include "gtkpounce.h" -#include "prefs.h" -#include "multi.h" +#include "gtkprefs.h" +#include "gtkutils.h" -#ifdef _WIN32 -#include "win32dep.h" -#endif +#include "ui.h" + +#include "gaim.h" + +#include <gdk/gdkkeysyms.h> +#include <gtk/gtk.h> GSList *gaim_gtk_blist_sort_methods = NULL; static struct gaim_gtk_blist_sort_method *current_sort_method = NULL; Index: gtkblist.h =================================================================== RCS file: /cvsroot/gaim/gaim/src/gtkblist.h,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- gtkblist.h 1 Jun 2003 06:02:02 -0000 1.8 +++ gtkblist.h 14 Jun 2003 23:21:00 -0000 1.9 @@ -24,6 +24,8 @@ #ifndef _GAIM_GTK_LIST_H_ #define _GAIM_GTK_LIST_H_ +#include "blist.h" + enum { STATUS_ICON_COLUMN, STATUS_ICON_VISIBLE_COLUMN, Index: gtkconn.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/gtkconn.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- gtkconn.c 4 Jun 2003 16:18:14 -0000 1.2 +++ gtkconn.c 14 Jun 2003 23:21:00 -0000 1.3 @@ -18,17 +18,17 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * */ - -#include <string.h> -#include <gtk/gtk.h> +#include "internal.h" #include "account.h" +#include "debug.h" +#include "notify.h" +#include "util.h" + #include "gtkblist.h" -#include "gaim.h" +#include "gtkutils.h" -#ifdef _WIN32 -#include "win32dep.h" -#endif +#include "ui.h" struct signon_meter { GaimAccount *account; @@ -281,7 +281,7 @@ return; } - +#if 0 struct kick_dlg { GaimAccount *account; GtkWidget *dlg; @@ -372,4 +372,4 @@ gaim_account_get_username(account)); hide_login_progress_common(gc, why, _("Connection Error"), buf); } - +#endif Index: gtkconv.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/gtkconv.c,v retrieving revision 1.139 retrieving revision 1.140 diff -u -d -r1.139 -r1.140 --- gtkconv.c 14 Jun 2003 06:38:30 -0000 1.139 +++ gtkconv.c 14 Jun 2003 23:21:00 -0000 1.140 @@ -1,7 +1,8 @@ -/* - * gaim +/** + * @file gtkconv.h GTK+ Conversation API + * @ingroup gtkui * - * Copyright (C) 2002-2003, Christian Hammond <ch...@gn...> + * Copyright (C) 2002-2003 Christian Hammond <ch...@gn...> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -18,45 +19,45 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif -#include <string.h> +#include "internal.h" + #ifndef _WIN32 -#include <sys/time.h> -#include <unistd.h> -#include <gdk/gdkx.h> -#include <X11/Xlib.h> -#endif /*_WIN32*/ -#include <sys/types.h> -#include <sys/stat.h> -#include <stdio.h> -#include <stdlib.h> -#include <errno.h> -#include <ctype.h> -#include <gtk/gtk.h> +# include <X11/Xlib.h> +#endif + #ifdef USE_GTKSPELL -#include <gtkspell/gtkspell.h> +# include <gtkspell/gtkspell.h> #endif + #include <gdk/gdkkeysyms.h> + +#include "debug.h" +#include "log.h" +#include "multi.h" +#include "notify.h" +#include "prefs.h" #include "prpl.h" -#include "gtkimhtml.h" -#include "dnd-hints.h" #include "sound.h" +#include "util.h" + +#include "dnd-hints.h" #include "gtkblist.h" -#include "notify.h" -#include "prefs.h" #include "gtkconv.h" -#include "gaim.h" +#include "gtkimhtml.h" +#include "gtkutils.h" +#include "stock.h" + #include "ui.h" -#include "debug.h" -#include "multi.h" + +/* XXX */ +#include "gaim.h" #ifdef _WIN32 -#include "win32dep.h" -#include "wspell.h" +# include "wspell.h" #endif +#define AUTO_RESPONSE "<AUTO-REPLY> : " + static char nick_colors[][8] = { "#ba55d3", /* Medium Orchid */ "#ee82ee", /* Violet */ @@ -1325,7 +1326,7 @@ /* XXX The (char *) should go away! Somebody add consts to stuff! */ serv_send_typing(gaim_conversation_get_gc(conv), (char *)gaim_conversation_get_name(conv), - NOT_TYPING); + GAIM_NOT_TYPING); } else { /* We're deleting, but not all of it, so it counts as typing. */ @@ -1936,7 +1937,7 @@ /* * We know we got something, so we at least have to make sure we don't - * send TYPED any time soon. + * send GAIM_TYPED any time soon. */ im = GAIM_IM(conv); @@ -1951,7 +1952,7 @@ int timeout = serv_send_typing(gaim_conversation_get_gc(conv), (char *)gaim_conversation_get_name(conv), - TYPING); + GAIM_TYPING); if (timeout) gaim_im_set_type_again(im, time(NULL) + timeout); @@ -1976,7 +1977,7 @@ gtk_widget_destroy(gtkwin->menu.typing_icon); gtkwin->menu.typing_icon = NULL; } - if(im && gaim_im_get_typing_state(im) == TYPING) { + if(im && gaim_im_get_typing_state(im) == GAIM_TYPING) { gtkwin->menu.typing_icon = gtk_image_menu_item_new(); gtk_image_menu_item_set_image( GTK_IMAGE_MENU_ITEM(gtkwin->menu.typing_icon), @@ -1984,7 +1985,7 @@ GTK_ICON_SIZE_MENU)); gtk_tooltips_set_tip(gtkconv->tooltips, gtkwin->menu.typing_icon, _("User is typing..."), NULL); - } else if(im && gaim_im_get_typing_state(im) == TYPED) { + } else if(im && gaim_im_get_typing_state(im) == GAIM_TYPED) { gtkwin->menu.typing_icon = gtk_image_menu_item_new(); gtk_image_menu_item_set_image( GTK_IMAGE_MENU_ITEM(gtkwin->menu.typing_icon), @@ -4456,13 +4457,13 @@ style->font_desc = pango_font_description_copy( gtk_widget_get_style(gtkconv->tab_label)->font_desc); - if (im != NULL && gaim_im_get_typing_state(im) == TYPING) { + if (im != NULL && gaim_im_get_typing_state(im) == GAIM_TYPING) { style->fg[GTK_STATE_NORMAL].red = 0x4646; style->fg[GTK_STATE_NORMAL].green = 0xA0A0; style->fg[GTK_STATE_NORMAL].blue = 0x4646; style->fg[GTK_STATE_ACTIVE] = style->fg[GTK_STATE_NORMAL]; } - else if (im != NULL && gaim_im_get_typing_state(im) == TYPED) { + else if (im != NULL && gaim_im_get_typing_state(im) == GAIM_TYPED) { style->fg[GTK_STATE_NORMAL].red = 0xD1D1; style->fg[GTK_STATE_NORMAL].green = 0x9494; style->fg[GTK_STATE_NORMAL].blue = 0x0C0C; Index: gtkconv.h =================================================================== RCS file: /cvsroot/gaim/gaim/src/gtkconv.h,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- gtkconv.h 2 Jun 2003 21:51:04 -0000 1.17 +++ gtkconv.h 14 Jun 2003 23:21:00 -0000 1.18 @@ -4,7 +4,7 @@ * * gaim * - * Copyright (C) 2002-2003, Christian Hammond <ch...@gn...> + * Copyright (C) 2002-2003 Christian Hammond <ch...@gn...> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Index: gtkdebug.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/gtkdebug.c,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- gtkdebug.c 9 Jun 2003 02:04:05 -0000 1.19 +++ gtkdebug.c 14 Jun 2003 23:21:00 -0000 1.20 @@ -4,7 +4,7 @@ * * gaim * - * Copyright (C) 2002-2003, Christian Hammond <ch...@gn...> + * Copyright (C) 2003 Christian Hammond <ch...@gn...> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,11 +20,17 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include "internal.h" + +#include "prefs.h" +#include "util.h" + #include "gtkdebug.h" -#include "gaim.h" #include "gtkimhtml.h" -#include "prefs.h" -#include <gtk/gtk.h> + +#include "ui.h" + +extern int opt_debug; typedef struct { Index: gtkdebug.h =================================================================== RCS file: /cvsroot/gaim/gaim/src/gtkdebug.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- gtkdebug.h 1 Jun 2003 03:21:55 -0000 1.3 +++ gtkdebug.h 14 Jun 2003 23:21:00 -0000 1.4 @@ -4,7 +4,7 @@ * * gaim * - * Copyright (C) 2002-2003, Christian Hammond <ch...@gn...> + * Copyright (C) 2003 Christian Hammond <ch...@gn...> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Index: gtkft.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/gtkft.c,v retrieving revision 1.29 retrieving revision 1.30 diff -u -d -r1.29 -r1.30 --- gtkft.c 10 Jun 2003 01:09:26 -0000 1.29 +++ gtkft.c 14 Jun 2003 23:21:00 -0000 1.30 @@ -1,9 +1,10 @@ /** - * @file gtkft.c The GTK+ file transfer UI + * @file gtkft.c GTK+ file transfer UI + * @ingroup gtkui * * gaim * - * Copyright (C) 2003, Christian Hammond <ch...@gn...> + * Copyright (C) 2003 Christian Hammond <ch...@gn...> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -18,18 +19,20 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * */ -#include "gaim.h" -#include "prpl.h" -#include <sys/types.h> -#include <sys/stat.h> -#include <unistd.h> -#include <string.h> -#include "gtkcellrendererprogress.h" -#include "gaim-disclosure.h" +#include "internal.h" + +#include "debug.h" #include "notify.h" +#include "ft.h" +#include "prpl.h" #include "request.h" +#include "util.h" + +#include "gaim-disclosure.h" +#include "gtkcellrendererprogress.h" +#include "gtkft.h" +#include "stock.h" #define GAIM_GTKXFER(xfer) \ (struct gaim_gtkxfer_ui_data *)(xfer)->ui_data Index: gtkft.h =================================================================== RCS file: /cvsroot/gaim/gaim/src/gtkft.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- gtkft.h 27 May 2003 03:38:51 -0000 1.5 +++ gtkft.h 14 Jun 2003 23:21:00 -0000 1.6 @@ -4,7 +4,7 @@ * * gaim * - * Copyright (C) 2003, Christian Hammond <ch...@gn...> + * Copyright (C) 2003 Christian Hammond <ch...@gn...> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Index: gtknotify.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/gtknotify.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- gtknotify.c 7 Jun 2003 07:57:24 -0000 1.9 +++ gtknotify.c 14 Jun 2003 23:21:00 -0000 1.10 @@ -20,12 +20,15 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "gtknotify.h" +#include "internal.h" + +#include "debug.h" +#include "connection.h" #include "stock.h" -#include <gtk/gtk.h> -/* XXX For ngettext :/ */ -#include "gaim.h" +#include "gtknotify.h" + +#include "ui.h" typedef struct { Index: gtkpounce.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/gtkpounce.c,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- gtkpounce.c 14 Jun 2003 11:55:15 -0000 1.20 +++ gtkpounce.c 14 Jun 2003 23:21:00 -0000 1.21 @@ -1,5 +1,6 @@ /** * @file gtkpounce.c GTK+ Buddy Pounce API + * @ingroup gtkui * * gaim * @@ -20,14 +21,20 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * */ -#include <unistd.h> -#include <string.h> -#include "gaim.h" -#include "gtkpounce.h" -#include "gtkblist.h" +#include "internal.h" + +#include "conversation.h" +#include "debug.h" +#include "notify.h" #include "prpl.h" +#include "server.h" #include "sound.h" -#include "notify.h" + +#include "gtkblist.h" +#include "gtkpounce.h" +#include "gtkutils.h" + +#include "ui.h" typedef struct { Index: gtkprefs.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/gtkprefs.c,v retrieving revision 1.41 retrieving revision 1.42 diff -u -d -r1.41 -r1.42 --- gtkprefs.c 14 Jun 2003 20:23:20 -0000 1.41 +++ gtkprefs.c 14 Jun 2003 23:21:00 -0000 1.42 @@ -21,38 +21,30 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * */ +#include "internal.h" -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif -#include <string.h> -#include <sys/time.h> - -#include <sys/types.h> -#include <sys/stat.h> +#include "debug.h" +#include "notify.h" +#include "prefs.h" +#include "proxy.h" +#include "prpl.h" +#include "sound.h" +#include "util.h" -#include <unistd.h> -#include <stdio.h> -#include <stdlib.h> -#include <stdarg.h> -#include <ctype.h> -#include <gtk/gtk.h> -#include "gtkimhtml.h" -#include "gaim.h" #include "gtkblist.h" +#include "gtkconv.h" #include "gtkdebug.h" +#include "gtkimhtml.h" #include "gtkplugin.h" #include "gtkprefs.h" -#include "prpl.h" -#include "prefs.h" -#include "proxy.h" -#include "sound.h" #include "gtksound.h" -#include "notify.h" +#include "gtkutils.h" +#include "stock.h" -#ifdef _WIN32 -#include "win32dep.h" -#endif +#include "ui.h" + +/* XXX for grab_url */ +#include "gaim.h" #define PROXYHOST 0 #define PROXYPORT 1 Index: gtkrequest.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/gtkrequest.c,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- gtkrequest.c 13 Jun 2003 08:30:01 -0000 1.17 +++ gtkrequest.c 14 Jun 2003 23:21:00 -0000 1.18 @@ -20,13 +20,13 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include "internal.h" + +#include "debug.h" + #include "gtkrequest.h" +#include "gtkutils.h" #include "stock.h" -#include <gtk/gtk.h> -#include <string.h> - -/* XXX For _(..) */ -#include "gaim.h" typedef struct { Index: gtksound.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/gtksound.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- gtksound.c 7 Jun 2003 07:57:24 -0000 1.2 +++ gtksound.c 14 Jun 2003 23:21:00 -0000 1.3 @@ -19,44 +19,29 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * */ +#include "internal.h" -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - -#ifdef HAVE_ENDIAN_H -#include <endian.h> -#endif - -#include <stdio.h> -#include <string.h> -#include <glib.h> - -#ifndef _WIN32 -#include <unistd.h> -#else +#ifdef _WIN32 #include <windows.h> #include <mmsystem.h> #endif #ifdef USE_AO -#include <ao/ao.h> -#include <audiofile.h> +# include <ao/ao.h> +# include <audiofile.h> #endif /* USE_AO */ #ifdef USE_NAS_AUDIO -#include <audio/audiolib.h> -#include <audio/soundlib.h> +# include <audio/audiolib.h> +# include <audio/soundlib.h> #endif /* USE_NAS_AUDIO */ -#include "gaim.h" /* for gettext stuff */ -#include "sound.h" -#include "gtksound.h" +#include "debug.h" +#include "notify.h" #include "prefs.h" +#include "sound.h" -#ifdef _WIN32 -#include "win32dep.h" -#endif +#include "gtksound.h" struct gaim_sound_event { Index: gtkutils.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/gtkutils.c,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- gtkutils.c 7 Jun 2003 07:57:24 -0000 1.22 +++ gtkutils.c 14 Jun 2003 23:21:00 -0000 1.23 @@ -1,7 +1,10 @@ -/* +/** + * @file gtkutils.h GTK+ utility functions + * @ingroup gtkui + * * gaim * - * Copyright (C) 2002-2003, Christian Hammond <ch...@gn...> + * Copyright (C) 2003 Christian Hammond <ch...@gn...> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,43 +19,36 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif -#include <string.h> +#include "internal.h" + #ifndef _WIN32 -#include <sys/time.h> -#include <unistd.h> -#include <gdk/gdkx.h> -#include <X11/Xlib.h> +# include <X11/Xlib.h> #else -#ifdef small -#undef small -#endif +# ifdef small +# undef small +# endif #endif /*_WIN32*/ -#include <sys/types.h> -#include <sys/stat.h> -#include <stdio.h> -#include <stdlib.h> -#include <errno.h> -#include <ctype.h> -#include <gtk/gtk.h> + #ifdef USE_GTKSPELL -#include <gtkspell/gtkspell.h> +# include <gtkspell/gtkspell.h> #endif -#include "gtkimhtml.h" + #include <gdk/gdkkeysyms.h> + +#include "debug.h" +#include "notify.h" #include "prefs.h" #include "prpl.h" -#include "gaim.h" +#include "util.h" + +#include "gtkconv.h" +#include "gtkimhtml.h" +#include "gtkutils.h" #include "ui.h" -#include "notify.h" #ifdef _WIN32 #include "wspell.h" -#include "win32dep.h" #endif void Index: gtkutils.h =================================================================== RCS file: /cvsroot/gaim/gaim/src/gtkutils.h,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- gtkutils.h 2 Jun 2003 21:51:04 -0000 1.8 +++ gtkutils.h 14 Jun 2003 23:21:00 -0000 1.9 @@ -4,7 +4,7 @@ * * gaim * - * Copyright (C) 2002-2003, Christian Hammond <ch...@gn...> + * Copyright (C) 2003 Christian Hammond <ch...@gn...> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,12 +20,11 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ - #ifndef _GAIM_GTK_UTILS_H_ #define _GAIM_GTK_UTILS_H_ -#include "gaim.h" -#include "conversation.h" +#include <gtk/gtk.h> +#include "gtkconv.h" #include "prpl.h" /** Index: html.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/html.c,v retrieving revision 1.49 retrieving revision 1.50 diff -u -d -r1.49 -r1.50 --- html.c 3 Jun 2003 02:00:25 -0000 1.49 +++ html.c 14 Jun 2003 23:21:00 -0000 1.50 @@ -19,31 +19,12 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * */ +#include "internal.h" -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif -#include <string.h> -#include <stdio.h> -#include <stdlib.h> - -#ifndef _WIN32 -#include <sys/time.h> -#include <unistd.h> -#include <sys/socket.h> -#include <netdb.h> -#include <netinet/in.h> -#endif - -#include <sys/types.h> -#include <fcntl.h> -#include <errno.h> -#include "gaim.h" +#include "debug.... [truncated message content] |