forgot to commit my ChangeLog changes when I checked in a couple of days ago

7 files changed, 70 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index f948af2a0..47dbbee43 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -22,6 +22,16 @@ Sun Jun 11 10:22:36 2000  Owen Taylor  <otaylor@redhat.com>
 	rather than 8 * sizeof (GdkAtom), to work correctly
 	on Alpha.
 
+Thu Jun  8 21:54:51 2000 Christopher Blizzard  <blizzard@redhat.com>
+
+	* gtk/Makefile.am (DEPS): deps include libgtk-x11.la, not
+	libgtk.la
+	(LDADDS): include libgtk-x11.la and libgdk-x11.la, not the non-x11
+	versions
+
+	* gtk/gtklabel.c (gtk_label_get_text): Make sure that the error
+	checking macros return NULL since the function has a return value.
+
 Wed Jun  7 15:44:42 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/Makefile.am (LDFLAGS): Add missing backslash that was keeping
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index f948af2a0..47dbbee43 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -22,6 +22,16 @@ Sun Jun 11 10:22:36 2000  Owen Taylor  <otaylor@redhat.com>
 	rather than 8 * sizeof (GdkAtom), to work correctly
 	on Alpha.
 
+Thu Jun  8 21:54:51 2000 Christopher Blizzard  <blizzard@redhat.com>
+
+	* gtk/Makefile.am (DEPS): deps include libgtk-x11.la, not
+	libgtk.la
+	(LDADDS): include libgtk-x11.la and libgdk-x11.la, not the non-x11
+	versions
+
+	* gtk/gtklabel.c (gtk_label_get_text): Make sure that the error
+	checking macros return NULL since the function has a return value.
+
 Wed Jun  7 15:44:42 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/Makefile.am (LDFLAGS): Add missing backslash that was keeping
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index f948af2a0..47dbbee43 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -22,6 +22,16 @@ Sun Jun 11 10:22:36 2000  Owen Taylor  <otaylor@redhat.com>
 	rather than 8 * sizeof (GdkAtom), to work correctly
 	on Alpha.
 
+Thu Jun  8 21:54:51 2000 Christopher Blizzard  <blizzard@redhat.com>
+
+	* gtk/Makefile.am (DEPS): deps include libgtk-x11.la, not
+	libgtk.la
+	(LDADDS): include libgtk-x11.la and libgdk-x11.la, not the non-x11
+	versions
+
+	* gtk/gtklabel.c (gtk_label_get_text): Make sure that the error
+	checking macros return NULL since the function has a return value.
+
 Wed Jun  7 15:44:42 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/Makefile.am (LDFLAGS): Add missing backslash that was keeping
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index f948af2a0..47dbbee43 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -22,6 +22,16 @@ Sun Jun 11 10:22:36 2000  Owen Taylor  <otaylor@redhat.com>
 	rather than 8 * sizeof (GdkAtom), to work correctly
 	on Alpha.
 
+Thu Jun  8 21:54:51 2000 Christopher Blizzard  <blizzard@redhat.com>
+
+	* gtk/Makefile.am (DEPS): deps include libgtk-x11.la, not
+	libgtk.la
+	(LDADDS): include libgtk-x11.la and libgdk-x11.la, not the non-x11
+	versions
+
+	* gtk/gtklabel.c (gtk_label_get_text): Make sure that the error
+	checking macros return NULL since the function has a return value.
+
 Wed Jun  7 15:44:42 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/Makefile.am (LDFLAGS): Add missing backslash that was keeping
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index f948af2a0..47dbbee43 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -22,6 +22,16 @@ Sun Jun 11 10:22:36 2000  Owen Taylor  <otaylor@redhat.com>
 	rather than 8 * sizeof (GdkAtom), to work correctly
 	on Alpha.
 
+Thu Jun  8 21:54:51 2000 Christopher Blizzard  <blizzard@redhat.com>
+
+	* gtk/Makefile.am (DEPS): deps include libgtk-x11.la, not
+	libgtk.la
+	(LDADDS): include libgtk-x11.la and libgdk-x11.la, not the non-x11
+	versions
+
+	* gtk/gtklabel.c (gtk_label_get_text): Make sure that the error
+	checking macros return NULL since the function has a return value.
+
 Wed Jun  7 15:44:42 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/Makefile.am (LDFLAGS): Add missing backslash that was keeping
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index f948af2a0..47dbbee43 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -22,6 +22,16 @@ Sun Jun 11 10:22:36 2000  Owen Taylor  <otaylor@redhat.com>
 	rather than 8 * sizeof (GdkAtom), to work correctly
 	on Alpha.
 
+Thu Jun  8 21:54:51 2000 Christopher Blizzard  <blizzard@redhat.com>
+
+	* gtk/Makefile.am (DEPS): deps include libgtk-x11.la, not
+	libgtk.la
+	(LDADDS): include libgtk-x11.la and libgdk-x11.la, not the non-x11
+	versions
+
+	* gtk/gtklabel.c (gtk_label_get_text): Make sure that the error
+	checking macros return NULL since the function has a return value.
+
 Wed Jun  7 15:44:42 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/Makefile.am (LDFLAGS): Add missing backslash that was keeping
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index f948af2a0..47dbbee43 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -22,6 +22,16 @@ Sun Jun 11 10:22:36 2000  Owen Taylor  <otaylor@redhat.com>
 	rather than 8 * sizeof (GdkAtom), to work correctly
 	on Alpha.
 
+Thu Jun  8 21:54:51 2000 Christopher Blizzard  <blizzard@redhat.com>
+
+	* gtk/Makefile.am (DEPS): deps include libgtk-x11.la, not
+	libgtk.la
+	(LDADDS): include libgtk-x11.la and libgdk-x11.la, not the non-x11
+	versions
+
+	* gtk/gtklabel.c (gtk_label_get_text): Make sure that the error
+	checking macros return NULL since the function has a return value.
+
 Wed Jun  7 15:44:42 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/Makefile.am (LDFLAGS): Add missing backslash that was keeping