diff options
34 files changed, 163 insertions, 12 deletions
diff --git a/src/common/chanopt.h b/src/common/chanopt.h index d36b7cc3..c0990385 100644 --- a/src/common/chanopt.h +++ b/src/common/chanopt.h @@ -17,9 +17,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#ifndef HEXCHAT_CHANOPT_H +#define HEXCHAT_CHANOPT_H + int chanopt_command (session *sess, char *tbuf, char *word[], char *word_eol[]); gboolean chanopt_is_set (unsigned int global, guint8 per_chan_setting); gboolean chanopt_is_set_a (unsigned int global, guint8 per_chan_setting); void chanopt_save_all (void); void chanopt_save (session *sess); void chanopt_load (session *sess); + +#endif diff --git a/src/common/identd.h b/src/common/identd.h index 4e5049d5..3b29135f 100644 --- a/src/common/identd.h +++ b/src/common/identd.h @@ -17,4 +17,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#ifndef HEXCHAT_IDENTD_H +#define HEXCHAT_IDENTD_H + void identd_start (char *username); + +#endif diff --git a/src/common/inet.h b/src/common/inet.h index a9fe3e25..36d5bb60 100644 --- a/src/common/inet.h +++ b/src/common/inet.h @@ -19,6 +19,9 @@ /* include stuff for internet */ +#ifndef HEXCHAT_INET_H +#define HEXCHAT_INET_H + #ifndef WIN32 #ifdef WANTSOCKET @@ -60,3 +63,5 @@ #define sock_error WSAGetLastError #endif + +#endif diff --git a/src/common/msproxy.h b/src/common/msproxy.h index 9fb312ad..4371d704 100644 --- a/src/common/msproxy.h +++ b/src/common/msproxy.h @@ -21,6 +21,9 @@ * Inferno Nettverk A/S, Norway. All rights reserved. */ +#ifndef HEXCHAT_MSPROXY_H +#define HEXCHAT_MSPROXY_H + #include "network.h" #define MSPROXY_EXECUTABLE "hexchat.exe" /* This probably can be used for access control on the server side */ @@ -255,3 +258,5 @@ struct msproxy_response_t { int traverse_msproxy (int sok, char *serverAddr, int port, struct msproxy_state_t *state, netstore *ns_proxy, int csok4, int csok6, int *csok, char bound); void msproxy_keepalive (void); + +#endif diff --git a/src/common/ssl.h b/src/common/ssl.h index a59fbf0c..ad34944c 100644 --- a/src/common/ssl.h +++ b/src/common/ssl.h @@ -17,9 +17,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -/* - ... -*/ +#ifndef HEXCHAT_SSL_H +#define HEXCHAT_SSL_H struct cert_info { char subject[256]; @@ -82,3 +81,5 @@ int _SSL_recv (SSL * ssl, char *buf, int len); #define _SSL_get_ctx_x509_base64(a) _SSL_get_ctx_obj_base64(a, 2) /*int _SSL_verify_x509(X509 *x509);*/ + +#endif diff --git a/src/common/strlutil.h b/src/common/strlutil.h index 0b03a2e0..2d66bc6d 100644 --- a/src/common/strlutil.h +++ b/src/common/strlutil.h @@ -14,5 +14,10 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#ifndef HEXCHAT_STRLUTIL_H +#define HEXCHAT_STRLUTIL_H + size_t strlcat(char *dst, const char *src, size_t siz); size_t strlcpy(char *dst, const char *src, size_t siz); + +#endif diff --git a/src/common/thread.h b/src/common/thread.h index 44c26f7d..2c736ca2 100644 --- a/src/common/thread.h +++ b/src/common/thread.h @@ -17,6 +17,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#ifndef HEXCHAT_THREAD_H +#define HEXCHAT_THREAD_H + #if 0 /* native file dialogs */ #include <windows.h> @@ -29,3 +32,5 @@ typedef struct thread *thread_new (void); int thread_start (thread *th, void *(*start_routine)(void *), void *arg); #endif + +#endif diff --git a/src/fe-gtk/about.h b/src/fe-gtk/about.h index 8a2936d8..b4d5cb34 100644 --- a/src/fe-gtk/about.h +++ b/src/fe-gtk/about.h @@ -17,4 +17,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#ifndef HEXCHAT_ABOUT_H +#define HEXCHAT_ABOUT_H + void menu_about (GtkWidget * wid, gpointer sess); + +#endif diff --git a/src/fe-gtk/ascii.h b/src/fe-gtk/ascii.h index 2f660e77..18d63415 100644 --- a/src/fe-gtk/ascii.h +++ b/src/fe-gtk/ascii.h @@ -17,4 +17,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#ifndef HEXCHAT_ASCII_H +#define HEXCHAT_ASCII_H + void ascii_open (void); + +#endif diff --git a/src/fe-gtk/banlist.h b/src/fe-gtk/banlist.h index 06ab8cac..899ee5e5 100644 --- a/src/fe-gtk/banlist.h +++ b/src/fe-gtk/banlist.h @@ -17,8 +17,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#ifndef BANLIST_H -#define BANLIST_H +#ifndef HEXCHAT_BANLIST_H +#define HEXCHAT_BANLIST_H #include "../common/hexchat.h" void banlist_opengui (session *sess); @@ -72,4 +72,5 @@ typedef struct mode_info_s { int bit; /* Mask bit, e.g., 1<<MODE_BAN */ void (*tester)(banlist_info *, int); /* Function returns true to set bit into checkable */ } mode_info; -#endif /* BANLIST_H */ + +#endif /* HEXCHAT_BANLIST_H */ diff --git a/src/fe-gtk/chanlist.h b/src/fe-gtk/chanlist.h index 123610b5..481beec3 100644 --- a/src/fe-gtk/chanlist.h +++ b/src/fe-gtk/chanlist.h @@ -17,4 +17,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#ifndef HEXCHAT_CHANLIST_H +#define HEXCHAT_CHANLIST_H + void chanlist_opengui (server *serv, int do_refresh); + +#endif diff --git a/src/fe-gtk/chanview.h b/src/fe-gtk/chanview.h index 1891f4a8..a1495b1d 100644 --- a/src/fe-gtk/chanview.h +++ b/src/fe-gtk/chanview.h @@ -17,6 +17,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#ifndef HEXCHAT_CHANVIEW_H +#define HEXCHAT_CHANVIEW_H + typedef struct _chanview chanview; typedef struct _chan chan; @@ -48,3 +51,5 @@ chan * chan_get_parent (chan *ch); #define FOCUS_NEW_ALL 1 #define FOCUS_NEW_ONLY_ASKED 2 #define FOCUS_NEW_NONE 0 + +#endif diff --git a/src/fe-gtk/custom-list.h b/src/fe-gtk/custom-list.h index 75e5555a..8ef5fd52 100644 --- a/src/fe-gtk/custom-list.h +++ b/src/fe-gtk/custom-list.h @@ -17,8 +17,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#ifndef _custom_list_h_included_ -#define _custom_list_h_included_ +#ifndef HEXCHAT_CUSTOM_LIST_H +#define HEXCHAT_CUSTOM_LIST_H #include <gtk/gtk.h> @@ -101,4 +101,4 @@ void custom_list_append (CustomList *, chanlistrow *); void custom_list_resort (CustomList *); void custom_list_clear (CustomList *); -#endif /* _custom_list_h_included_ */ +#endif /* HEXCHAT_CUSTOM_LIST_H */ diff --git a/src/fe-gtk/editlist.h b/src/fe-gtk/editlist.h index b24d1e57..5487684b 100644 --- a/src/fe-gtk/editlist.h +++ b/src/fe-gtk/editlist.h @@ -17,4 +17,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#ifndef HEXCHAT_EDITLIST_H +#define HEXCHAT_EDITLIST_H + void editlist_gui_open (char *title1, char *title2, GSList * list, char *title, char *wmclass, char *file, char *help); + +#endif diff --git a/src/fe-gtk/fe-gtk.h b/src/fe-gtk/fe-gtk.h index 18cc3ac7..321e3518 100644 --- a/src/fe-gtk/fe-gtk.h +++ b/src/fe-gtk/fe-gtk.h @@ -17,6 +17,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#ifndef HEXCHAT_FE_GTK_H +#define HEXCHAT_FE_GTK_H + #ifdef WIN32 #include "../../config-win32.h" #else @@ -209,3 +212,5 @@ void SPELL_ENTRY_INSERT (GtkWidget *entry, const char *text, int len, int *pos); #define SPELL_ENTRY_SET_POS(e,p) gtk_editable_set_position(GTK_EDITABLE(e),p); #define SPELL_ENTRY_INSERT(e,t,l,p) gtk_editable_insert_text(GTK_EDITABLE(e),t,l,p) #endif + +#endif diff --git a/src/fe-gtk/fkeys.h b/src/fe-gtk/fkeys.h index aae25430..621c872c 100644 --- a/src/fe-gtk/fkeys.h +++ b/src/fe-gtk/fkeys.h @@ -17,6 +17,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#ifndef HEXCHAT_FKEYS_H +#define HEXCHAT_FKEYS_H + /* These are cp'ed from history.c --AGL */ #define STATE_SHIFT GDK_SHIFT_MASK #define STATE_ALT GDK_MOD1_MASK @@ -31,3 +34,5 @@ void key_dialog_show (void); int key_handle_key_press (GtkWidget * wid, GdkEventKey * evt, session *sess); int key_action_insert (GtkWidget * wid, GdkEventKey * evt, char *d1, char *d2, session *sess); + +#endif diff --git a/src/fe-gtk/gtkutil.h b/src/fe-gtk/gtkutil.h index 9ae79b3f..0c358953 100644 --- a/src/fe-gtk/gtkutil.h +++ b/src/fe-gtk/gtkutil.h @@ -17,6 +17,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#ifndef HEXCHAT_GTKUTIL_H +#define HEXCHAT_GTKUTIL_H + #include <gtk/gtktreeview.h> #include <gtk/gtktreemodel.h> @@ -57,3 +60,4 @@ gboolean gtkutil_treemodel_string_to_iter (GtkTreeModel *model, gchar *pathstr, gboolean gtkutil_treeview_get_selected_iter (GtkTreeView *view, GtkTreeIter *iter_ret); gboolean gtkutil_treeview_get_selected (GtkTreeView *view, GtkTreeIter *iter_ret, ...); +#endif diff --git a/src/fe-gtk/joind.h b/src/fe-gtk/joind.h index b029ae89..a7f466b9 100644 --- a/src/fe-gtk/joind.h +++ b/src/fe-gtk/joind.h @@ -17,5 +17,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#ifndef HEXCHAT_JOIND_H +#define HEXCHAT_JOIND_H + void joind_open (server *serv); void joind_close (server *serv); + +#endif diff --git a/src/fe-gtk/maingui.h b/src/fe-gtk/maingui.h index ef164048..a35f3684 100644 --- a/src/fe-gtk/maingui.h +++ b/src/fe-gtk/maingui.h @@ -17,6 +17,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#ifndef HEXCHAT_MAINGUI_H +#define HEXCHAT_MAINGUI_H + extern GtkStyle *input_style; extern GtkWidget *parent_window; @@ -50,3 +53,5 @@ gboolean mg_drag_begin_cb (GtkWidget *widget, GdkDragContext *context, gpointer void mg_drag_end_cb (GtkWidget *widget, GdkDragContext *context, gpointer userdata); gboolean mg_drag_drop_cb (GtkWidget *widget, GdkDragContext *context, int x, int y, guint time, gpointer user_data); gboolean mg_drag_motion_cb (GtkWidget *widget, GdkDragContext *context, int x, int y, guint time, gpointer user_data); + +#endif diff --git a/src/fe-gtk/menu.h b/src/fe-gtk/menu.h index 7342e5f9..dfc6fd07 100644 --- a/src/fe-gtk/menu.h +++ b/src/fe-gtk/menu.h @@ -17,6 +17,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#ifndef HEXCHAT_MENU_H +#define HEXCHAT_MENU_H + GtkWidget *menu_create_main (void *accel_group, int bar, int away, int toplevel, GtkWidget **menu_widgets); void menu_urlmenu (GdkEventButton * event, char *url); void menu_chanmenu (session *sess, GdkEventButton * event, char *chan); @@ -58,3 +61,5 @@ void menu_change_layout (void); #if (MENU_ID_NUM < MENU_ID_USERMENU) #error MENU_ID_NUM is set wrong #endif + +#endif diff --git a/src/fe-gtk/mmx_cmod.h b/src/fe-gtk/mmx_cmod.h index 185e0651..5b84a4b8 100644 --- a/src/fe-gtk/mmx_cmod.h +++ b/src/fe-gtk/mmx_cmod.h @@ -17,7 +17,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#ifndef HEXCHAT_MMX_CMOD_H +#define HEXCHAT_MMX_CMOD_H + void shade_ximage_15_mmx(void *data, int bpl, int w, int h, int rm, int gm, int bm); void shade_ximage_16_mmx(void *data, int bpl, int w, int h, int rm, int gm, int bm); void shade_ximage_32_mmx(void *data, int bpl, int w, int h, int rm, int gm, int bm); int have_mmx (void); + +#endif diff --git a/src/fe-gtk/notifygui.h b/src/fe-gtk/notifygui.h index e4549c84..6517995c 100644 --- a/src/fe-gtk/notifygui.h +++ b/src/fe-gtk/notifygui.h @@ -17,5 +17,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#ifndef HEXCHAT_NOTIFYGUI_H +#define HEXCHAT_NOTIFYGUI_H + void notify_gui_update (void); void notify_opengui (void); + +#endif diff --git a/src/fe-gtk/palette.h b/src/fe-gtk/palette.h index 76da19f7..6f53c1a7 100644 --- a/src/fe-gtk/palette.h +++ b/src/fe-gtk/palette.h @@ -17,6 +17,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#ifndef HEXCHAT_PALETTE_H +#define HEXCHAT_PALETTE_H + extern GdkColor colors[]; #define COL_MARK_FG 32 @@ -33,3 +36,5 @@ extern GdkColor colors[]; void palette_alloc (GtkWidget * widget); void palette_load (void); void palette_save (void); + +#endif diff --git a/src/fe-gtk/pixmaps.h b/src/fe-gtk/pixmaps.h index 3ab045fa..7241fa84 100644 --- a/src/fe-gtk/pixmaps.h +++ b/src/fe-gtk/pixmaps.h @@ -17,6 +17,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#ifndef HEXCHAT_PIXMAPS_H +#define HEXCHAT_PIXMAPS_H + extern GdkPixbuf *pix_ulist_voice; extern GdkPixbuf *pix_ulist_halfop; extern GdkPixbuf *pix_ulist_op; @@ -38,3 +41,5 @@ extern GdkPixbuf *pix_hexchat; extern GdkPixmap *pixmap_load_from_file (char *file); extern void pixmaps_init (void); + +#endif diff --git a/src/fe-gtk/plugin-tray.h b/src/fe-gtk/plugin-tray.h index eebb7eef..cb77019a 100644 --- a/src/fe-gtk/plugin-tray.h +++ b/src/fe-gtk/plugin-tray.h @@ -17,7 +17,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#ifndef HEXCHAT_PLUGIN_TRAY_H +#define HEXCHAT_PLUGIN_TRAY_H + int tray_plugin_init (void *, char **, char **, char **, char *); int tray_plugin_deinit (void *); gboolean tray_toggle_visibility (gboolean force_hide); void tray_apply_setup (void); + +#endif diff --git a/src/fe-gtk/plugingui.h b/src/fe-gtk/plugingui.h index 6b748eae..ae079a72 100644 --- a/src/fe-gtk/plugingui.h +++ b/src/fe-gtk/plugingui.h @@ -17,5 +17,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#ifndef HEXCHAT_PLUGINGUI_H +#define HEXCHAT_PLUGINGUI_H + void plugingui_open (void); void plugingui_load (void); + +#endif diff --git a/src/fe-gtk/rawlog.h b/src/fe-gtk/rawlog.h index 371002ea..53c57d42 100644 --- a/src/fe-gtk/rawlog.h +++ b/src/fe-gtk/rawlog.h @@ -17,4 +17,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#ifndef HEXCHAT_RAWLOG_H +#define HEXCHAT_RAWLOG_H + void open_rawlog (server *serv); + +#endif diff --git a/src/fe-gtk/search.h b/src/fe-gtk/search.h index d6568adf..55f8f0b5 100644 --- a/src/fe-gtk/search.h +++ b/src/fe-gtk/search.h @@ -17,4 +17,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#ifndef HEXCHAT_SEARCH_H +#define HEXCHAT_SEARCH_H + void search_open (session * sess); + +#endif diff --git a/src/fe-gtk/servlistgui.h b/src/fe-gtk/servlistgui.h index 3f916eb5..ca176a34 100644 --- a/src/fe-gtk/servlistgui.h +++ b/src/fe-gtk/servlistgui.h @@ -17,4 +17,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#ifndef HEXCHAT_SERVLISTGUI_H +#define HEXCHAT_SERVLISTGUI_H + void servlist_autojoinedit (ircnet *net, char *channel, gboolean add); + +#endif diff --git a/src/fe-gtk/setup.h b/src/fe-gtk/setup.h index c830fbc6..d756b10e 100644 --- a/src/fe-gtk/setup.h +++ b/src/fe-gtk/setup.h @@ -17,4 +17,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -void setup_apply_real (int new_pix, int do_ulist, int do_layout); \ No newline at end of file +#ifndef HEXCHAT_SETUP_H +#define HEXCHAT_SETUP_H + +void setup_apply_real (int new_pix, int do_ulist, int do_layout); + +#endif diff --git a/src/fe-gtk/textgui.h b/src/fe-gtk/textgui.h index 189bca79..6d9a3a23 100644 --- a/src/fe-gtk/textgui.h +++ b/src/fe-gtk/textgui.h @@ -17,5 +17,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#ifndef HEXCHAT_TEXTGUI_H +#define HEXCHAT_TEXTGUI_H + void PrintTextRaw (void *xtbuf, unsigned char *text, int indent, time_t stamp); void pevent_dialog_show (void); + +#endif diff --git a/src/fe-gtk/urlgrab.h b/src/fe-gtk/urlgrab.h index 6d962d0f..246b56e7 100644 --- a/src/fe-gtk/urlgrab.h +++ b/src/fe-gtk/urlgrab.h @@ -17,4 +17,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#ifndef HEXCHAT_URLGRAB_H +#define HEXCHAT_URLGRAB_H + void url_opengui (void); + +#endif diff --git a/src/fe-gtk/userlistgui.h b/src/fe-gtk/userlistgui.h index 89b08676..993fe8f0 100644 --- a/src/fe-gtk/userlistgui.h +++ b/src/fe-gtk/userlistgui.h @@ -17,6 +17,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#ifndef HEXCHAT_USERLISTGUI_H +#define HEXCHAT_USERLISTGUI_H + void userlist_set_value (GtkWidget *treeview, gfloat val); gfloat userlist_get_value (GtkWidget *treeview); GtkWidget *userlist_create (GtkWidget *box); @@ -25,3 +28,5 @@ void userlist_show (session *sess); void userlist_select (session *sess, char *name); char **userlist_selection_list (GtkWidget *widget, int *num_ret); GdkPixbuf *get_user_icon (server *serv, struct User *user); + +#endif diff --git a/src/fe-gtk/xtext.h b/src/fe-gtk/xtext.h index 74fbdffe..1ba3483a 100644 --- a/src/fe-gtk/xtext.h +++ b/src/fe-gtk/xtext.h @@ -17,8 +17,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#ifndef __XTEXT_H__ -#define __XTEXT_H__ +#ifndef HEXCHAT_XTEXT_H +#define HEXCHAT_XTEXT_H #include <gtk/gtkadjustment.h> #ifdef USE_XFT |