# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1157837550 0
# Node ID f283ebe419e4ee651b3d520c234d5d0618bf4244
# Parent  de8aea7e9f07ca86ae7808a230eddc6ded0feec8
[gaim-migrate @ 17209]
More changes to help make dist work again.  Let's see here
* Alphabetize some stuff in gtk/Makefile.am
* Include gntwm.h in the tar.gz
* Include gntplugin.h in the tar.gz (instead of gntplugin.c (typo))
* libgaim/connection.c and libgaim/upnp.c shouldn't include gaim.h
  gaim.h should only be used by stuff outside of libgaim
* Include gaim.h in the tar.gz (not sure if we want to keep it this
  way, I'll send an email to gaim-devel in a little bit)

committer: Tailor Script <tailor@pidgin.im>

diff -r de8aea7e9f07 -r f283ebe419e4 console/Makefile.am
--- a/console/Makefile.am	Sat Sep 09 21:02:31 2006 +0000
+++ b/console/Makefile.am	Sat Sep 09 21:32:30 2006 +0000
@@ -25,7 +25,7 @@
 	gntconv.h \
 	gntdebug.h \
 	gntnotify.h \
-	gntplugin.c \
+	gntplugin.h \
 	gntprefs.h \
 	gntrequest.h \
 	gntstatus.h \
diff -r de8aea7e9f07 -r f283ebe419e4 console/libgnt/Makefile.am
--- a/console/libgnt/Makefile.am	Sat Sep 09 21:02:31 2006 +0000
+++ b/console/libgnt/Makefile.am	Sat Sep 09 21:32:30 2006 +0000
@@ -38,6 +38,7 @@
 	gnttextview.h \
 	gnttree.h \
 	gntutils.h \
+	gntwm.h \
 	gnt.h
 
 libgnt_laincludedir=$(includedir)/gnt
diff -r de8aea7e9f07 -r f283ebe419e4 gtk/Makefile.am
--- a/gtk/Makefile.am	Sat Sep 09 21:02:31 2006 +0000
+++ b/gtk/Makefile.am	Sat Sep 09 21:32:30 2006 +0000
@@ -59,13 +59,14 @@
 bin_PROGRAMS = gaim
 
 gaim_SOURCES = \
+	gaimcombobox.c \
+	gaimstock.c \
 	gtkaccount.c \
 	gtkblist.c \
 	gtkcelllayout.c \
 	gtkcellrendererprogress.c \
 	gtkcellview.c \
 	gtkcellviewmenuitem.c \
-	gaimcombobox.c \
 	gtkconn.c \
 	gtkconv.c \
 	gtkdebug.c \
@@ -83,9 +84,9 @@
 	gtknotify.c \
 	gtkplugin.c \
 	gtkpluginpref.c \
+	gtkpounce.c \
 	gtkprefs.c \
 	gtkprivacy.c \
-	gtkpounce.c \
 	gtkrequest.c \
 	gtkroomlist.c \
 	gtksavedstatuses.c \
@@ -93,7 +94,6 @@
 	gtksound.c \
 	gtksourceiter.c \
 	gtkstatusbox.c \
-	gaimstock.c \
 	gtkthemes.c \
 	gtkutils.c \
 	gtkwhiteboard.c
diff -r de8aea7e9f07 -r f283ebe419e4 libgaim/connection.c
--- a/libgaim/connection.c	Sat Sep 09 21:02:31 2006 +0000
+++ b/libgaim/connection.c	Sat Sep 09 21:32:30 2006 +0000
@@ -28,7 +28,6 @@
 #include "connection.h"
 #include "dbus-maybe.h"
 #include "debug.h"
-#include "gaim.h"
 #include "log.h"
 #include "notify.h"
 #include "prefs.h"
diff -r de8aea7e9f07 -r f283ebe419e4 libgaim/upnp.c
--- a/libgaim/upnp.c	Sat Sep 09 21:02:31 2006 +0000
+++ b/libgaim/upnp.c	Sat Sep 09 21:32:30 2006 +0000
@@ -23,7 +23,6 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 #include "internal.h"
-#include "gaim.h"
 
 #include "debug.h"
 #include "util.h"