diff options
Diffstat (limited to 'src')
37 files changed, 10 insertions, 343 deletions
diff --git a/src/common/modes.c b/src/common/modes.c index 32b5a3fa..419b704a 100644 --- a/src/common/modes.c +++ b/src/common/modes.c @@ -19,8 +19,6 @@ #include <string.h> #include <stdlib.h> #include <stdio.h> -#include <glib.h> -#include <glib/gprintf.h> #include "hexchat.h" #include "hexchatc.h" @@ -34,6 +32,8 @@ #include <strings.h> #endif +#include <glib/gprintf.h> + typedef struct { server *serv; diff --git a/src/common/servlist.c b/src/common/servlist.c index 654e0b29..306b42e8 100644 --- a/src/common/servlist.c +++ b/src/common/servlist.c @@ -27,8 +27,6 @@ #endif #include "hexchat.h" -#include <glib.h> - #include "cfgfiles.h" #include "fe.h" #include "server.h" diff --git a/src/common/text.c b/src/common/text.c index 8196cc03..96fdacd0 100644 --- a/src/common/text.c +++ b/src/common/text.c @@ -33,7 +33,6 @@ #endif #include "hexchat.h" -#include <glib.h> #include "cfgfiles.h" #include "chanopt.h" #include "plugin.h" diff --git a/src/common/util.c b/src/common/util.c index b9c69a44..9ce23879 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -48,7 +48,6 @@ #include <errno.h> #include "hexchat.h" #include "hexchatc.h" -#include <glib.h> #include <ctype.h> #include "util.h" diff --git a/src/fe-gtk/about.c b/src/fe-gtk/about.c index 54b71053..c47fba4f 100644 --- a/src/fe-gtk/about.c +++ b/src/fe-gtk/about.c @@ -22,17 +22,6 @@ #include "fe-gtk.h" -#include <gtk/gtkmain.h> -#include <gtk/gtkcontainer.h> -#include <gtk/gtkdialog.h> -#include <gtk/gtkvbox.h> -#include <gtk/gtkhbox.h> -#include <gtk/gtkimage.h> -#include <gtk/gtklabel.h> -#include <gtk/gtkbutton.h> -#include <gtk/gtkstock.h> -#include <gtk/gtkwindow.h> - #ifdef USE_XLIB #include <gdk/gdkx.h> #endif diff --git a/src/fe-gtk/ascii.c b/src/fe-gtk/ascii.c index ab6ac0ee..56b0198b 100644 --- a/src/fe-gtk/ascii.c +++ b/src/fe-gtk/ascii.c @@ -22,12 +22,6 @@ #include "fe-gtk.h" -#include <gtk/gtkeditable.h> -#include <gtk/gtkframe.h> -#include <gtk/gtkhbox.h> -#include <gtk/gtklabel.h> -#include <gtk/gtkbutton.h> - #include "../common/hexchat.h" #include "../common/hexchatc.h" #include "gtkutil.h" diff --git a/src/fe-gtk/banlist.c b/src/fe-gtk/banlist.c index 3abd48ac..8c396d14 100644 --- a/src/fe-gtk/banlist.c +++ b/src/fe-gtk/banlist.c @@ -28,19 +28,6 @@ #include "fe-gtk.h" -#include <gtk/gtkhbox.h> -#include <gtk/gtkvbox.h> -#include <gtk/gtkhbbox.h> -#include <gtk/gtkstock.h> -#include <gtk/gtkliststore.h> -#include <gtk/gtkmessagedialog.h> -#include <gtk/gtktreeview.h> -#include <gtk/gtktreeselection.h> -#include <gtk/gtktogglebutton.h> -#include <gtk/gtkcheckbutton.h> -#include <gtk/gtktable.h> -#include <glib.h> - #include "../common/hexchat.h" #include "../common/fe.h" #include "../common/modes.h" diff --git a/src/fe-gtk/chanlist.c b/src/fe-gtk/chanlist.c index c2cc6fcb..47b9f1db 100644 --- a/src/fe-gtk/chanlist.c +++ b/src/fe-gtk/chanlist.c @@ -30,21 +30,6 @@ #include "fe-gtk.h" -#include <gtk/gtkalignment.h> -#include <gtk/gtkcellrenderertext.h> -#include <gtk/gtkcheckbutton.h> -#include <gtk/gtkcombobox.h> -#include <gtk/gtkentry.h> -#include <gtk/gtkhbox.h> -#include <gtk/gtklabel.h> -#include <gtk/gtkliststore.h> -#include <gtk/gtkscrolledwindow.h> -#include <gtk/gtkspinbutton.h> -#include <gtk/gtkstock.h> -#include <gtk/gtktable.h> -#include <gtk/gtktreeselection.h> -#include <gtk/gtkvbox.h> -#include <gtk/gtkvseparator.h> #include <gdk/gdkkeysyms.h> #include "../common/hexchat.h" @@ -58,10 +43,8 @@ #include "maingui.h" #include "menu.h" - #include "custom-list.h" - enum { COL_CHANNEL, diff --git a/src/fe-gtk/chanview-tree.c b/src/fe-gtk/chanview-tree.c index 9f626bbe..a7cd7235 100644 --- a/src/fe-gtk/chanview-tree.c +++ b/src/fe-gtk/chanview-tree.c @@ -31,7 +31,6 @@ typedef struct #include "maingui.h" #include <gdk/gdk.h> -#include <gtk/gtktreeview.h> static void /* row-activated, when a row is double clicked */ cv_tree_activated_cb (GtkTreeView *view, GtkTreePath *path, diff --git a/src/fe-gtk/chanview.c b/src/fe-gtk/chanview.c index 826ff69c..500ed1e5 100644 --- a/src/fe-gtk/chanview.c +++ b/src/fe-gtk/chanview.c @@ -22,14 +22,10 @@ #include <stdlib.h> #include <string.h> -#include <gtk/gtk.h> - -#include "chanview.h" #include "gtkutil.h" - +#include "chanview.h" /* treeStore columns */ - #define COL_NAME 0 /* (char *) */ #define COL_CHAN 1 /* (chan *) */ #define COL_ATTR 2 /* (PangoAttrList *) */ diff --git a/src/fe-gtk/dccgui.c b/src/fe-gtk/dccgui.c index ffb95218..0fb2e7e5 100644 --- a/src/fe-gtk/dccgui.c +++ b/src/fe-gtk/dccgui.c @@ -28,22 +28,6 @@ #include "../common/inet.h" #include "fe-gtk.h" -#include <gtk/gtkhbbox.h> -#include <gtk/gtkhbox.h> -#include <gtk/gtklabel.h> -#include <gtk/gtkstock.h> -#include <gtk/gtkmessagedialog.h> -#include <gtk/gtktable.h> -#include <gtk/gtktreeview.h> -#include <gtk/gtkexpander.h> -#include <gtk/gtkliststore.h> -#include <gtk/gtktreeselection.h> -#include <gtk/gtkcellrendererpixbuf.h> -#include <gtk/gtkcellrenderertext.h> -#include <gtk/gtkcheckmenuitem.h> -#include <gtk/gtkradiobutton.h> -#include <gtk/gtkversion.h> - #include "../common/hexchat.h" #include "../common/hexchatc.h" #include "../common/fe.h" diff --git a/src/fe-gtk/editlist.c b/src/fe-gtk/editlist.c index c1be5b23..4c4c4367 100644 --- a/src/fe-gtk/editlist.c +++ b/src/fe-gtk/editlist.c @@ -31,12 +31,6 @@ #include "fe-gtk.h" -#include <gtk/gtkstock.h> -#include <gtk/gtkentry.h> -#include <gtk/gtkclist.h> -#include <gtk/gtkhbox.h> -#include <gtk/gtkvseparator.h> - #include "../common/hexchat.h" #include "../common/cfgfiles.h" #include "../common/hexchatc.h" diff --git a/src/fe-gtk/fe-gtk.c b/src/fe-gtk/fe-gtk.c index b91ad2bb..355c2ef7 100644 --- a/src/fe-gtk/fe-gtk.c +++ b/src/fe-gtk/fe-gtk.c @@ -22,17 +22,9 @@ #include "fe-gtk.h" -#include <gtk/gtkmain.h> -#include <gtk/gtkentry.h> -#include <gtk/gtkprogressbar.h> -#include <gtk/gtkbox.h> -#include <gtk/gtklabel.h> -#include <gtk/gtktogglebutton.h> -#include <gtk/gtkmessagedialog.h> -#include <gtk/gtkversion.h> - #ifdef WIN32 #include <gdk/gdkwin32.h> +#include <windows.h> #else #include <unistd.h> #endif @@ -62,15 +54,6 @@ #ifdef USE_XLIB #include <gdk/gdkx.h> -#include <gtk/gtkinvisible.h> -#endif - -#ifdef USE_GTKSPELL -#include <gtk/gtktextview.h> -#endif - -#ifdef WIN32 -#include <windows.h> #endif GdkPixmap *channelwin_pix; diff --git a/src/fe-gtk/fe-gtk.h b/src/fe-gtk/fe-gtk.h index 321e3518..7b4132da 100644 --- a/src/fe-gtk/fe-gtk.h +++ b/src/fe-gtk/fe-gtk.h @@ -48,9 +48,7 @@ # define _(x) (x) #endif -#include <gtk/gtkwidget.h> -#include <gtk/gtkcontainer.h> -#include <gtk/gtksignal.h> +#include <gtk/gtk.h> #include "banlist.h" #undef gtk_signal_connect diff --git a/src/fe-gtk/fkeys.c b/src/fe-gtk/fkeys.c index 3a937e1a..f35ae466 100644 --- a/src/fe-gtk/fkeys.c +++ b/src/fe-gtk/fkeys.c @@ -32,20 +32,6 @@ #include "fe-gtk.h" -#include <glib.h> -#include <gtk/gtklabel.h> -#include <gtk/gtkeditable.h> -#include <gtk/gtkmenu.h> -#include <gtk/gtkmenuitem.h> -#include <gtk/gtkoptionmenu.h> -#include <gtk/gtkvbox.h> -#include <gtk/gtkhbox.h> -#include <gtk/gtkclist.h> -#include <gtk/gtknotebook.h> -#include <gtk/gtkcheckbutton.h> -#include <gtk/gtkentry.h> -#include <gtk/gtkvscrollbar.h> - #include "../common/hexchat.h" #include "../common/hexchatc.h" #include "../common/cfgfiles.h" @@ -65,10 +51,6 @@ #include "textgui.h" #include "fkeys.h" -#ifdef USE_GTKSPELL -#include <gtk/gtktextview.h> -#endif - static void replace_handle (GtkWidget * wid); void key_action_tab_clean (void); diff --git a/src/fe-gtk/gtkutil.c b/src/fe-gtk/gtkutil.c index 3743b5e3..41948e44 100644 --- a/src/fe-gtk/gtkutil.c +++ b/src/fe-gtk/gtkutil.c @@ -26,25 +26,6 @@ #include "fe-gtk.h" -#include <gtk/gtkbutton.h> -#include <gtk/gtkclist.h> -#include <gtk/gtkscrolledwindow.h> -#include <gtk/gtkmessagedialog.h> -#include <gtk/gtkwindow.h> -#include <gtk/gtkhbox.h> -#include <gtk/gtkimage.h> -#include <gtk/gtktooltips.h> -#include <gtk/gtklabel.h> -#include <gtk/gtkentry.h> -#include <gtk/gtkstock.h> -#include <gtk/gtkspinbutton.h> -#include <gtk/gtkclipboard.h> -#include <gtk/gtktreeview.h> -#include <gtk/gtktreeselection.h> -#include <gtk/gtkcellrenderertext.h> -#include <gtk/gtkcellrenderertoggle.h> -#include <gtk/gtkversion.h> -#include <gtk/gtkfilechooserdialog.h> #include <gdk/gdkkeysyms.h> #include "../common/hexchat.h" diff --git a/src/fe-gtk/gtkutil.h b/src/fe-gtk/gtkutil.h index 0c358953..e3f59a29 100644 --- a/src/fe-gtk/gtkutil.h +++ b/src/fe-gtk/gtkutil.h @@ -20,8 +20,7 @@ #ifndef HEXCHAT_GTKUTIL_H #define HEXCHAT_GTKUTIL_H -#include <gtk/gtktreeview.h> -#include <gtk/gtktreemodel.h> +#include <gtk/gtk.h> typedef void (*filereqcallback) (void *, char *file); diff --git a/src/fe-gtk/ignoregui.c b/src/fe-gtk/ignoregui.c index 42fbe0c6..ae2dbd94 100644 --- a/src/fe-gtk/ignoregui.c +++ b/src/fe-gtk/ignoregui.c @@ -24,22 +24,6 @@ #include <fcntl.h> #include "fe-gtk.h" -#include <gtk/gtkcheckbutton.h> -#include <gtk/gtkentry.h> -#include <gtk/gtkstock.h> -#include <gtk/gtkhbox.h> -#include <gtk/gtkhbbox.h> -#include <gtk/gtkframe.h> -#include <gtk/gtkhseparator.h> -#include <gtk/gtkversion.h> - -#include <gtk/gtkliststore.h> -#include <gtk/gtktreeview.h> -#include <gtk/gtkmessagedialog.h> -#include <gtk/gtktreeselection.h> -#include <gtk/gtkcellrenderertext.h> -#include <gtk/gtkcellrenderertoggle.h> - #include "../common/hexchat.h" #include "../common/ignore.h" #include "../common/cfgfiles.h" diff --git a/src/fe-gtk/joind.c b/src/fe-gtk/joind.c index cbc2251f..b58d662a 100644 --- a/src/fe-gtk/joind.c +++ b/src/fe-gtk/joind.c @@ -31,18 +31,6 @@ #include <unistd.h> #endif -#include <gtk/gtk.h> -#include <gtk/gtkbbox.h> -#include <gtk/gtkbutton.h> -#include <gtk/gtkdialog.h> -#include <gtk/gtkentry.h> -#include <gtk/gtkhbox.h> -#include <gtk/gtkimage.h> -#include <gtk/gtklabel.h> -#include <gtk/gtkradiobutton.h> -#include <gtk/gtkvbox.h> -#include <gtk/gtkwindow.h> - #include "../common/hexchat.h" #include "../common/hexchatc.h" #include "../common/server.h" diff --git a/src/fe-gtk/maingui.c b/src/fe-gtk/maingui.c index 4abb433e..816a93f7 100644 --- a/src/fe-gtk/maingui.c +++ b/src/fe-gtk/maingui.c @@ -21,29 +21,6 @@ #include <stdio.h> #include <ctype.h> -#include <gtk/gtkarrow.h> -#include <gtk/gtktogglebutton.h> -#include <gtk/gtkhbox.h> -#include <gtk/gtkvbox.h> -#include <gtk/gtkeventbox.h> -#include <gtk/gtkentry.h> -#include <gtk/gtkhpaned.h> -#include <gtk/gtkvpaned.h> -#include <gtk/gtkframe.h> -#include <gtk/gtklabel.h> -#include <gtk/gtkmenuitem.h> -#include <gtk/gtkprogressbar.h> -#include <gtk/gtkscrolledwindow.h> -#include <gtk/gtkstock.h> -#include <gtk/gtktable.h> -#include <gtk/gtknotebook.h> -#include <gtk/gtkimage.h> -#include <gtk/gtkmessagedialog.h> -#include <gtk/gtkcheckmenuitem.h> -#include <gtk/gtkcheckbutton.h> -#include <gtk/gtkbbox.h> -#include <gtk/gtkvscrollbar.h> - #include "../common/hexchat.h" #include "../common/fe.h" #include "../common/server.h" @@ -71,7 +48,6 @@ #include "xtext.h" #ifdef USE_GTKSPELL -#include <gtk/gtktextview.h> #include <gtkspell/gtkspell.h> #endif diff --git a/src/fe-gtk/menu.c b/src/fe-gtk/menu.c index f5f6b456..4536e333 100644 --- a/src/fe-gtk/menu.c +++ b/src/fe-gtk/menu.c @@ -30,18 +30,6 @@ #include "fe-gtk.h" -#include <gtk/gtkhbox.h> -#include <gtk/gtkcheckmenuitem.h> -#include <gtk/gtkentry.h> -#include <gtk/gtkimage.h> -#include <gtk/gtkimagemenuitem.h> -#include <gtk/gtkradiomenuitem.h> -#include <gtk/gtklabel.h> -#include <gtk/gtkmessagedialog.h> -#include <gtk/gtkmenu.h> -#include <gtk/gtkmenubar.h> -#include <gtk/gtkstock.h> -#include <gtk/gtkversion.h> #include <gdk/gdkkeysyms.h> #include "../common/hexchat.h" diff --git a/src/fe-gtk/notifygui.c b/src/fe-gtk/notifygui.c index 4d144258..3c3b6a6e 100644 --- a/src/fe-gtk/notifygui.c +++ b/src/fe-gtk/notifygui.c @@ -24,20 +24,6 @@ #include "fe-gtk.h" -#include <gtk/gtkhbox.h> -#include <gtk/gtkstock.h> -#include <gtk/gtkhbbox.h> -#include <gtk/gtkscrolledwindow.h> - -#include <gtk/gtklabel.h> -#include <gtk/gtkliststore.h> -#include <gtk/gtkentry.h> -#include <gtk/gtkmessagedialog.h> -#include <gtk/gtktable.h> -#include <gtk/gtktreeview.h> -#include <gtk/gtktreeselection.h> -#include <gtk/gtkcellrenderertext.h> - #include "../common/hexchat.h" #include "../common/notify.h" #include "../common/cfgfiles.h" diff --git a/src/fe-gtk/pixmaps.c b/src/fe-gtk/pixmaps.c index 419ef4c1..bdd74e1e 100644 --- a/src/fe-gtk/pixmaps.c +++ b/src/fe-gtk/pixmaps.c @@ -26,8 +26,6 @@ #include "../common/fe.h" #include <gdk-pixbuf/gdk-pixbuf.h> -#include <gdk-pixbuf/gdk-pixdata.h> -#include <gtk/gtkstock.h> #include "../pixmaps/inline_pngs.h" diff --git a/src/fe-gtk/plugin-tray.c b/src/fe-gtk/plugin-tray.c index 033cfaeb..cf9d036b 100644 --- a/src/fe-gtk/plugin-tray.c +++ b/src/fe-gtk/plugin-tray.c @@ -29,7 +29,6 @@ #include "pixmaps.h" #include "maingui.h" #include "menu.h" -#include <gtk/gtk.h> #ifndef WIN32 #include <unistd.h> diff --git a/src/fe-gtk/plugingui.c b/src/fe-gtk/plugingui.c index b2cb95d7..48152d78 100644 --- a/src/fe-gtk/plugingui.c +++ b/src/fe-gtk/plugingui.c @@ -22,17 +22,6 @@ #include "fe-gtk.h" -#include <gtk/gtkdialog.h> -#include <gtk/gtkstock.h> -#include <gtk/gtkbox.h> -#include <gtk/gtkhbbox.h> -#include <gtk/gtkscrolledwindow.h> - -#include <gtk/gtkliststore.h> -#include <gtk/gtktreeview.h> -#include <gtk/gtktreeselection.h> -#include <gtk/gtkcellrenderertext.h> - #include "../common/hexchat.h" #define PLUGIN_C typedef struct session hexchat_context; diff --git a/src/fe-gtk/rawlog.c b/src/fe-gtk/rawlog.c index 651ca1ec..d0564406 100644 --- a/src/fe-gtk/rawlog.c +++ b/src/fe-gtk/rawlog.c @@ -29,11 +29,6 @@ #include "fe-gtk.h" -#include <gtk/gtkbutton.h> -#include <gtk/gtkhbbox.h> -#include <gtk/gtkhbox.h> -#include <gtk/gtkvscrollbar.h> -#include <gtk/gtkstock.h> #include <gdk/gdkkeysyms.h> #include "../common/hexchat.h" diff --git a/src/fe-gtk/search.c b/src/fe-gtk/search.c index f2940e70..49c30a14 100644 --- a/src/fe-gtk/search.c +++ b/src/fe-gtk/search.c @@ -22,17 +22,6 @@ #include "fe-gtk.h" -#include <gtk/gtkentry.h> -#include <gtk/gtkhbox.h> -#include <gtk/gtkvbox.h> -#include <gtk/gtklabel.h> -#include <gtk/gtkstock.h> -#include <gtk/gtkhbbox.h> -#include <gtk/gtkhseparator.h> -#include <gtk/gtkvseparator.h> -#include <gtk/gtkradiobutton.h> -#include <gtk/gtktogglebutton.h> - #include "../common/hexchat.h" #include "../common/fe.h" #include "../common/util.h" diff --git a/src/fe-gtk/servlistgui.c b/src/fe-gtk/servlistgui.c index b312e8de..774ce1cc 100644 --- a/src/fe-gtk/servlistgui.c +++ b/src/fe-gtk/servlistgui.c @@ -21,29 +21,6 @@ #include <string.h> #include <ctype.h> -#include <gtk/gtkversion.h> -#include <gtk/gtkcheckbutton.h> -#include <gtk/gtkcellrenderertext.h> -#include <gtk/gtkcomboboxentry.h> -#include <gtk/gtkentry.h> -#include <gtk/gtkhbox.h> -#include <gtk/gtkhbbox.h> -#include <gtk/gtkhseparator.h> -#include <gtk/gtkimage.h> -#include <gtk/gtklabel.h> -#include <gtk/gtkliststore.h> -#include <gtk/gtkmenuitem.h> -#include <gtk/gtkmessagedialog.h> -#include <gtk/gtkscrolledwindow.h> -#include <gtk/gtkstock.h> -#include <gtk/gtktable.h> -#include <gtk/gtktogglebutton.h> -#include <gtk/gtktree.h> -#include <gtk/gtktreeselection.h> -#include <gtk/gtktreeview.h> -#include <gtk/gtkvbbox.h> -#include <gtk/gtkvbox.h> -#include <gtk/gtkwindow.h> #include <gdk/gdkkeysyms.h> #include "../common/hexchat.h" diff --git a/src/fe-gtk/setup.c b/src/fe-gtk/setup.c index a51179b6..ac8826cf 100644 --- a/src/fe-gtk/setup.c +++ b/src/fe-gtk/setup.c @@ -37,36 +37,10 @@ #include "menu.h" #include "plugin-tray.h" -#include <gtk/gtkcolorseldialog.h> -#include <gtk/gtktable.h> -#include <gtk/gtkentry.h> -#include <gtk/gtklabel.h> -#include <gtk/gtkmisc.h> -#include <gtk/gtkhbox.h> -#include <gtk/gtkvbox.h> -#include <gtk/gtkalignment.h> -#include <gtk/gtknotebook.h> -#include <gtk/gtkframe.h> -#include <gtk/gtkfontsel.h> -#include <gtk/gtkcheckbutton.h> -#include <gtk/gtkscrolledwindow.h> -#include <gtk/gtkspinbutton.h> -#include <gtk/gtkstock.h> -#include <gtk/gtktreeview.h> -#include <gtk/gtkhbbox.h> -#include <gtk/gtkhseparator.h> -#include <gtk/gtkradiobutton.h> -#include <gtk/gtkcombobox.h> -#include <gtk/gtkliststore.h> -#include <gtk/gtktreestore.h> -#include <gtk/gtktreeselection.h> -#include <gtk/gtkcellrenderertext.h> -#include <gtk/gtkhscale.h> #ifdef WIN32 #include "../common/fe.h" #endif #ifdef USE_GTKSPELL -#include <gtk/gtktextview.h> #include <gtkspell/gtkspell.h> #endif #ifdef USE_LIBSEXY diff --git a/src/fe-gtk/sexy-marshal.c b/src/fe-gtk/sexy-marshal.c index 1704c7b3..363842ca 100644 --- a/src/fe-gtk/sexy-marshal.c +++ b/src/fe-gtk/sexy-marshal.c @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <glib-object.h> +#include <glib-object.h> #ifdef G_ENABLE_DEBUG diff --git a/src/fe-gtk/sexy-marshal.h b/src/fe-gtk/sexy-marshal.h index 0f28605d..aa560767 100644 --- a/src/fe-gtk/sexy-marshal.h +++ b/src/fe-gtk/sexy-marshal.h @@ -19,7 +19,7 @@ #ifndef __sexy_marshal_MARSHAL_H__ #define __sexy_marshal_MARSHAL_H__ -#include <glib-object.h> +#include <glib-object.h> G_BEGIN_DECLS diff --git a/src/fe-gtk/sexy-spell-entry.h b/src/fe-gtk/sexy-spell-entry.h index 9278ba8d..1c761235 100644 --- a/src/fe-gtk/sexy-spell-entry.h +++ b/src/fe-gtk/sexy-spell-entry.h @@ -22,7 +22,7 @@ typedef struct _SexySpellEntry SexySpellEntry; typedef struct _SexySpellEntryClass SexySpellEntryClass; typedef struct _SexySpellEntryPriv SexySpellEntryPriv; -#include <gtk/gtkentry.h> +#include <gtk/gtk.h> #define SEXY_TYPE_SPELL_ENTRY (sexy_spell_entry_get_type()) #define SEXY_SPELL_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), SEXY_TYPE_SPELL_ENTRY, SexySpellEntry)) diff --git a/src/fe-gtk/textgui.c b/src/fe-gtk/textgui.c index 7e006e69..0bdb4476 100644 --- a/src/fe-gtk/textgui.c +++ b/src/fe-gtk/textgui.c @@ -26,16 +26,6 @@ #include "fe-gtk.h" -#include <gtk/gtkbutton.h> -#include <gtk/gtkentry.h> -#include <gtk/gtkhbox.h> -#include <gtk/gtkhbbox.h> -#include <gtk/gtkliststore.h> -#include <gtk/gtkstock.h> -#include <gtk/gtkvbox.h> -#include <gtk/gtkvpaned.h> -#include <gtk/gtkvscrollbar.h> - #include "../common/hexchat.h" #include "../common/hexchatc.h" #include "../common/cfgfiles.h" diff --git a/src/fe-gtk/urlgrab.c b/src/fe-gtk/urlgrab.c index 0e27efdc..be62239e 100644 --- a/src/fe-gtk/urlgrab.c +++ b/src/fe-gtk/urlgrab.c @@ -22,16 +22,6 @@ #include "fe-gtk.h" -#include <gtk/gtkhbox.h> -#include <gtk/gtkstock.h> -#include <gtk/gtkhbbox.h> -#include <gtk/gtkscrolledwindow.h> - -#include <gtk/gtkliststore.h> -#include <gtk/gtktreeview.h> -#include <gtk/gtktreeselection.h> -#include <gtk/gtkcellrenderertext.h> - #include "../common/hexchat.h" #include "../common/hexchatc.h" #include "../common/cfgfiles.h" diff --git a/src/fe-gtk/userlistgui.c b/src/fe-gtk/userlistgui.c index 35728c8f..c2f2a462 100644 --- a/src/fe-gtk/userlistgui.c +++ b/src/fe-gtk/userlistgui.c @@ -22,16 +22,6 @@ #include "fe-gtk.h" -#include <gtk/gtkbox.h> -#include <gtk/gtklabel.h> -#include <gtk/gtkdnd.h> -#include <gtk/gtkentry.h> -#include <gtk/gtktreeview.h> -#include <gtk/gtktreeselection.h> -#include <gtk/gtkscrolledwindow.h> -#include <gtk/gtkcellrendererpixbuf.h> -#include <gtk/gtkcellrenderertext.h> -#include <gtk/gtkliststore.h> #include <gdk/gdkkeysyms.h> #include "../common/hexchat.h" @@ -50,11 +40,6 @@ #include "userlistgui.h" #include "fkeys.h" -#ifdef USE_GTKSPELL -#include <gtk/gtktextview.h> -#endif - - enum { COL_PIX=0, // GdkPixbuf * diff --git a/src/fe-gtk/xtext.c b/src/fe-gtk/xtext.c index 5b85022e..e151524d 100644 --- a/src/fe-gtk/xtext.c +++ b/src/fe-gtk/xtext.c @@ -42,12 +42,6 @@ #include <ctype.h> #include <stdlib.h> #include <time.h> -#include <gtk/gtkmain.h> -#include <gtk/gtksignal.h> -#include <gtk/gtkselection.h> -#include <gtk/gtkclipboard.h> -#include <gtk/gtkversion.h> -#include <gtk/gtkwindow.h> #ifdef HEXCHAT #ifdef WIN32 diff --git a/src/fe-gtk/xtext.h b/src/fe-gtk/xtext.h index 1ba3483a..8a4b26cf 100644 --- a/src/fe-gtk/xtext.h +++ b/src/fe-gtk/xtext.h @@ -20,7 +20,7 @@ #ifndef HEXCHAT_XTEXT_H #define HEXCHAT_XTEXT_H -#include <gtk/gtkadjustment.h> +#include <gtk/gtk.h> #ifdef USE_XFT #include <X11/Xft/Xft.h> #endif |