Re: patch for gnome-libs/libgnome (include of gnome-defs.h in files using BEGIN_GNOME_DECLS)

[Mikael Hallendal <micke hallendal net>]

Here is a patch adding the includes to all files in libgnome missing it.
This is for the HEAD-branch of gnome-libs.
I hope this can be included before GNOME 2.0 is released.

Regards,
Mikael Hallendal

On 27 Feb 2001 18:11:29 -0500, Havoc Pennington wrote:
> 
> 
> Mikael Hallendal<micke hallendal net> writes: 
> > Yes I thought of that as a big problem too. Perhaps it should be left as
> > is for now and fixed in the gnome-libs for GNOME 2.0? I noticed that it
> > had been fixed in some of the files in gnome-libs HEAD. Should I send a
> > patch fixing 
> > up the rest of the files in HEAD?
> > 
> 
> Probably a good idea, yep.
> 
> Havoc



--
Mikael Hallendal                micke codefactory se
CodeFactory AB                  http://www.codefactory.se/
Office: +46 (0)8 587 583 05     Cell: +46 (0)709 718 918


Index: libgnome/ChangeLog
===================================================================
RCS file: /cvs/gnome/gnome-libs/libgnome/ChangeLog,v
retrieving revision 1.179
diff -u -u -r1.179 ChangeLog
--- libgnome/ChangeLog	2001/02/23 16:27:44	1.179
+++ libgnome/ChangeLog	2001/02/27 23:29:53
@@ -1,3 +1,7 @@
+2001-02-28  Mikael Hallendal  <micke codefactory se>
+
+	* libgnome/: Fixed includes (added glib.h and gnome-defs.h to the files needing it. Those are: gnome-config.h, gnome-ditem.h, gnome-exec.h, gnome-fileconvert.h, gnome-i18n.h, gnome-regex.h, gnome-remote.h, gnome-score.h, gnome-sound.h, gnome-triggers.h, gnome-url.h, gnome-util.h, gnome-init.h
+	
 2001-02-23  Martin Baulig  <baulig suse de>
 
 	* libgnome-2.0.pc.in: New file.
Index: libgnome/gnome-config.h
===================================================================
RCS file: /cvs/gnome/gnome-libs/libgnome/gnome-config.h,v
retrieving revision 1.27
diff -u -u -r1.27 gnome-config.h
--- libgnome/gnome-config.h	2000/03/26 21:34:43	1.27
+++ libgnome/gnome-config.h	2001/02/27 23:29:54
@@ -27,6 +27,7 @@
 #define GNOME_CONFIG_H
 
 #include <glib.h>
+#include <libgnome/gnome-defs.h>
 
 BEGIN_GNOME_DECLS
 
Index: libgnome/gnome-ditem.h
===================================================================
RCS file: /cvs/gnome/gnome-libs/libgnome/gnome-ditem.h,v
retrieving revision 1.11
diff -u -u -r1.11 gnome-ditem.h
--- libgnome/gnome-ditem.h	2000/09/15 23:46:03	1.11
+++ libgnome/gnome-ditem.h	2001/02/27 23:29:55
@@ -27,6 +27,9 @@
 #ifndef GNOME_DITEM_H
 #define GNOME_DITEM_H
 
+#include <glib.h>
+#include <libgnome/gnome-defs.h>
+
 BEGIN_GNOME_DECLS
 
 typedef enum {
Index: libgnome/gnome-exec.h
===================================================================
RCS file: /cvs/gnome/gnome-libs/libgnome/gnome-exec.h,v
retrieving revision 1.9
diff -u -u -r1.9 gnome-exec.h
--- libgnome/gnome-exec.h	2000/09/24 20:31:16	1.9
+++ libgnome/gnome-exec.h	2001/02/27 23:29:55
@@ -24,10 +24,11 @@
   @NOTATION@
  */
 
-#include <glib.h>
-
 #ifndef GNOME_EXEC_H
 #define GNOME_EXEC_H
+
+#include <glib.h>
+#include <libgnome/gnome-defs.h>
 
 BEGIN_GNOME_DECLS
 
Index: libgnome/gnome-fileconvert.h
===================================================================
RCS file: /cvs/gnome/gnome-libs/libgnome/gnome-fileconvert.h,v
retrieving revision 1.5
diff -u -u -r1.5 gnome-fileconvert.h
--- libgnome/gnome-fileconvert.h	2000/02/21 17:31:52	1.5
+++ libgnome/gnome-fileconvert.h	2001/02/27 23:29:55
@@ -26,6 +26,9 @@
 #ifndef __GNOME_FILECONVERT_H__
 #define __GNOME_FILECONVERT_H__ 1
 
+#include <glib.h>
+#include <ligbnome/gnome-defs.h>
+
 /* WARNING ____ IMMATURE API ____ liable to change */
 
 BEGIN_GNOME_DECLS
Index: libgnome/gnome-i18n.h
===================================================================
RCS file: /cvs/gnome/gnome-libs/libgnome/gnome-i18n.h,v
retrieving revision 1.13
diff -u -u -r1.13 gnome-i18n.h
--- libgnome/gnome-i18n.h	2000/09/23 22:27:21	1.13
+++ libgnome/gnome-i18n.h	2001/02/27 23:29:55
@@ -31,6 +31,9 @@
 #ifndef __GNOME_I18N_H__
 #define __GNOME_I18N_H__ 1
 
+#include <glib.h>
+#include <libgnome/gnome-defs.h>
+
 BEGIN_GNOME_DECLS
 
 #if !defined(__GNOME_I18NP_H__)
Index: libgnome/gnome-regex.h
===================================================================
RCS file: /cvs/gnome/gnome-libs/libgnome/gnome-regex.h,v
retrieving revision 1.7
diff -u -u -r1.7 gnome-regex.h
--- libgnome/gnome-regex.h	2000/10/18 13:36:47	1.7
+++ libgnome/gnome-regex.h	2001/02/27 23:29:56
@@ -24,6 +24,8 @@
 #ifndef GNOME_REGEX_H
 #define GNOME_REGEX_H
 
+#include <libgnome/gnome-defs.h>
+
 BEGIN_GNOME_DECLS
 
 #include <sys/types.h>
Index: libgnome/gnome-remote.h
===================================================================
RCS file: /cvs/gnome/gnome-libs/libgnome/gnome-remote.h,v
retrieving revision 1.4
diff -u -u -r1.4 gnome-remote.h
--- libgnome/gnome-remote.h	2000/02/21 17:31:52	1.4
+++ libgnome/gnome-remote.h	2001/02/27 23:29:56
@@ -24,6 +24,9 @@
 #ifndef GNOME_REMOTE_H
 #define GNOME_REMOTE_H
 
+#include <glib.h>
+#include <libgnome/gnome-defs.h>
+
 BEGIN_GNOME_DECLS
 
 /* Return a command which should be used to run a program on HOST.
Index: libgnome/gnome-score.h
===================================================================
RCS file: /cvs/gnome/gnome-libs/libgnome/gnome-score.h,v
retrieving revision 1.9
diff -u -u -r1.9 gnome-score.h
--- libgnome/gnome-score.h	2000/07/14 08:45:15	1.9
+++ libgnome/gnome-score.h	2001/02/27 23:29:56
@@ -28,7 +28,7 @@
 
 #include <time.h>
 #include <glib.h>
-#include <glib.h>
+#include <libgnome/gnome-defs.h>
 
 BEGIN_GNOME_DECLS
 /*
Index: libgnome/gnome-sound.h
===================================================================
RCS file: /cvs/gnome/gnome-libs/libgnome/gnome-sound.h,v
retrieving revision 1.4
diff -u -u -r1.4 gnome-sound.h
--- libgnome/gnome-sound.h	2000/02/21 17:31:52	1.4
+++ libgnome/gnome-sound.h	2001/02/27 23:29:57
@@ -26,8 +26,9 @@
 #ifndef __GNOME_SOUND_H__
 #define __GNOME_SOUND_H__ 1
 
-#include "gnome-defs.h"
 #include <glib.h>
+#include <libgnome/gnome-defs.h>
+
 BEGIN_GNOME_DECLS
 
 /* Use this with the Esound functions */
Index: libgnome/gnome-triggers.h
===================================================================
RCS file: /cvs/gnome/gnome-libs/libgnome/gnome-triggers.h,v
retrieving revision 1.11
diff -u -u -r1.11 gnome-triggers.h
--- libgnome/gnome-triggers.h	2000/02/21 17:31:52	1.11
+++ libgnome/gnome-triggers.h	2001/02/27 23:29:57
@@ -26,8 +26,9 @@
 #ifndef __GNOME_TRIGGERS_H__
 #define __GNOME_TRIGGERS_H__
 
-#include "gnome-defs.h"
 #include <glib.h>
+#include <libgnome/gnome-defs.h>
+
 BEGIN_GNOME_DECLS
 
 typedef enum {
Index: libgnome/gnome-url.h
===================================================================
RCS file: /cvs/gnome/gnome-libs/libgnome/gnome-url.h,v
retrieving revision 1.8
diff -u -u -r1.8 gnome-url.h
--- libgnome/gnome-url.h	2000/09/02 00:12:39	1.8
+++ libgnome/gnome-url.h	2001/02/27 23:29:57
@@ -23,6 +23,8 @@
 
 #ifndef GNOME_URL_H
 #define GNOME_URL_H
+
+#include <glib.h>
 #include <libgnome/gnome-defs.h>
 
 BEGIN_GNOME_DECLS
Index: libgnome/gnome-util.h
===================================================================
RCS file: /cvs/gnome/gnome-libs/libgnome/gnome-util.h,v
retrieving revision 1.24
diff -u -u -r1.24 gnome-util.h
--- libgnome/gnome-util.h	2000/11/22 15:01:40	1.24
+++ libgnome/gnome-util.h	2001/02/27 23:29:57
@@ -29,7 +29,7 @@
 
 #include <stdlib.h>
 #include <glib.h>
-#include "gnome-defs.h"
+#include <libgnome/gnome-defs.h>
 
 BEGIN_GNOME_DECLS
 
Index: libgnome/gnomelib-init.h
===================================================================
RCS file: /cvs/gnome/gnome-libs/libgnome/gnomelib-init.h,v
retrieving revision 1.9
diff -u -u -r1.9 gnomelib-init.h
--- libgnome/gnomelib-init.h	2000/07/14 08:45:15	1.9
+++ libgnome/gnomelib-init.h	2001/02/27 23:29:57
@@ -24,6 +24,9 @@
 #ifndef GNOMELIB_INIT_H
 #define GNOMELIB_INIT_H 1
 
+#include <glib.h>
+#include <libgnome/gnome-defs.h>
+
 BEGIN_GNOME_DECLS
 
 extern GnomeModuleInfo libgnome_module_info;