# HG changeset patch # User Mark Doliner # Date 1091943482 0 # Node ID db62420a53a2ff220b79d3daf5914617efd23e72 # Parent 34a929fbbb307f9c9561e9d4e946f85dd4c8abf2 [gaim-migrate @ 10574] Remove multi.h committer: Tailor Script diff -r 34a929fbbb30 -r db62420a53a2 HACKING --- a/HACKING Sun Aug 08 03:39:26 2004 +0000 +++ b/HACKING Sun Aug 08 05:38:02 2004 +0000 @@ -221,13 +221,6 @@ setting up plugin event handlers, and contains the plugin_event method that gaim calls on events. -multi.c: - This is the file that tries to take care of most of the major issues - with multiple connections. The best function in here by far is the - account_editor(). auto_login() is also in here (I'm just reading multi.h - now...). account_editor is really the only function that the UI needs - to be concerned with. - prefs.c: Read the documentation on this file. This handles the backend side of prefs. diff -r 34a929fbbb30 -r db62420a53a2 src/Makefile.am --- a/src/Makefile.am Sun Aug 08 03:39:26 2004 +0000 +++ b/src/Makefile.am Sun Aug 08 05:38:02 2004 +0000 @@ -111,7 +111,6 @@ imgstore.h \ log.h \ md5.h \ - multi.h \ network.h \ notify.h \ plugin.h \ diff -r 34a929fbbb30 -r db62420a53a2 src/account.h --- a/src/account.h Sun Aug 08 03:39:26 2004 +0000 +++ b/src/account.h Sun Aug 08 05:38:02 2004 +0000 @@ -24,8 +24,8 @@ * * @see @ref account-signals */ -#ifndef _GAIM_ACCOUNTS_H_ -#define _GAIM_ACCOUNTS_H_ +#ifndef _GAIM_ACCOUNT_H_ +#define _GAIM_ACCOUNT_H_ #include @@ -664,4 +664,4 @@ } #endif -#endif /* _GAIM_ACCOUNTS_H_ */ +#endif /* _GAIM_ACCOUNT_H_ */ diff -r 34a929fbbb30 -r db62420a53a2 src/accountopt.h --- a/src/accountopt.h Sun Aug 08 03:39:26 2004 +0000 +++ b/src/accountopt.h Sun Aug 08 05:38:02 2004 +0000 @@ -22,8 +22,8 @@ * 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_ACCOUNT_OPT_H_ -#define _GAIM_ACCOUNT_OPT_H_ +#ifndef _GAIM_ACCOUNTOPT_H_ +#define _GAIM_ACCOUNTOPT_H_ #include "prefs.h" @@ -328,4 +328,4 @@ } #endif -#endif /* _GAIM_ACCOUNT_OPT_H_ */ +#endif /* _GAIM_ACCOUNTOPT_H_ */ diff -r 34a929fbbb30 -r db62420a53a2 src/away.h --- a/src/away.h Sun Aug 08 03:39:26 2004 +0000 +++ b/src/away.h Sun Aug 08 05:38:02 2004 +0000 @@ -1,3 +1,27 @@ +/** + * @file away.h Away API + * @ingroup core + * + * gaim + * + * Gaim is the legal property of its developers, whose names are too numerous + * to list here. Please refer to the COPYRIGHT file distributed with this + * source distribution. + * + * 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_AWAY_H_ #define _GAIM_AWAY_H_ diff -r 34a929fbbb30 -r db62420a53a2 src/blist.c --- a/src/blist.c Sun Aug 08 03:39:26 2004 +0000 +++ b/src/blist.c Sun Aug 08 05:38:02 2004 +0000 @@ -24,7 +24,6 @@ #include "blist.h" #include "conversation.h" #include "debug.h" -#include "multi.h" #include "notify.h" #include "prefs.h" #include "privacy.h" diff -r 34a929fbbb30 -r db62420a53a2 src/blist.h --- a/src/blist.h Sun Aug 08 03:39:26 2004 +0000 +++ b/src/blist.h Sun Aug 08 05:38:02 2004 +0000 @@ -22,12 +22,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_BLIST_H_ +#define _GAIM_BLIST_H_ /* I can't believe I let ChipX86 inspire me to write good code. -Sean */ -#ifndef _BLIST_H_ -#define _BLIST_H_ - #include typedef struct _GaimBuddyList GaimBuddyList; @@ -878,4 +877,4 @@ } #endif -#endif /* _BLIST_H_ */ +#endif /* _GAIM_BLIST_H_ */ diff -r 34a929fbbb30 -r db62420a53a2 src/buddyicon.h --- a/src/buddyicon.h Sun Aug 08 03:39:26 2004 +0000 +++ b/src/buddyicon.h Sun Aug 08 05:38:02 2004 +0000 @@ -22,8 +22,8 @@ * 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_ICON_H_ -#define _GAIM_ICON_H_ +#ifndef _GAIM_BUDDYICON_H_ +#define _GAIM_BUDDYICON_H_ typedef struct _GaimBuddyIcon GaimBuddyIcon; @@ -239,4 +239,4 @@ /*@}*/ -#endif /* _GAIM_ICON_H_ */ +#endif /* _GAIM_BUDDYICON_H_ */ diff -r 34a929fbbb30 -r db62420a53a2 src/cmds.h --- a/src/cmds.h Sun Aug 08 03:39:26 2004 +0000 +++ b/src/cmds.h Sun Aug 08 05:38:02 2004 +0000 @@ -19,7 +19,6 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * */ - #ifndef _GAIM_CMDS_H_ #define _GAIM_CMDS_H_ diff -r 34a929fbbb30 -r db62420a53a2 src/gaim-disclosure.h --- a/src/gaim-disclosure.h Sun Aug 08 03:39:26 2004 +0000 +++ b/src/gaim-disclosure.h Sun Aug 08 05:38:02 2004 +0000 @@ -19,9 +19,8 @@ * Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA. * */ - -#ifndef __GAIM_DISCLOSURE_H__ -#define __GAIM_DISCLOSURE_H__ +#ifndef __GAIM_GAIM_DISCLOSURE_H__ +#define __GAIM_GAIM_DISCLOSURE_H__ #include "eventloop.h" diff -r 34a929fbbb30 -r db62420a53a2 src/gaim-socket.h --- a/src/gaim-socket.h Sun Aug 08 03:39:26 2004 +0000 +++ b/src/gaim-socket.h Sun Aug 08 05:38:02 2004 +0000 @@ -20,9 +20,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * */ - -#ifndef _GAIM_SOCKET_H_ -#define _GAIM_SOCKET_H_ +#ifndef _GAIM_GAIM_SOCKET_H_ +#define _GAIM_GAIM_SOCKET_H_ struct gaim_cui_packet { guchar type; @@ -43,4 +42,4 @@ void cui_packet_append_raw(struct gaim_cui_packet *p, char *str, int len); -#endif /* _GAIM_SOCKET_H_ */ +#endif /* _GAIM_GAIM_SOCKET_H_ */ diff -r 34a929fbbb30 -r db62420a53a2 src/gaim.h --- a/src/gaim.h Sun Aug 08 03:39:26 2004 +0000 +++ b/src/gaim.h Sun Aug 08 05:38:02 2004 +0000 @@ -20,7 +20,6 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * */ - #ifndef _GAIM_H_ #define _GAIM_H_ @@ -37,12 +36,6 @@ extern GSList *unread_message_queue; extern GSList *away_time_queue; -/* Functions in dialogs.c */ -extern void show_confirm_del(GaimBuddy *); -extern void show_confirm_del_group(GaimGroup *); -extern void show_confirm_del_blist_chat(GaimChat *); -extern void show_confirm_del_contact(GaimContact *); - /* Functions in idle.c */ extern gint check_idle(gpointer); diff -r 34a929fbbb30 -r db62420a53a2 src/getopt.h --- a/src/getopt.h Sun Aug 08 03:39:26 2004 +0000 +++ b/src/getopt.h Sun Aug 08 05:38:02 2004 +0000 @@ -18,8 +18,8 @@ along with this program; if not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ -#ifndef _GETOPT_H -#define _GETOPT_H 1 +#ifndef _GAIM_GETOPT_H_ +#define _GAIM_GETOPT_H_ #ifdef __cplusplus extern "C" { @@ -129,4 +129,4 @@ } #endif -#endif /* _GETOPT_H */ +#endif /* _GAIM_GETOPT_H_ */ diff -r 34a929fbbb30 -r db62420a53a2 src/gtkaccount.h --- a/src/gtkaccount.h Sun Aug 08 03:39:26 2004 +0000 +++ b/src/gtkaccount.h Sun Aug 08 05:38:02 2004 +0000 @@ -22,8 +22,8 @@ * 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_ACCOUNT_H_ -#define _GAIM_GTK_ACCOUNT_H_ +#ifndef _GAIM_GTKACCOUNT_H_ +#define _GAIM_GTKACCOUNT_H_ #include "account.h" @@ -78,4 +78,4 @@ */ void gaim_gtk_account_uninit(void); -#endif /* _GAIM_GTK_ACCOUNT_H_ */ +#endif /* _GAIM_GTKACCOUNT_H_ */ diff -r 34a929fbbb30 -r db62420a53a2 src/gtkblist.c --- a/src/gtkblist.c Sun Aug 08 03:39:26 2004 +0000 +++ b/src/gtkblist.c Sun Aug 08 05:38:02 2004 +0000 @@ -26,7 +26,6 @@ #include "connection.h" #include "core.h" #include "debug.h" -#include "multi.h" #include "notify.h" #include "prpl.h" #include "prefs.h" diff -r 34a929fbbb30 -r db62420a53a2 src/gtkblist.h --- a/src/gtkblist.h Sun Aug 08 03:39:26 2004 +0000 +++ b/src/gtkblist.h Sun Aug 08 05:38:02 2004 +0000 @@ -22,9 +22,8 @@ * 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_LIST_H_ -#define _GAIM_GTK_LIST_H_ +#ifndef _GAIM_GTKBLIST_H_ +#define _GAIM_GTKBLIST_H_ #include "blist.h" @@ -236,4 +235,4 @@ */ void gaim_gtk_append_blist_node_extended_menu(GtkWidget *menu, GaimBlistNode *node); -#endif /* _GAIM_GTK_LIST_H_ */ +#endif /* _GAIM_GTKBLIST_H_ */ diff -r 34a929fbbb30 -r db62420a53a2 src/gtkcellrendererprogress.h --- a/src/gtkcellrendererprogress.h Sun Aug 08 03:39:26 2004 +0000 +++ b/src/gtkcellrendererprogress.h Sun Aug 08 05:38:02 2004 +0000 @@ -18,9 +18,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * */ - -#ifndef __GTK_CELL_RENDERER_PROGRESS_H__ -#define __GTK_CELL_RENDERER_PROGRESS_H__ +#ifndef _GAIM_GTKCELLRENDERERPROGRESS_H_ +#define _GAIM_GTKCELLRENDERERPROGRESS_H_ #include @@ -59,4 +58,4 @@ } #endif /* __cplusplus */ -#endif /* __GTK_CELL_RENDERER_PROGRESS_H__ */ +#endif /* _GAIM_GTKCELLRENDERERPROGRESS_H_ */ diff -r 34a929fbbb30 -r db62420a53a2 src/gtkconn.h --- a/src/gtkconn.h Sun Aug 08 03:39:26 2004 +0000 +++ b/src/gtkconn.h Sun Aug 08 05:38:02 2004 +0000 @@ -21,7 +21,6 @@ * 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_GTKCONN_H_ #define _GAIM_GTKCONN_H_ diff -r 34a929fbbb30 -r db62420a53a2 src/gtkconv.h --- a/src/gtkconv.h Sun Aug 08 03:39:26 2004 +0000 +++ b/src/gtkconv.h Sun Aug 08 05:38:02 2004 +0000 @@ -22,9 +22,8 @@ * 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_CONVERSATION_H_ -#define _GAIM_GTK_CONVERSATION_H_ +#ifndef _GAIM_GTKCONVERSATION_H_ +#define _GAIM_GTKCONVERSATION_H_ #include "conversation.h" @@ -316,4 +315,4 @@ /*@}*/ -#endif /* _GAIM_GTK_CONVERSATION_H_ */ +#endif /* _GAIM_GTKCONVERSATION_H_ */ diff -r 34a929fbbb30 -r db62420a53a2 src/gtkdebug.h --- a/src/gtkdebug.h Sun Aug 08 03:39:26 2004 +0000 +++ b/src/gtkdebug.h Sun Aug 08 05:38:02 2004 +0000 @@ -22,8 +22,8 @@ * 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_DEBUG_H_ -#define _GAIM_GTK_DEBUG_H_ +#ifndef _GAIM_GTKDEBUG_H_ +#define _GAIM_GTKDEBUG_H_ #include "debug.h" @@ -49,4 +49,4 @@ */ GaimDebugUiOps *gaim_gtk_debug_get_ui_ops(void); -#endif /* _GAIM_GTK_DEBUG_H_ */ +#endif /* _GAIM_GTKDEBUG_H_ */ diff -r 34a929fbbb30 -r db62420a53a2 src/gtkdialogs.h --- a/src/gtkdialogs.h Sun Aug 08 03:39:26 2004 +0000 +++ b/src/gtkdialogs.h Sun Aug 08 05:38:02 2004 +0000 @@ -22,15 +22,30 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ - -#ifndef _GTKDIALOGS_H_ -#define _GTKDIALOGS_H_ +#ifndef _GAIM_GTKDIALOGS_H_ +#define _GAIM_GTKDIALOGS_H_ #include "account.h" #include "conversation.h" #include "gtkinternal.h" +/* Functions in gtkdialogs.c (these should actually stay in this file) */ +void alias_dialog_bud(GaimBuddy *); +void alias_dialog_contact(GaimContact *); +void alias_dialog_blist_chat(GaimChat *); +void show_warn_dialog(GaimConnection *, const char *); +void gaim_gtkdialogs_new_im(GaimAccount *, const char *); +void show_im_dialog(); +void show_info_dialog(); +void show_log_dialog(); +void destroy_all_dialogs(); +void create_away_mess(GtkWidget *, void *); +void show_confirm_del(GaimBuddy *); +void show_confirm_del_group(GaimGroup *); +void show_confirm_del_blist_chat(GaimChat *); +void show_confirm_del_contact(GaimContact *); + /** * Our UI's identifier. */ @@ -115,18 +130,6 @@ extern void purge_away_queue(GSList**); extern void do_im_back(GtkWidget *w, GtkWidget *x); -/* Functions in dialogs.c */ -extern void alias_dialog_bud(GaimBuddy *); -extern void alias_dialog_contact(GaimContact *); -extern void alias_dialog_blist_chat(GaimChat *); -extern void show_warn_dialog(GaimConnection *, const char *); -extern void gaim_gtkdialogs_new_im(GaimAccount *, const char *); -extern void show_im_dialog(); -extern void show_info_dialog(); -extern void show_log_dialog(); -extern void destroy_all_dialogs(); -extern void create_away_mess(GtkWidget *, void *); - /* Functions in session.c */ extern void session_init(gchar *, gchar *, gchar *); extern void session_end(); @@ -137,4 +140,4 @@ extern void load_smiley_theme(const char *file, gboolean load); extern GSList *get_proto_smileys(const char *id); -#endif /* _GTKDIALOGS_H_ */ +#endif /* _GAIM_GTKDIALOGS_H_ */ diff -r 34a929fbbb30 -r db62420a53a2 src/gtkeventloop.h --- a/src/gtkeventloop.h Sun Aug 08 03:39:26 2004 +0000 +++ b/src/gtkeventloop.h Sun Aug 08 05:38:02 2004 +0000 @@ -22,8 +22,8 @@ * 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_EVENT_LOOP_H_ -#define _GAIM_GTK_EVENT_LOOP_H_ +#ifndef _GAIM_GTKEVENTLOOP_H_ +#define _GAIM_GTKEVENTLOOP_H_ #include "eventloop.h" @@ -34,4 +34,4 @@ */ GaimEventLoopUiOps *gaim_gtk_eventloop_get_ui_ops(void); -#endif /* _GAIM_GTK_EVENT_LOOP_H_ */ +#endif /* _GAIM_GTKEVENTLOOP_H_ */ diff -r 34a929fbbb30 -r db62420a53a2 src/gtkft.h --- a/src/gtkft.h Sun Aug 08 03:39:26 2004 +0000 +++ b/src/gtkft.h Sun Aug 08 05:38:02 2004 +0000 @@ -22,8 +22,8 @@ * 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_FT_H_ -#define _GAIM_GTK_FT_H_ +#ifndef _GAIM_GTKFT_H_ +#define _GAIM_GTKFT_H_ #include "ft.h" @@ -143,4 +143,4 @@ /*@}*/ -#endif /* _GAIM_GTK_FT_H_ */ +#endif /* _GAIM_GTKFT_H_ */ diff -r 34a929fbbb30 -r db62420a53a2 src/gtkimhtml.h --- a/src/gtkimhtml.h Sun Aug 08 03:39:26 2004 +0000 +++ b/src/gtkimhtml.h Sun Aug 08 05:38:02 2004 +0000 @@ -20,9 +20,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ - -#ifndef __GTK_IMHTML_H -#define __GTK_IMHTML_H +#ifndef _GAIM_GTKIMHTML_H_ +#define _GAIM_GTKIMHTML_H_ #include #include @@ -721,4 +720,4 @@ } #endif -#endif +#endif /* _GAIM_GTKIMHTML_H_ */ diff -r 34a929fbbb30 -r db62420a53a2 src/gtkimhtmltoolbar.h --- a/src/gtkimhtmltoolbar.h Sun Aug 08 03:39:26 2004 +0000 +++ b/src/gtkimhtmltoolbar.h Sun Aug 08 05:38:02 2004 +0000 @@ -20,11 +20,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * */ +#ifndef _GAIM_GTKIMHTMLTOOLBAR_H_ +#define _GAIM_GTKIMHTMLTOOLBAR_H_ #include #include "gtkimhtml.h" -#ifndef __GTK_IMHTMLTOOLBAR_H -#define __GTK_IMHTMLTOOLBAR_H #ifdef __cplusplus extern "C" { @@ -89,4 +89,4 @@ } #endif -#endif +#endif /* _GAIM_GTKIMHTMLTOOLBAR_H_ */ diff -r 34a929fbbb30 -r db62420a53a2 src/gtkinternal.h --- a/src/gtkinternal.h Sun Aug 08 03:39:26 2004 +0000 +++ b/src/gtkinternal.h Sun Aug 08 05:38:02 2004 +0000 @@ -22,8 +22,8 @@ * 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_INTERNAL_H_ -#define _GAIM_GTK_INTERNAL_H_ +#ifndef _GAIM_GTKINTERNAL_H_ +#define _GAIM_GTKINTERNAL_H_ #include "internal.h" @@ -39,4 +39,4 @@ # define GAIM_ALERT_TITLE "Gaim" #endif -#endif /* _GAIM_GTK_INTERNAL_H_ */ +#endif /* _GAIM_GTKINTERNAL_H_ */ diff -r 34a929fbbb30 -r db62420a53a2 src/gtknotify.h --- a/src/gtknotify.h Sun Aug 08 03:39:26 2004 +0000 +++ b/src/gtknotify.h Sun Aug 08 05:38:02 2004 +0000 @@ -22,8 +22,8 @@ * 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_NOTIFY_H_ -#define _GAIM_GTK_NOTIFY_H_ +#ifndef _GAIM_GTKNOTIFY_H_ +#define _GAIM_GTKNOTIFY_H_ #include "notify.h" @@ -34,4 +34,4 @@ */ GaimNotifyUiOps *gaim_gtk_notify_get_ui_ops(void); -#endif /* _GAIM_GTK_NOTIFY_H_ */ +#endif /* _GAIM_GTKNOTIFY_H_ */ diff -r 34a929fbbb30 -r db62420a53a2 src/gtkplugin.h --- a/src/gtkplugin.h Sun Aug 08 03:39:26 2004 +0000 +++ b/src/gtkplugin.h Sun Aug 08 05:38:02 2004 +0000 @@ -22,8 +22,8 @@ * 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_PLUGIN_H_ -#define _GAIM_GTK_PLUGIN_H_ +#ifndef _GAIM_GTKPLUGIN_H_ +#define _GAIM_GTKPLUGIN_H_ #include "plugin.h" @@ -66,4 +66,4 @@ */ void gaim_gtk_plugins_save(void); -#endif /* _GAIM_GTK_PLUGIN_H_ */ +#endif /* _GAIM_GTKPLUGIN_H_ */ diff -r 34a929fbbb30 -r db62420a53a2 src/gtkpluginpref.h --- a/src/gtkpluginpref.h Sun Aug 08 03:39:26 2004 +0000 +++ b/src/gtkpluginpref.h Sun Aug 08 05:38:02 2004 +0000 @@ -23,8 +23,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * */ -#ifndef _GTK_PLUGIN_PREF_H_ -#define _GTK_PLUGIN_PREF_H_ +#ifndef _GAIM_GTKPLUGINPREF_H_ +#define _GAIM_GTKPLUGINPREF_H_ #ifdef HAVE_CONFIG_H # include @@ -50,4 +50,4 @@ } #endif -#endif /* _GTK_PLUGIN_PREF_H_ */ +#endif /* _GAIM_GTKPLUGINPREF_H_ */ diff -r 34a929fbbb30 -r db62420a53a2 src/gtkpounce.h --- a/src/gtkpounce.h Sun Aug 08 03:39:26 2004 +0000 +++ b/src/gtkpounce.h Sun Aug 08 05:38:02 2004 +0000 @@ -22,8 +22,8 @@ * 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_POUNCE_H_ -#define _GAIM_GTK_POUNCE_H_ +#ifndef _GAIM_GTKPOUNCE_H_ +#define _GAIM_GTKPOUNCE_H_ #include "pounce.h" @@ -49,4 +49,4 @@ */ void gaim_gtk_pounces_init(void); -#endif /* _GAIM_GTK_POUNCE_H_ */ +#endif /* _GAIM_GTKPOUNCE_H_ */ diff -r 34a929fbbb30 -r db62420a53a2 src/gtkprefs.h --- a/src/gtkprefs.h Sun Aug 08 03:39:26 2004 +0000 +++ b/src/gtkprefs.h Sun Aug 08 05:38:02 2004 +0000 @@ -23,8 +23,9 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * */ -#ifndef _GAIM_GTK_PREFS_H_ -#define _GAIM_GTK_PREFS_H_ +#ifndef _GAIM_GTKPREFS_H_ +#define _GAIM_GTKPREFS_H_ + #include "prefs.h" /* XXX These should go. */ @@ -127,4 +128,4 @@ */ void gaim_gtk_prefs_update_old(); -#endif /* _GAIM_GTK_PREFS_H_ */ +#endif /* _GAIM_GTKPREFS_H_ */ diff -r 34a929fbbb30 -r db62420a53a2 src/gtkprivacy.h --- a/src/gtkprivacy.h Sun Aug 08 03:39:26 2004 +0000 +++ b/src/gtkprivacy.h Sun Aug 08 05:38:02 2004 +0000 @@ -22,8 +22,8 @@ * 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_PRIVACY_H_ -#define _GAIM_GTK_PRIVACY_H_ +#ifndef _GAIM_GTKPRIVACY_H_ +#define _GAIM_GTKPRIVACY_H_ #include "privacy.h" @@ -79,4 +79,4 @@ */ GaimPrivacyUiOps *gaim_gtk_privacy_get_ui_ops(void); -#endif /* _GAIM_GTK_PRIVACY_H_ */ +#endif /* _GAIM_GTKPRIVACY_H_ */ diff -r 34a929fbbb30 -r db62420a53a2 src/gtkrequest.h --- a/src/gtkrequest.h Sun Aug 08 03:39:26 2004 +0000 +++ b/src/gtkrequest.h Sun Aug 08 05:38:02 2004 +0000 @@ -22,8 +22,8 @@ * 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_REQUEST_H_ -#define _GAIM_GTK_REQUEST_H_ +#ifndef _GAIM_GTKREQUEST_H_ +#define _GAIM_GTKREQUEST_H_ #include "request.h" @@ -34,4 +34,4 @@ */ GaimRequestUiOps *gaim_gtk_request_get_ui_ops(void); -#endif /* _GAIM_GTK_REQUEST_H_ */ +#endif /* _GAIM_GTKREQUEST_H_ */ diff -r 34a929fbbb30 -r db62420a53a2 src/gtkroomlist.h --- a/src/gtkroomlist.h Sun Aug 08 03:39:26 2004 +0000 +++ b/src/gtkroomlist.h Sun Aug 08 05:38:02 2004 +0000 @@ -22,9 +22,8 @@ * 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_ROOMLIST_H_ -#define _GAIM_GTK_ROOMLIST_H_ +#ifndef _GAIM_GTKROOMLIST_H_ +#define _GAIM_GTKROOMLIST_H_ #include "roomlist.h" @@ -65,4 +64,4 @@ */ GaimGtkRoomlistDialog *gaim_gtk_roomlist_dialog_new_with_account(GaimAccount *account); -#endif /* _GAIM_GTK_ROOMLIST_H_ */ +#endif /* _GAIM_GTKROOMLIST_H_ */ diff -r 34a929fbbb30 -r db62420a53a2 src/gtksound.h --- a/src/gtksound.h Sun Aug 08 03:39:26 2004 +0000 +++ b/src/gtksound.h Sun Aug 08 05:38:02 2004 +0000 @@ -21,7 +21,6 @@ * 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_GTKSOUND_H_ #define _GAIM_GTKSOUND_H_ diff -r 34a929fbbb30 -r db62420a53a2 src/gtksourceiter.h --- a/src/gtksourceiter.h Sun Aug 08 03:39:26 2004 +0000 +++ b/src/gtksourceiter.h Sun Aug 08 05:38:02 2004 +0000 @@ -19,9 +19,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ - -#ifndef __GTK_SOURCE_ITER_H__ -#define __GTK_SOURCE_ITER_H__ +#ifndef _GAIM_GTKSOURCEITER_H_ +#define _GAIM_GTKSOURCEITER_H_ #include @@ -53,4 +52,4 @@ G_END_DECLS -#endif /* __GTK_SOURCE_ITER_H__ */ +#endif /* _GAIM_GTKSOURCEITER_H_ */ diff -r 34a929fbbb30 -r db62420a53a2 src/gtkutils.h --- a/src/gtkutils.h Sun Aug 08 03:39:26 2004 +0000 +++ b/src/gtkutils.h Sun Aug 08 05:38:02 2004 +0000 @@ -22,8 +22,8 @@ * 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_ +#ifndef _GAIM_GTKUTILS_H_ +#define _GAIM_GTKUTILS_H_ #include "gtkconv.h" #include "gtkinternal.h" @@ -352,4 +352,4 @@ gboolean *push_in, gpointer user_data); -#endif /* _GAIM_GTK_UTILS_H_ */ +#endif /* _GAIM_GTKUTILS_H_ */ diff -r 34a929fbbb30 -r db62420a53a2 src/imgstore.h --- a/src/imgstore.h Sun Aug 08 03:39:26 2004 +0000 +++ b/src/imgstore.h Sun Aug 08 05:38:02 2004 +0000 @@ -23,8 +23,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * */ -#ifndef _GAIM_CONV_IMGSTORE_H_ -#define _GAIM_CONV_IMGSTORE_H_ +#ifndef _GAIM_IMGSTORE_H_ +#define _GAIM_IMGSTORE_H_ struct _GaimStoredImage; typedef struct _GaimStoredImage GaimStoredImage; @@ -108,4 +108,4 @@ } #endif -#endif /* _GAIM_CONV_IMGSTORE_H_ */ +#endif /* _GAIM_IMGSTORE_H_ */ diff -r 34a929fbbb30 -r db62420a53a2 src/log.h --- a/src/log.h Sun Aug 08 03:39:26 2004 +0000 +++ b/src/log.h Sun Aug 08 05:38:02 2004 +0000 @@ -22,7 +22,6 @@ * 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_ diff -r 34a929fbbb30 -r db62420a53a2 src/multi.h --- a/src/multi.h Sun Aug 08 03:39:26 2004 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,40 +0,0 @@ -/* - * gaim - * - * Gaim is the legal property of its developers, whose names are too numerous - * to list here. Please refer to the COPYRIGHT file distributed with this - * source distribution. - * - * 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 _MULTI_H_ -#define _MULTI_H_ - -struct proto_chat_entry { - char *label; - char *identifier; - char *def; - gboolean is_int; - int min; - int max; - gboolean secret; -}; - -#endif /* _MULTI_H_ */ - -/* A big line. */ -/* -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- */ diff -r 34a929fbbb30 -r db62420a53a2 src/pluginpref.h --- a/src/pluginpref.h Sun Aug 08 03:39:26 2004 +0000 +++ b/src/pluginpref.h Sun Aug 08 05:38:02 2004 +0000 @@ -23,8 +23,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * */ -#ifndef _PLUGIN_PREF_H_ -#define _PLUGIN_PREF_H_ +#ifndef _GAIM_PLUGINPREF_H_ +#define _GAIM_PLUGINPREF_H_ typedef struct _GaimPluginPrefFrame GaimPluginPrefFrame; typedef struct _GaimPluginPref GaimPluginPref; @@ -221,4 +221,4 @@ } #endif -#endif /* _PLUGIN_PREF_H_ */ +#endif /* _GAIM_PLUGINPREF_H_ */ diff -r 34a929fbbb30 -r db62420a53a2 src/prefs.h --- a/src/prefs.h Sun Aug 08 03:39:26 2004 +0000 +++ b/src/prefs.h Sun Aug 08 05:38:02 2004 +0000 @@ -22,9 +22,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * */ - -#ifndef _PREFS_H_ -#define _PREFS_H_ +#ifndef _GAIM_PREFS_H_ +#define _GAIM_PREFS_H_ #include @@ -259,4 +258,4 @@ } #endif -#endif /* _PREFS_H_ */ +#endif /* _GAIM_PREFS_H_ */ diff -r 34a929fbbb30 -r db62420a53a2 src/protocols/gg/libgg.c --- a/src/protocols/gg/libgg.c Sun Aug 08 03:39:26 2004 +0000 +++ b/src/protocols/gg/libgg.c Sun Aug 08 05:38:02 2004 +0000 @@ -1,4 +1,4 @@ -/* $Id: libgg.c 10513 2004-08-04 18:27:09Z lschiere $ */ +/* $Id: libgg.c 10574 2004-08-08 05:38:02Z thekingant $ */ /* * (C) Copyright 2001 Wojtek Kaniewski , @@ -64,16 +64,13 @@ int gg_http_proxy_port = 0; char *gg_http_proxy_host = NULL; -/* temp -Herman */ -static int ping_outstanding = 0; - #ifndef lint static char rcsid[] #ifdef __GNUC__ __attribute__ ((unused)) #endif -= "$Id: libgg.c 10513 2004-08-04 18:27:09Z lschiere $"; += "$Id: libgg.c 10574 2004-08-08 05:38:02Z thekingant $"; #endif @@ -1126,7 +1123,6 @@ case GG_PONG: { gg_debug(GG_DEBUG_MISC, "-- received a pong\n"); - ping_outstanding = 0; sess->last_pong = time(NULL); break; } diff -r 34a929fbbb30 -r db62420a53a2 src/protocols/icq/gaim_icq.c --- a/src/protocols/icq/gaim_icq.c Sun Aug 08 03:39:26 2004 +0000 +++ b/src/protocols/icq/gaim_icq.c Sun Aug 08 05:38:02 2004 +0000 @@ -2,7 +2,6 @@ #include #include "icq.h" /* well, we're doing ICQ, right? */ #include "gaim.h" /* needed for every other damn thing */ -#include "multi.h" /* needed for gaim_connection */ #include "prpl.h" /* needed for prpl */ #include "proxy.h" diff -r 34a929fbbb30 -r db62420a53a2 src/protocols/irc/irc.c --- a/src/protocols/irc/irc.c Sun Aug 08 03:39:26 2004 +0000 +++ b/src/protocols/irc/irc.c Sun Aug 08 05:38:02 2004 +0000 @@ -29,7 +29,6 @@ #include "blist.h" #include "conversation.h" #include "debug.h" -#include "multi.h" #include "notify.h" #include "prpl.h" #include "plugin.h" diff -r 34a929fbbb30 -r db62420a53a2 src/protocols/jabber/buddy.c --- a/src/protocols/jabber/buddy.c Sun Aug 08 03:39:26 2004 +0000 +++ b/src/protocols/jabber/buddy.c Sun Aug 08 05:38:02 2004 +0000 @@ -21,7 +21,7 @@ #include "internal.h" #include "debug.h" #include "imgstore.h" -#include "multi.h" +#include "prpl.h" #include "notify.h" #include "request.h" #include "util.h" diff -r 34a929fbbb30 -r db62420a53a2 src/protocols/jabber/chat.c --- a/src/protocols/jabber/chat.c Sun Aug 08 03:39:26 2004 +0000 +++ b/src/protocols/jabber/chat.c Sun Aug 08 05:38:02 2004 +0000 @@ -20,7 +20,7 @@ */ #include "internal.h" #include "debug.h" -#include "multi.h" /* for proto_chat_entry */ +#include "prpl.h" /* for proto_chat_entry */ #include "notify.h" #include "request.h" #include "roomlist.h" diff -r 34a929fbbb30 -r db62420a53a2 src/protocols/msn/msn.c --- a/src/protocols/msn/msn.c Sun Aug 08 03:39:26 2004 +0000 +++ b/src/protocols/msn/msn.c Sun Aug 08 05:38:02 2004 +0000 @@ -34,7 +34,7 @@ #include "session.h" #include "state.h" #include "utils.h" -#include "multi.h" +#include "prpl.h" #include "util.h" #include "switchboard.h" diff -r 34a929fbbb30 -r db62420a53a2 src/protocols/napster/napster.c --- a/src/protocols/napster/napster.c Sun Aug 08 03:39:26 2004 +0000 +++ b/src/protocols/napster/napster.c Sun Aug 08 05:38:02 2004 +0000 @@ -24,7 +24,6 @@ #include "blist.h" #include "conversation.h" #include "debug.h" -#include "multi.h" #include "notify.h" #include "prpl.h" #include "proxy.h" diff -r 34a929fbbb30 -r db62420a53a2 src/protocols/novell/novell.c --- a/src/protocols/novell/novell.c Sun Aug 08 03:39:26 2004 +0000 +++ b/src/protocols/novell/novell.c Sun Aug 08 05:38:02 2004 +0000 @@ -30,7 +30,6 @@ #include "request.h" #include "network.h" #include "privacy.h" -#include "multi.h" #define DEFAULT_PORT 8300 #define NOVELL_CONNECT_STEPS 4 diff -r 34a929fbbb30 -r db62420a53a2 src/protocols/oscar/oscar.c --- a/src/protocols/oscar/oscar.c Sun Aug 08 03:39:26 2004 +0000 +++ b/src/protocols/oscar/oscar.c Sun Aug 08 05:38:02 2004 +0000 @@ -35,7 +35,6 @@ #include "debug.h" #include "ft.h" #include "imgstore.h" -#include "multi.h" #include "network.h" #include "notify.h" #include "privacy.h" diff -r 34a929fbbb30 -r db62420a53a2 src/protocols/silc/silcgaim.h --- a/src/protocols/silc/silcgaim.h Sun Aug 08 03:39:26 2004 +0000 +++ b/src/protocols/silc/silcgaim.h Sun Aug 08 05:38:02 2004 +0000 @@ -25,7 +25,6 @@ #include "account.h" #include "accountopt.h" #include "debug.h" -#include "multi.h" #include "notify.h" #include "prpl.h" #include "request.h" diff -r 34a929fbbb30 -r db62420a53a2 src/protocols/toc/toc.c --- a/src/protocols/toc/toc.c Sun Aug 08 03:39:26 2004 +0000 +++ b/src/protocols/toc/toc.c Sun Aug 08 05:38:02 2004 +0000 @@ -24,7 +24,6 @@ #include "accountopt.h" #include "conversation.h" #include "debug.h" -#include "multi.h" #include "notify.h" #include "proxy.h" #include "prpl.h" diff -r 34a929fbbb30 -r db62420a53a2 src/protocols/yahoo/yahoochat.c --- a/src/protocols/yahoo/yahoochat.c Sun Aug 08 03:39:26 2004 +0000 +++ b/src/protocols/yahoo/yahoochat.c Sun Aug 08 05:38:02 2004 +0000 @@ -36,7 +36,6 @@ #include "conversation.h" #include "notify.h" #include "util.h" -#include "multi.h" #include "internal.h" #include "yahoo.h" diff -r 34a929fbbb30 -r db62420a53a2 src/protocols/zephyr/zephyr.c --- a/src/protocols/zephyr/zephyr.c Sun Aug 08 03:39:26 2004 +0000 +++ b/src/protocols/zephyr/zephyr.c Sun Aug 08 05:38:02 2004 +0000 @@ -27,7 +27,6 @@ #include "accountopt.h" #include "debug.h" -#include "multi.h" #include "notify.h" #include "prpl.h" #include "server.h" diff -r 34a929fbbb30 -r db62420a53a2 src/prpl.h --- a/src/prpl.h Sun Aug 08 03:39:26 2004 +0000 +++ b/src/prpl.h Sun Aug 08 05:38:02 2004 +0000 @@ -95,6 +95,16 @@ #include "proxy.h" #include "plugin.h" +struct proto_chat_entry { + char *label; + char *identifier; + char *def; + gboolean is_int; + int min; + int max; + gboolean secret; +}; + /** * Protocol options * diff -r 34a929fbbb30 -r db62420a53a2 src/sha.h --- a/src/sha.h Sun Aug 08 03:39:26 2004 +0000 +++ b/src/sha.h Sun Aug 08 05:38:02 2004 +0000 @@ -19,8 +19,8 @@ * Contributor(s): * */ -#ifndef _SHA_H_ -#define _SHA_H_ +#ifndef _GAIM_SHA_H_ +#define _GAIM_SHA_H_ #include @@ -38,4 +38,4 @@ void shaFinal(SHA_CTX *ctx, unsigned char hashout[20]); void shaBlock(unsigned char *dataIn, int len, unsigned char hashout[20]); -#endif +#endif /* _GAIM_SHA_H_ */ diff -r 34a929fbbb30 -r db62420a53a2 src/signals.h --- a/src/signals.h Sun Aug 08 03:39:26 2004 +0000 +++ b/src/signals.h Sun Aug 08 05:38:02 2004 +0000 @@ -22,8 +22,8 @@ * 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_SIGNAL_H_ -#define _GAIM_SIGNAL_H_ +#ifndef _GAIM_SIGNALS_H_ +#define _GAIM_SIGNALS_H_ #include #include "value.h" @@ -264,4 +264,4 @@ } #endif -#endif /* _GAIM_SIGNAL_H_ */ +#endif /* _GAIM_SIGNALS_H_ */ diff -r 34a929fbbb30 -r db62420a53a2 src/sound.h --- a/src/sound.h Sun Aug 08 03:39:26 2004 +0000 +++ b/src/sound.h Sun Aug 08 05:38:02 2004 +0000 @@ -21,7 +21,6 @@ * 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_SOUND_H_ #define _GAIM_SOUND_H_ diff -r 34a929fbbb30 -r db62420a53a2 src/sslconn.h --- a/src/sslconn.h Sun Aug 08 03:39:26 2004 +0000 +++ b/src/sslconn.h Sun Aug 08 05:38:02 2004 +0000 @@ -22,8 +22,8 @@ * 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_SSL_H_ -#define _GAIM_SSL_H_ +#ifndef _GAIM_SSLCONN_H_ +#define _GAIM_SSLCONN_H_ #include "proxy.h" @@ -199,4 +199,4 @@ } #endif -#endif /* _GAIM_SSL_H_ */ +#endif /* _GAIM_SSLCONN_H_ */ diff -r 34a929fbbb30 -r db62420a53a2 src/stock.h --- a/src/stock.h Sun Aug 08 03:39:26 2004 +0000 +++ b/src/stock.h Sun Aug 08 05:38:02 2004 +0000 @@ -22,8 +22,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _STOCK_H_ -#define _STOCK_H_ +#ifndef _GAIM_STOCK_H_ +#define _GAIM_STOCK_H_ /**************************************************************************/ /** @name Stock images */ @@ -87,4 +87,4 @@ */ void gaim_gtk_stock_init(void); -#endif /* _STOCK_H_ */ +#endif /* _GAIM_STOCK_H_ */ diff -r 34a929fbbb30 -r db62420a53a2 src/stringref.h --- a/src/stringref.h Sun Aug 08 03:39:26 2004 +0000 +++ b/src/stringref.h Sun Aug 08 05:38:02 2004 +0000 @@ -23,7 +23,6 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * */ - #ifndef _GAIM_STRINGREF_H_ #define _GAIM_STRINGREF_H_