# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1092978690 0
# Node ID 4a15962c344ac5d2529dd7394e36701fc1d4bc47
# Parent  f8b2630ca694284889bf46a728f029f562c28f44
[gaim-migrate @ 10659]
A patch from Gary Kramlich that renames gtkinternal.h to
gtkgaim.h, and makes it not include internal.h

There were some reasons for this... but basically it's cleaner.

committer: Tailor Script <tailor@pidgin.im>

diff -r f8b2630ca694 -r 4a15962c344a plugins/docklet/docklet-x11.c
--- a/plugins/docklet/docklet-x11.c	Fri Aug 20 04:59:53 2004 +0000
+++ b/plugins/docklet/docklet-x11.c	Fri Aug 20 05:11:30 2004 +0000
@@ -23,7 +23,7 @@
  */
 
 #include "internal.h"
-#include "gtkinternal.h"
+#include "gtkgaim.h"
 #include "debug.h"
 #include "stock.h"
 
diff -r f8b2630ca694 -r 4a15962c344a plugins/docklet/docklet.c
--- a/plugins/docklet/docklet.c	Fri Aug 20 04:59:53 2004 +0000
+++ b/plugins/docklet/docklet.c	Fri Aug 20 05:11:30 2004 +0000
@@ -30,7 +30,7 @@
     - optional pop up notices when GNOME2's system-tray-applet supports it */
 
 #include "internal.h"
-#include "gtkinternal.h"
+#include "gtkgaim.h"
 
 #include "core.h"
 #include "debug.h"
diff -r f8b2630ca694 -r 4a15962c344a plugins/extplacement.c
--- a/plugins/extplacement.c	Fri Aug 20 04:59:53 2004 +0000
+++ b/plugins/extplacement.c	Fri Aug 20 05:11:30 2004 +0000
@@ -21,6 +21,7 @@
  */
 
 #include "internal.h"
+#include "gtkgaim.h"
 #include "conversation.h"
 #include "gtkplugin.h"
 
diff -r f8b2630ca694 -r 4a15962c344a plugins/gaim-remote/remote.c
--- a/plugins/gaim-remote/remote.c	Fri Aug 20 04:59:53 2004 +0000
+++ b/plugins/gaim-remote/remote.c	Fri Aug 20 05:11:30 2004 +0000
@@ -22,7 +22,7 @@
  * @todo Make this a core plugin!
  */
 #include "internal.h"
-#include "gtkinternal.h"
+#include "gtkgaim.h"
 
 #ifndef _WIN32
 # include <sys/un.h>
diff -r f8b2630ca694 -r 4a15962c344a plugins/gestures/gestures.c
--- a/plugins/gestures/gestures.c	Fri Aug 20 04:59:53 2004 +0000
+++ b/plugins/gestures/gestures.c	Fri Aug 20 05:11:30 2004 +0000
@@ -19,7 +19,7 @@
  * 02111-1307, USA.
  */
 #include "internal.h"
-#include "gtkinternal.h"
+#include "gtkgaim.h"
 
 #include "debug.h"
 #include "prefs.h"
diff -r f8b2630ca694 -r 4a15962c344a plugins/history.c
--- a/plugins/history.c	Fri Aug 20 04:59:53 2004 +0000
+++ b/plugins/history.c	Fri Aug 20 05:11:30 2004 +0000
@@ -1,7 +1,8 @@
 /* Puts last 4k of log in new conversations a la Everybuddy (and then
  * stolen by Trillian "Pro") */
 
-#include "gtkinternal.h"
+#include "internal.h"
+#include "gtkgaim.h"
 
 #include "conversation.h"
 #include "debug.h"
diff -r f8b2630ca694 -r 4a15962c344a plugins/iconaway.c
--- a/plugins/iconaway.c	Fri Aug 20 04:59:53 2004 +0000
+++ b/plugins/iconaway.c	Fri Aug 20 05:11:30 2004 +0000
@@ -1,4 +1,25 @@
-#include "gtkinternal.h"
+/* 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
+ */
+#include "internal.h"
+#include "gtkgaim.h"
 
 #include "conversation.h"
 #include "signals.h"
diff -r f8b2630ca694 -r 4a15962c344a plugins/notify.c
--- a/plugins/notify.c	Fri Aug 20 04:59:53 2004 +0000
+++ b/plugins/notify.c	Fri Aug 20 05:11:30 2004 +0000
@@ -66,7 +66,8 @@
  *  react to focus-in events when the entry or history widgets are focused)
  */
 
-#include "gtkinternal.h"
+#include "internal.h"
+#include "gtkgaim.h"
 
 #include "debug.h"
 #include "prefs.h"
diff -r f8b2630ca694 -r 4a15962c344a plugins/spellchk.c
--- a/plugins/spellchk.c	Fri Aug 20 04:59:53 2004 +0000
+++ b/plugins/spellchk.c	Fri Aug 20 05:11:30 2004 +0000
@@ -3,6 +3,7 @@
  * or nearly directly from xchat, version 1.4.2 by Peter Zelezny and others.
  */
 #include "internal.h"
+#include "gtkgaim.h"
 
 #include "debug.h"
 #include "signals.h"
diff -r f8b2630ca694 -r 4a15962c344a plugins/ticker/ticker.c
--- a/plugins/ticker/ticker.c	Fri Aug 20 04:59:53 2004 +0000
+++ b/plugins/ticker/ticker.c	Fri Aug 20 05:11:30 2004 +0000
@@ -25,7 +25,7 @@
  * pluginized- Sean Egan, Summer 2002
  */
 #include "internal.h"
-#include "gtkinternal.h"
+#include "gtkgaim.h"
 
 #include "blist.h"
 #include "conversation.h"
diff -r f8b2630ca694 -r 4a15962c344a src/Makefile.am
--- a/src/Makefile.am	Fri Aug 20 04:59:53 2004 +0000
+++ b/src/Makefile.am	Fri Aug 20 05:11:30 2004 +0000
@@ -183,9 +183,9 @@
 	gtkdialogs.h \
 	gtkeventloop.h \
 	gtkft.h \
+	gtkgaim.h \
 	gtkimhtml.h \
 	gtkimhtmltoolbar.h \
-	gtkinternal.h \
 	gtklog.h \
 	gtknotify.h \
 	gtkplugin.h \
diff -r f8b2630ca694 -r 4a15962c344a src/away.c
--- a/src/away.c	Fri Aug 20 04:59:53 2004 +0000
+++ b/src/away.c	Fri Aug 20 05:11:30 2004 +0000
@@ -21,7 +21,7 @@
  *
  */
 #include "internal.h"
-#include "gtkinternal.h"
+#include "gtkgaim.h"
 
 #include "conversation.h"
 #include "debug.h"
diff -r f8b2630ca694 -r 4a15962c344a src/away.h
--- a/src/away.h	Fri Aug 20 04:59:53 2004 +0000
+++ b/src/away.h	Fri Aug 20 05:11:30 2004 +0000
@@ -25,7 +25,7 @@
 #ifndef _GAIM_AWAY_H_
 #define _GAIM_AWAY_H_
 
-#include "gtkinternal.h"
+#include "gtkgaim.h"
 
 /* XXX CUI: away messages aren't really anything more than char* but we need two char*'s
  * for the UI so that people can name their away messages when they save them. So these
diff -r f8b2630ca694 -r 4a15962c344a src/gtkaccount.c
--- a/src/gtkaccount.c	Fri Aug 20 04:59:53 2004 +0000
+++ b/src/gtkaccount.c	Fri Aug 20 05:11:30 2004 +0000
@@ -23,7 +23,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "gtkinternal.h"
+#include "internal.h"
+#include "gtkgaim.h"
 
 #include "account.h"
 #include "accountopt.h"
diff -r f8b2630ca694 -r 4a15962c344a src/gtkblist.c
--- a/src/gtkblist.c	Fri Aug 20 04:59:53 2004 +0000
+++ b/src/gtkblist.c	Fri Aug 20 05:11:30 2004 +0000
@@ -20,7 +20,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  */
-#include "gtkinternal.h"
+#include "internal.h"
+#include "gtkgaim.h"
 
 #include "account.h"
 #include "connection.h"
diff -r f8b2630ca694 -r 4a15962c344a src/gtkblist.h
--- a/src/gtkblist.h	Fri Aug 20 04:59:53 2004 +0000
+++ b/src/gtkblist.h	Fri Aug 20 05:11:30 2004 +0000
@@ -25,6 +25,7 @@
 #ifndef _GAIM_GTKBLIST_H_
 #define _GAIM_GTKBLIST_H_
 
+#include "gtkgaim.h"
 #include "blist.h"
 
 enum {
diff -r f8b2630ca694 -r 4a15962c344a src/gtkconn.c
--- a/src/gtkconn.c	Fri Aug 20 04:59:53 2004 +0000
+++ b/src/gtkconn.c	Fri Aug 20 05:11:30 2004 +0000
@@ -19,7 +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
  */
-#include "gtkinternal.h"
+#include "internal.h"
+#include "gtkgaim.h"
 
 #include "account.h"
 #include "debug.h"
diff -r f8b2630ca694 -r 4a15962c344a src/gtkconv.c
--- a/src/gtkconv.c	Fri Aug 20 04:59:53 2004 +0000
+++ b/src/gtkconv.c	Fri Aug 20 05:11:30 2004 +0000
@@ -21,7 +21,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  */
-#include "gtkinternal.h"
+#include "internal.h"
+#include "gtkgaim.h"
 
 #ifndef _WIN32
 # include <X11/Xlib.h>
diff -r f8b2630ca694 -r 4a15962c344a src/gtkconv.h
--- a/src/gtkconv.h	Fri Aug 20 04:59:53 2004 +0000
+++ b/src/gtkconv.h	Fri Aug 20 05:11:30 2004 +0000
@@ -25,7 +25,7 @@
 #ifndef _GAIM_GTKCONVERSATION_H_
 #define _GAIM_GTKCONVERSATION_H_
 
-#include "gtkinternal.h"
+#include "gtkgaim.h"
 
 #include "conversation.h"
 
diff -r f8b2630ca694 -r 4a15962c344a src/gtkdebug.c
--- a/src/gtkdebug.c	Fri Aug 20 04:59:53 2004 +0000
+++ b/src/gtkdebug.c	Fri Aug 20 05:11:30 2004 +0000
@@ -22,7 +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
  */
-#include "gtkinternal.h"
+#include "internal.h"
+#include "gtkgaim.h"
 
 #include "notify.h"
 #include "prefs.h"
diff -r f8b2630ca694 -r 4a15962c344a src/gtkdialogs.c
--- a/src/gtkdialogs.c	Fri Aug 20 04:59:53 2004 +0000
+++ b/src/gtkdialogs.c	Fri Aug 20 05:11:30 2004 +0000
@@ -19,7 +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
  */
-#include "gtkinternal.h"
+#include "internal.h"
+#include "gtkgaim.h"
 
 #include "debug.h"
 #include "notify.h"
diff -r f8b2630ca694 -r 4a15962c344a src/gtkdialogs.h
--- a/src/gtkdialogs.h	Fri Aug 20 04:59:53 2004 +0000
+++ b/src/gtkdialogs.h	Fri Aug 20 05:11:30 2004 +0000
@@ -25,7 +25,7 @@
 #ifndef _GAIM_GTKDIALOGS_H_
 #define _GAIM_GTKDIALOGS_H_
 
-#include "gtkinternal.h"
+#include "gtkgaim.h"
 
 #include "account.h"
 #include "conversation.h"
diff -r f8b2630ca694 -r 4a15962c344a src/gtkft.c
--- a/src/gtkft.c	Fri Aug 20 04:59:53 2004 +0000
+++ b/src/gtkft.c	Fri Aug 20 05:11:30 2004 +0000
@@ -22,7 +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
  */
-#include "gtkinternal.h"
+#include "internal.h"
+#include "gtkgaim.h"
 
 #include "debug.h"
 #include "notify.h"
diff -r f8b2630ca694 -r 4a15962c344a src/gtkgaim.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/gtkgaim.h	Fri Aug 20 05:11:30 2004 +0000
@@ -0,0 +1,51 @@
+/**
+ * @file gtkgaim.h UI definitions and includes
+ * @ingroup gtkui
+ *
+ * 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_GTKGAIM_H_
+#define _GAIM_GTKGAIM_H_
+
+#ifndef _WIN32
+# include <gdk/gdkx.h>
+#endif
+
+#include <gtk/gtk.h>
+
+#ifndef _WIN32
+# define GAIM_ALERT_TITLE ""
+#else
+# define GAIM_ALERT_TITLE "Gaim"
+#endif
+
+/*
+ * This is backwards-compatibility code for old versions of GTK+ (2.2.1 and
+ * earlier).  It defines the new wrap behavior (unknown in earlier versions)
+ * as the old (slightly buggy) wrap behavior.
+ */
+#ifndef GTK_WRAP_WORD_CHAR
+#define GTK_WRAP_WORD_CHAR GTK_WRAP_WORD
+#endif
+
+
+#endif /* _GAIM_GTKGAIM_H_ */
+
diff -r f8b2630ca694 -r 4a15962c344a src/gtkimhtmltoolbar.c
--- a/src/gtkimhtmltoolbar.c	Fri Aug 20 04:59:53 2004 +0000
+++ b/src/gtkimhtmltoolbar.c	Fri Aug 20 05:11:30 2004 +0000
@@ -20,7 +20,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  */
-#include "gtkinternal.h"
+#include "internal.h"
+#include "gtkgaim.h"
 
 #include "imgstore.h"
 #include "notify.h"
diff -r f8b2630ca694 -r 4a15962c344a src/gtkinternal.h
--- a/src/gtkinternal.h	Fri Aug 20 04:59:53 2004 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-/**
- * @file gtkinternal.h Internal UI definitions and includes
- * @ingroup gtkui
- *
- * 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_GTKINTERNAL_H_
-#define _GAIM_GTKINTERNAL_H_
-
-#include "internal.h"
-
-#ifndef _WIN32
-# include <gdk/gdkx.h>
-#endif
-
-#include <gtk/gtk.h>
-
-#ifndef _WIN32
-# define GAIM_ALERT_TITLE ""
-#else
-# define GAIM_ALERT_TITLE "Gaim"
-#endif
-
-/*
- * This is backwards-compatibility code for old versions of GTK+ (2.2.1 and
- * earlier).  It defines the new wrap behavior (unknown in earlier versions)
- * as the old (slightly buggy) wrap behavior.
- */
-#ifndef GTK_WRAP_WORD_CHAR
-#define GTK_WRAP_WORD_CHAR GTK_WRAP_WORD
-#endif
-
-
-#endif /* _GAIM_GTKINTERNAL_H_ */
diff -r f8b2630ca694 -r 4a15962c344a src/gtklog.c
--- a/src/gtklog.c	Fri Aug 20 04:59:53 2004 +0000
+++ b/src/gtklog.c	Fri Aug 20 05:11:30 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
  */
-
-#include "gtkinternal.h"
+#include "internal.h"
+#include "gtkgaim.h"
 
 #include "account.h"
 #include "util.h"
@@ -472,4 +472,3 @@
 
 	gtk_widget_show_all(syslog_viewer->window);	
 }
-
diff -r f8b2630ca694 -r 4a15962c344a src/gtklog.h
--- a/src/gtklog.h	Fri Aug 20 04:59:53 2004 +0000
+++ b/src/gtklog.h	Fri Aug 20 05:11:30 2004 +0000
@@ -23,7 +23,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "gtkinternal.h"
+#include "gtkgaim.h"
 #include "log.h"
 
 #include "account.h"
diff -r f8b2630ca694 -r 4a15962c344a src/gtknotify.c
--- a/src/gtknotify.c	Fri Aug 20 04:59:53 2004 +0000
+++ b/src/gtknotify.c	Fri Aug 20 05:11:30 2004 +0000
@@ -22,7 +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
  */
-#include "gtkinternal.h"
+#include "internal.h"
+#include "gtkgaim.h"
 
 #include <gdk/gdkkeysyms.h>
 
diff -r f8b2630ca694 -r 4a15962c344a src/gtkplugin.c
--- a/src/gtkplugin.c	Fri Aug 20 04:59:53 2004 +0000
+++ b/src/gtkplugin.c	Fri Aug 20 05:11:30 2004 +0000
@@ -22,6 +22,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
+#include "gtkgaim.h"
 #include "gtkplugin.h"
 #include "debug.h"
 #include "prefs.h"
diff -r f8b2630ca694 -r 4a15962c344a src/gtkplugin.h
--- a/src/gtkplugin.h	Fri Aug 20 04:59:53 2004 +0000
+++ b/src/gtkplugin.h	Fri Aug 20 05:11:30 2004 +0000
@@ -25,10 +25,9 @@
 #ifndef _GAIM_GTKPLUGIN_H_
 #define _GAIM_GTKPLUGIN_H_
 
+#include "gtkgaim.h"
 #include "plugin.h"
 
-#include "gtkinternal.h"
-
 typedef struct _GaimGtkPluginUiInfo GaimGtkPluginUiInfo;
 
 /**
diff -r f8b2630ca694 -r 4a15962c344a src/gtkpluginpref.c
--- a/src/gtkpluginpref.c	Fri Aug 20 04:59:53 2004 +0000
+++ b/src/gtkpluginpref.c	Fri Aug 20 05:11:30 2004 +0000
@@ -23,9 +23,6 @@
 # include <config.h>
 #endif
 
-#include <glib.h>
-#include <gtk/gtk.h>
-
 #include "debug.h"
 #include "internal.h"
 #include "pluginpref.h"
diff -r f8b2630ca694 -r 4a15962c344a src/gtkpluginpref.h
--- a/src/gtkpluginpref.h	Fri Aug 20 04:59:53 2004 +0000
+++ b/src/gtkpluginpref.h	Fri Aug 20 05:11:30 2004 +0000
@@ -32,7 +32,7 @@
 
 #include "pluginpref.h"
 
-#include "gtkinternal.h"
+#include "gtkgaim.h"
 
 #ifdef __cplusplus
 extern "C" {
diff -r f8b2630ca694 -r 4a15962c344a src/gtkpounce.c
--- a/src/gtkpounce.c	Fri Aug 20 04:59:53 2004 +0000
+++ b/src/gtkpounce.c	Fri Aug 20 05:11:30 2004 +0000
@@ -23,7 +23,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  */
-#include "gtkinternal.h"
+#include "internal.h"
+#include "gtkgaim.h"
 
 #include "account.h"
 #include "conversation.h"
diff -r f8b2630ca694 -r 4a15962c344a src/gtkprefs.c
--- a/src/gtkprefs.c	Fri Aug 20 04:59:53 2004 +0000
+++ b/src/gtkprefs.c	Fri Aug 20 05:11:30 2004 +0000
@@ -23,7 +23,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  */
-#include "gtkinternal.h"
+#include "internal.h"
+#include "gtkgaim.h"
 
 #include "debug.h"
 #include "notify.h"
diff -r f8b2630ca694 -r 4a15962c344a src/gtkprivacy.c
--- a/src/gtkprivacy.c	Fri Aug 20 04:59:53 2004 +0000
+++ b/src/gtkprivacy.c	Fri Aug 20 05:11:30 2004 +0000
@@ -22,7 +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
  */
-#include "gtkinternal.h"
+#include "internal.h"
+#include "gtkgaim.h"
 
 #include "connection.h"
 #include "debug.h"
diff -r f8b2630ca694 -r 4a15962c344a src/gtkrequest.c
--- a/src/gtkrequest.c	Fri Aug 20 04:59:53 2004 +0000
+++ b/src/gtkrequest.c	Fri Aug 20 05:11:30 2004 +0000
@@ -22,7 +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
  */
-#include "gtkinternal.h"
+#include "internal.h"
+#include "gtkgaim.h"
 
 #include "prefs.h"
 
diff -r f8b2630ca694 -r 4a15962c344a src/gtkroomlist.c
--- a/src/gtkroomlist.c	Fri Aug 20 04:59:53 2004 +0000
+++ b/src/gtkroomlist.c	Fri Aug 20 05:11:30 2004 +0000
@@ -23,7 +23,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "gtkinternal.h"
+#include "internal.h"
+#include "gtkgaim.h"
 #include "gtkutils.h"
 #include "stock.h"
 #include "debug.h"
diff -r f8b2630ca694 -r 4a15962c344a src/gtksound.c
--- a/src/gtksound.c	Fri Aug 20 04:59:53 2004 +0000
+++ b/src/gtksound.c	Fri Aug 20 05:11:30 2004 +0000
@@ -20,7 +20,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  */
-#include "gtkinternal.h"
+#include "internal.h"
+#include "gtkgaim.h"
 
 #ifdef _WIN32
 #include <windows.h>
@@ -393,4 +394,3 @@
 
 	return sounds[event].label;
 }
-
diff -r f8b2630ca694 -r 4a15962c344a src/gtkutils.c
--- a/src/gtkutils.c	Fri Aug 20 04:59:53 2004 +0000
+++ b/src/gtkutils.c	Fri Aug 20 05:11:30 2004 +0000
@@ -22,7 +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
  */
-#include "gtkinternal.h"
+#include "internal.h"
+#include "gtkgaim.h"
 
 #ifndef _WIN32
 # include <X11/Xlib.h>
diff -r f8b2630ca694 -r 4a15962c344a src/gtkutils.h
--- a/src/gtkutils.h	Fri Aug 20 04:59:53 2004 +0000
+++ b/src/gtkutils.h	Fri Aug 20 05:11:30 2004 +0000
@@ -26,7 +26,7 @@
 #define _GAIM_GTKUTILS_H_
 
 #include "gtkconv.h"
-#include "gtkinternal.h"
+#include "gtkgaim.h"
 #include "prpl.h"
 
 typedef enum
diff -r f8b2630ca694 -r 4a15962c344a src/idle.c
--- a/src/idle.c	Fri Aug 20 04:59:53 2004 +0000
+++ b/src/idle.c	Fri Aug 20 05:11:30 2004 +0000
@@ -20,7 +20,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  */
-#include "gtkinternal.h"
+#include "internal.h"
 
 #ifdef USE_SCREENSAVER
 # ifndef _WIN32
diff -r f8b2630ca694 -r 4a15962c344a src/main.c
--- a/src/main.c	Fri Aug 20 04:59:53 2004 +0000
+++ b/src/main.c	Fri Aug 20 05:11:30 2004 +0000
@@ -21,7 +21,8 @@
  *
  */
 
-#include "gtkinternal.h"
+#include "internal.h"
+#include "gtkgaim.h"
 
 #include "account.h"
 #include "conversation.h"
diff -r f8b2630ca694 -r 4a15962c344a src/sound.c
--- a/src/sound.c	Fri Aug 20 04:59:53 2004 +0000
+++ b/src/sound.c	Fri Aug 20 05:11:30 2004 +0000
@@ -27,7 +27,6 @@
 
 /* XXX CORE/UI: this goes away when away messages become sane */
 #include "away.h"
-#include "gtkinternal.h"
 
 
 static GaimSoundUiOps *sound_ui_ops = NULL;
diff -r f8b2630ca694 -r 4a15962c344a src/status.c
--- a/src/status.c	Fri Aug 20 04:59:53 2004 +0000
+++ b/src/status.c	Fri Aug 20 05:11:30 2004 +0000
@@ -27,7 +27,7 @@
 
 /* XXX CORE/UI */
 #include "away.h"
-#include "gtkinternal.h"
+#include "gtkgaim.h"
 
 
 /* for people like myself who are too lazy to add an away msg :) */
diff -r f8b2630ca694 -r 4a15962c344a src/stock.c
--- a/src/stock.c	Fri Aug 20 04:59:53 2004 +0000
+++ b/src/stock.c	Fri Aug 20 05:11:30 2004 +0000
@@ -22,7 +22,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  */
-#include "gtkinternal.h"
+#include "internal.h"
+#include "gtkgaim.h"
 
 #include "stock.h"
 
diff -r f8b2630ca694 -r 4a15962c344a src/themes.c
--- a/src/themes.c	Fri Aug 20 04:59:53 2004 +0000
+++ b/src/themes.c	Fri Aug 20 05:11:30 2004 +0000
@@ -20,7 +20,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  */
-#include "gtkinternal.h"
+#include "internal.h"
+#include "gtkgaim.h"
 
 #include "conversation.h"
 #include "debug.h"