Merge pull request #496 from bviktor/toplevel-includes

Only include top level includes from GTK+, GLib and GDK-PixBuf Closes #486
This commit is contained in:
TingPing 2013-04-02 22:39:17 -07:00
commit 8b72d53dcc
41 changed files with 14 additions and 348 deletions

View File

@ -191,7 +191,7 @@ if test "$glib" = no; then
AC_MSG_ERROR(Cannot find GLib!) AC_MSG_ERROR(Cannot find GLib!)
fi fi
COMMON_CFLAGS="$GLIB_CFLAGS" COMMON_CFLAGS="$GLIB_CFLAGS -DG_DISABLE_SINGLE_INCLUDES"
COMMON_LIBS="$GLIB_LIBS" COMMON_LIBS="$GLIB_LIBS"
COMMON_LIBS="$COMMON_LIBS -lgmodule-2.0 -lgobject-2.0" COMMON_LIBS="$COMMON_LIBS -lgmodule-2.0 -lgobject-2.0"
@ -222,7 +222,7 @@ dnl ** GNOME ************************************************************
dnl ********************************************************************* dnl *********************************************************************
GUI_LIBS="$GUI_LIBS $GTK_LIBS" GUI_LIBS="$GUI_LIBS $GTK_LIBS"
GUI_CFLAGS="$GUI_CFLAGS $GTK_CFLAGS" GUI_CFLAGS="$GUI_CFLAGS $GTK_CFLAGS -DG_DISABLE_CAST_CHECKS -DG_DISABLE_SINGLE_INCLUDES -DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_SINGLE_INCLUDES"
#if test "$gnome" = yes; then #if test "$gnome" = yes; then
# AC_PATH_PROG(pkgconfigpath, pkg-config) # AC_PATH_PROG(pkgconfigpath, pkg-config)

View File

@ -19,8 +19,6 @@
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <glib.h>
#include <glib/gprintf.h>
#include "hexchat.h" #include "hexchat.h"
#include "hexchatc.h" #include "hexchatc.h"
@ -34,6 +32,8 @@
#include <strings.h> #include <strings.h>
#endif #endif
#include <glib/gprintf.h>
typedef struct typedef struct
{ {
server *serv; server *serv;

View File

@ -27,8 +27,6 @@
#endif #endif
#include "hexchat.h" #include "hexchat.h"
#include <glib.h>
#include "cfgfiles.h" #include "cfgfiles.h"
#include "fe.h" #include "fe.h"
#include "server.h" #include "server.h"

View File

@ -33,7 +33,6 @@
#endif #endif
#include "hexchat.h" #include "hexchat.h"
#include <glib.h>
#include "cfgfiles.h" #include "cfgfiles.h"
#include "chanopt.h" #include "chanopt.h"
#include "plugin.h" #include "plugin.h"

View File

@ -48,7 +48,6 @@
#include <errno.h> #include <errno.h>
#include "hexchat.h" #include "hexchat.h"
#include "hexchatc.h" #include "hexchatc.h"
#include <glib.h>
#include <ctype.h> #include <ctype.h>
#include "util.h" #include "util.h"

View File

@ -2,7 +2,7 @@ localedir = $(datadir)/locale
bin_PROGRAMS = hexchat bin_PROGRAMS = hexchat
AM_CPPFLAGS = $(GUI_CFLAGS) -DG_DISABLE_CAST_CHECKS -DLOCALEDIR=\"$(localedir)\" AM_CPPFLAGS = $(GUI_CFLAGS) -DLOCALEDIR=\"$(localedir)\"
hexchat_LDADD = ../common/libhexchatcommon.a $(GUI_LIBS) hexchat_LDADD = ../common/libhexchatcommon.a $(GUI_LIBS)

View File

@ -22,17 +22,6 @@
#include "fe-gtk.h" #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 #ifdef USE_XLIB
#include <gdk/gdkx.h> #include <gdk/gdkx.h>
#endif #endif

View File

@ -22,12 +22,6 @@
#include "fe-gtk.h" #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/hexchat.h"
#include "../common/hexchatc.h" #include "../common/hexchatc.h"
#include "gtkutil.h" #include "gtkutil.h"

View File

@ -28,19 +28,6 @@
#include "fe-gtk.h" #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/hexchat.h"
#include "../common/fe.h" #include "../common/fe.h"
#include "../common/modes.h" #include "../common/modes.h"

View File

@ -30,21 +30,6 @@
#include "fe-gtk.h" #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 <gdk/gdkkeysyms.h>
#include "../common/hexchat.h" #include "../common/hexchat.h"
@ -58,10 +43,8 @@
#include "maingui.h" #include "maingui.h"
#include "menu.h" #include "menu.h"
#include "custom-list.h" #include "custom-list.h"
enum enum
{ {
COL_CHANNEL, COL_CHANNEL,

View File

@ -31,7 +31,6 @@ typedef struct
#include "maingui.h" #include "maingui.h"
#include <gdk/gdk.h> #include <gdk/gdk.h>
#include <gtk/gtktreeview.h>
static void /* row-activated, when a row is double clicked */ static void /* row-activated, when a row is double clicked */
cv_tree_activated_cb (GtkTreeView *view, GtkTreePath *path, cv_tree_activated_cb (GtkTreeView *view, GtkTreePath *path,

View File

@ -22,14 +22,10 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <gtk/gtk.h>
#include "chanview.h"
#include "gtkutil.h" #include "gtkutil.h"
#include "chanview.h"
/* treeStore columns */ /* treeStore columns */
#define COL_NAME 0 /* (char *) */ #define COL_NAME 0 /* (char *) */
#define COL_CHAN 1 /* (chan *) */ #define COL_CHAN 1 /* (chan *) */
#define COL_ATTR 2 /* (PangoAttrList *) */ #define COL_ATTR 2 /* (PangoAttrList *) */

View File

@ -28,22 +28,6 @@
#include "../common/inet.h" #include "../common/inet.h"
#include "fe-gtk.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/hexchat.h"
#include "../common/hexchatc.h" #include "../common/hexchatc.h"
#include "../common/fe.h" #include "../common/fe.h"

View File

@ -31,12 +31,6 @@
#include "fe-gtk.h" #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/hexchat.h"
#include "../common/cfgfiles.h" #include "../common/cfgfiles.h"
#include "../common/hexchatc.h" #include "../common/hexchatc.h"

View File

@ -22,17 +22,9 @@
#include "fe-gtk.h" #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 #ifdef WIN32
#include <gdk/gdkwin32.h> #include <gdk/gdkwin32.h>
#include <windows.h>
#else #else
#include <unistd.h> #include <unistd.h>
#endif #endif
@ -62,15 +54,6 @@
#ifdef USE_XLIB #ifdef USE_XLIB
#include <gdk/gdkx.h> #include <gdk/gdkx.h>
#include <gtk/gtkinvisible.h>
#endif
#ifdef USE_GTKSPELL
#include <gtk/gtktextview.h>
#endif
#ifdef WIN32
#include <windows.h>
#endif #endif
GdkPixmap *channelwin_pix; GdkPixmap *channelwin_pix;

View File

@ -48,9 +48,7 @@
# define _(x) (x) # define _(x) (x)
#endif #endif
#include <gtk/gtkwidget.h> #include <gtk/gtk.h>
#include <gtk/gtkcontainer.h>
#include <gtk/gtksignal.h>
#include "banlist.h" #include "banlist.h"
#undef gtk_signal_connect #undef gtk_signal_connect

View File

@ -32,20 +32,6 @@
#include "fe-gtk.h" #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/hexchat.h"
#include "../common/hexchatc.h" #include "../common/hexchatc.h"
#include "../common/cfgfiles.h" #include "../common/cfgfiles.h"
@ -65,10 +51,6 @@
#include "textgui.h" #include "textgui.h"
#include "fkeys.h" #include "fkeys.h"
#ifdef USE_GTKSPELL
#include <gtk/gtktextview.h>
#endif
static void replace_handle (GtkWidget * wid); static void replace_handle (GtkWidget * wid);
void key_action_tab_clean (void); void key_action_tab_clean (void);

View File

@ -26,25 +26,6 @@
#include "fe-gtk.h" #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 <gdk/gdkkeysyms.h>
#include "../common/hexchat.h" #include "../common/hexchat.h"

View File

@ -20,8 +20,7 @@
#ifndef HEXCHAT_GTKUTIL_H #ifndef HEXCHAT_GTKUTIL_H
#define HEXCHAT_GTKUTIL_H #define HEXCHAT_GTKUTIL_H
#include <gtk/gtktreeview.h> #include <gtk/gtk.h>
#include <gtk/gtktreemodel.h>
typedef void (*filereqcallback) (void *, char *file); typedef void (*filereqcallback) (void *, char *file);

View File

@ -24,22 +24,6 @@
#include <fcntl.h> #include <fcntl.h>
#include "fe-gtk.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/hexchat.h"
#include "../common/ignore.h" #include "../common/ignore.h"
#include "../common/cfgfiles.h" #include "../common/cfgfiles.h"

View File

@ -31,18 +31,6 @@
#include <unistd.h> #include <unistd.h>
#endif #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/hexchat.h"
#include "../common/hexchatc.h" #include "../common/hexchatc.h"
#include "../common/server.h" #include "../common/server.h"

View File

@ -21,29 +21,6 @@
#include <stdio.h> #include <stdio.h>
#include <ctype.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/hexchat.h"
#include "../common/fe.h" #include "../common/fe.h"
#include "../common/server.h" #include "../common/server.h"
@ -71,7 +48,6 @@
#include "xtext.h" #include "xtext.h"
#ifdef USE_GTKSPELL #ifdef USE_GTKSPELL
#include <gtk/gtktextview.h>
#include <gtkspell/gtkspell.h> #include <gtkspell/gtkspell.h>
#endif #endif

View File

@ -30,18 +30,6 @@
#include "fe-gtk.h" #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 <gdk/gdkkeysyms.h>
#include "../common/hexchat.h" #include "../common/hexchat.h"

View File

@ -24,20 +24,6 @@
#include "fe-gtk.h" #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/hexchat.h"
#include "../common/notify.h" #include "../common/notify.h"
#include "../common/cfgfiles.h" #include "../common/cfgfiles.h"

View File

@ -26,8 +26,6 @@
#include "../common/fe.h" #include "../common/fe.h"
#include <gdk-pixbuf/gdk-pixbuf.h> #include <gdk-pixbuf/gdk-pixbuf.h>
#include <gdk-pixbuf/gdk-pixdata.h>
#include <gtk/gtkstock.h>
#include "../pixmaps/inline_pngs.h" #include "../pixmaps/inline_pngs.h"

View File

@ -29,7 +29,6 @@
#include "pixmaps.h" #include "pixmaps.h"
#include "maingui.h" #include "maingui.h"
#include "menu.h" #include "menu.h"
#include <gtk/gtk.h>
#ifndef WIN32 #ifndef WIN32
#include <unistd.h> #include <unistd.h>

View File

@ -22,17 +22,6 @@
#include "fe-gtk.h" #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" #include "../common/hexchat.h"
#define PLUGIN_C #define PLUGIN_C
typedef struct session hexchat_context; typedef struct session hexchat_context;

View File

@ -29,11 +29,6 @@
#include "fe-gtk.h" #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 <gdk/gdkkeysyms.h>
#include "../common/hexchat.h" #include "../common/hexchat.h"

View File

@ -22,17 +22,6 @@
#include "fe-gtk.h" #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/hexchat.h"
#include "../common/fe.h" #include "../common/fe.h"
#include "../common/util.h" #include "../common/util.h"

View File

@ -21,29 +21,6 @@
#include <string.h> #include <string.h>
#include <ctype.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 <gdk/gdkkeysyms.h>
#include "../common/hexchat.h" #include "../common/hexchat.h"

View File

@ -37,36 +37,10 @@
#include "menu.h" #include "menu.h"
#include "plugin-tray.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 #ifdef WIN32
#include "../common/fe.h" #include "../common/fe.h"
#endif #endif
#ifdef USE_GTKSPELL #ifdef USE_GTKSPELL
#include <gtk/gtktextview.h>
#include <gtkspell/gtkspell.h> #include <gtkspell/gtkspell.h>
#endif #endif
#ifdef USE_LIBSEXY #ifdef USE_LIBSEXY

View File

@ -16,7 +16,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include <glib-object.h> #include <glib-object.h>
#ifdef G_ENABLE_DEBUG #ifdef G_ENABLE_DEBUG

View File

@ -19,7 +19,7 @@
#ifndef __sexy_marshal_MARSHAL_H__ #ifndef __sexy_marshal_MARSHAL_H__
#define __sexy_marshal_MARSHAL_H__ #define __sexy_marshal_MARSHAL_H__
#include <glib-object.h> #include <glib-object.h>
G_BEGIN_DECLS G_BEGIN_DECLS

View File

@ -22,7 +22,7 @@ typedef struct _SexySpellEntry SexySpellEntry;
typedef struct _SexySpellEntryClass SexySpellEntryClass; typedef struct _SexySpellEntryClass SexySpellEntryClass;
typedef struct _SexySpellEntryPriv SexySpellEntryPriv; typedef struct _SexySpellEntryPriv SexySpellEntryPriv;
#include <gtk/gtkentry.h> #include <gtk/gtk.h>
#define SEXY_TYPE_SPELL_ENTRY (sexy_spell_entry_get_type()) #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)) #define SEXY_SPELL_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), SEXY_TYPE_SPELL_ENTRY, SexySpellEntry))

View File

@ -26,16 +26,6 @@
#include "fe-gtk.h" #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/hexchat.h"
#include "../common/hexchatc.h" #include "../common/hexchatc.h"
#include "../common/cfgfiles.h" #include "../common/cfgfiles.h"

View File

@ -22,16 +22,6 @@
#include "fe-gtk.h" #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/hexchat.h"
#include "../common/hexchatc.h" #include "../common/hexchatc.h"
#include "../common/cfgfiles.h" #include "../common/cfgfiles.h"

View File

@ -22,16 +22,6 @@
#include "fe-gtk.h" #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 <gdk/gdkkeysyms.h>
#include "../common/hexchat.h" #include "../common/hexchat.h"
@ -50,11 +40,6 @@
#include "userlistgui.h" #include "userlistgui.h"
#include "fkeys.h" #include "fkeys.h"
#ifdef USE_GTKSPELL
#include <gtk/gtktextview.h>
#endif
enum enum
{ {
COL_PIX=0, // GdkPixbuf * COL_PIX=0, // GdkPixbuf *

View File

@ -42,12 +42,6 @@
#include <ctype.h> #include <ctype.h>
#include <stdlib.h> #include <stdlib.h>
#include <time.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 HEXCHAT
#ifdef WIN32 #ifdef WIN32

View File

@ -20,7 +20,7 @@
#ifndef HEXCHAT_XTEXT_H #ifndef HEXCHAT_XTEXT_H
#define HEXCHAT_XTEXT_H #define HEXCHAT_XTEXT_H
#include <gtk/gtkadjustment.h> #include <gtk/gtk.h>
#ifdef USE_XFT #ifdef USE_XFT
#include <X11/Xft/Xft.h> #include <X11/Xft/Xft.h>
#endif #endif

View File

@ -32,7 +32,6 @@
#endif #endif
#include <sys/types.h> #include <sys/types.h>
#include <ctype.h> #include <ctype.h>
#include <glib.h>
#include <glib-object.h> #include <glib-object.h>
#include "../common/hexchat.h" #include "../common/hexchat.h"
#include "../common/hexchatc.h" #include "../common/hexchatc.h"

View File

@ -15,7 +15,7 @@
<!-- YOU SHOULDN'T TOUCH ANYTHING BELOW --> <!-- YOU SHOULDN'T TOUCH ANYTHING BELOW -->
<!-- G_DISABLE_DEPRECATED is unfeasible due to g_completion_* --> <!-- G_DISABLE_DEPRECATED is unfeasible due to g_completion_* -->
<OwnFlags>G_DISABLE_CAST_CHECKS;GDK_PIXBUF_DISABLE_DEPRECATED;HAVE_STRTOULL;strtoull=_strtoui64;strcasecmp=stricmp;strncasecmp=strnicmp;__inline__=__inline;</OwnFlags> <OwnFlags>G_DISABLE_CAST_CHECKS;GDK_PIXBUF_DISABLE_DEPRECATED;G_DISABLE_SINGLE_INCLUDES;GDK_PIXBUF_DISABLE_SINGLE_INCLUDES;GTK_DISABLE_SINGLE_INCLUDES;HAVE_STRTOULL;strtoull=_strtoui64;strcasecmp=stricmp;strncasecmp=strnicmp;__inline__=__inline</OwnFlags>
<DepsRoot>$(YourDepsPath)\$(PlatformName)</DepsRoot> <DepsRoot>$(YourDepsPath)\$(PlatformName)</DepsRoot>
<GendefPath>$(YourGendefPath)</GendefPath> <GendefPath>$(YourGendefPath)</GendefPath>
<MsgfmtPath>$(YourMsgfmtPath)</MsgfmtPath> <MsgfmtPath>$(YourMsgfmtPath)</MsgfmtPath>