Re: [evolution-patches] Include config.h where i18n headers are included

[Christian Neumair <chris gnome-de org>]

On Wed, 2004-02-11 at 14:18 -0500, Jeffrey Stedfast wrote:

> kmaraas just poked me on cvs and I've already fixed the smime/* files,
> just an FYI.

Nice. May I commit the rest?

regs,
 Chris

> On Wed, 2004-02-11 at 13:55, Christian Neumair wrote:
> > All files including standard i18n headers like gnome-i18n.h and bonobo-
> > i18n.h should include config.h to get the value of ENABLE_NLS.
> > The attached patch does this for files that don't already do so.
> > 
> > regs,
> >  Chris
> > 
> > ______________________________________________________________________
> > Index: addressbook/gui/component/addressbook-migrate.c
> > ===================================================================
> > RCS file: /cvs/gnome/evolution/addressbook/gui/component/addressbook-migrate.c,v
> > retrieving revision 1.15
> > diff -u -r1.15 addressbook-migrate.c
> > --- addressbook/gui/component/addressbook-migrate.c	8 Feb 2004 19:16:31 -0000	1.15
> > +++ addressbook/gui/component/addressbook-migrate.c	11 Feb 2004 18:48:13 -0000
> > @@ -19,6 +19,10 @@
> >   * Author: Chris Toshok (toshok ximian com)
> >   */
> >  
> > +#ifdef HAVE_CONFIG_H
> > +#include <config.h>
> > +#endif
> > +
> >  #include <glib.h>
> >  #include <string.h>
> >  #include "addressbook-migrate.h"
> > Index: addressbook/gui/widgets/eab-contact-display.c
> > ===================================================================
> > RCS file: /cvs/gnome/evolution/addressbook/gui/widgets/eab-contact-display.c,v
> > retrieving revision 1.3
> > diff -u -r1.3 eab-contact-display.c
> > --- addressbook/gui/widgets/eab-contact-display.c	3 Feb 2004 18:22:46 -0000	1.3
> > +++ addressbook/gui/widgets/eab-contact-display.c	11 Feb 2004 18:48:13 -0000
> > @@ -20,6 +20,10 @@
> >   *
> >   */
> >  
> > +#ifdef HAVE_CONFIG_H
> > +#include <config.h>
> > +#endif
> > +
> >  #include "eab-contact-display.h"
> >  
> >  #include "e-util/e-html-utils.h"
> > Index: calendar/common/authentication.c
> > ===================================================================
> > RCS file: /cvs/gnome/evolution/calendar/common/authentication.c,v
> > retrieving revision 1.3
> > diff -u -r1.3 authentication.c
> > --- calendar/common/authentication.c	4 Feb 2004 21:31:57 -0000	1.3
> > +++ calendar/common/authentication.c	11 Feb 2004 18:48:14 -0000
> > @@ -21,6 +21,10 @@
> >   * USA
> >   */
> >  
> > +#ifdef HAVE_CONFIG_H
> > +#include <config.h>
> > +#endif
> > +
> >  #include <string.h>
> >  #include <bonobo/bonobo-i18n.h>
> >  #include "e-util/e-passwords.h"
> > Index: calendar/gui/e-cal-model.c
> > ===================================================================
> > RCS file: /cvs/gnome/evolution/calendar/gui/e-cal-model.c,v
> > retrieving revision 1.18
> > diff -u -r1.18 e-cal-model.c
> > --- calendar/gui/e-cal-model.c	22 Jan 2004 15:45:08 -0000	1.18
> > +++ calendar/gui/e-cal-model.c	11 Feb 2004 18:48:39 -0000
> > @@ -19,6 +19,10 @@
> >   * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
> >   */
> >  
> > +#ifdef HAVE_CONFIG_H
> > +#include <config.h>
> > +#endif
> > +
> >  #include <string.h>
> >  #include <glib/garray.h>
> >  #include <libgnome/gnome-i18n.h>
> > Index: calendar/gui/migration.c
> > ===================================================================
> > RCS file: /cvs/gnome/evolution/calendar/gui/migration.c,v
> > retrieving revision 1.14
> > diff -u -r1.14 migration.c
> > --- calendar/gui/migration.c	29 Jan 2004 16:31:13 -0000	1.14
> > +++ calendar/gui/migration.c	11 Feb 2004 18:48:40 -0000
> > @@ -20,6 +20,10 @@
> >   * Author: Rodrigo Moya <rodrigo ximian com>
> >   */
> >  
> > +#ifdef HAVE_CONFIG_H
> > +#include <config.h>
> > +#endif
> > +
> >  #include <string.h>
> >  #include <bonobo/bonobo-i18n.h>
> >  #include <libgnomevfs/gnome-vfs-uri.h>
> > Index: calendar/gui/alarm-notify/util.c
> > ===================================================================
> > RCS file: /cvs/gnome/evolution/calendar/gui/alarm-notify/util.c,v
> > retrieving revision 1.2
> > diff -u -r1.2 util.c
> > --- calendar/gui/alarm-notify/util.c	7 Nov 2003 05:52:01 -0000	1.2
> > +++ calendar/gui/alarm-notify/util.c	11 Feb 2004 18:48:40 -0000
> > @@ -19,6 +19,10 @@
> >   * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
> >   */
> >  
> > +#ifdef HAVE_CONFIG_H
> > +#include <config.h>
> > +#endif
> > +
> >  #include <libgnome/gnome-i18n.h>
> >  #include <e-util/e-time-utils.h>
> >  #include <libecal/e-cal-time-util.h>
> > Index: calendar/gui/dialogs/copy-source-dialog.c
> > ===================================================================
> > RCS file: /cvs/gnome/evolution/calendar/gui/dialogs/copy-source-dialog.c,v
> > retrieving revision 1.11
> > diff -u -r1.11 copy-source-dialog.c
> > --- calendar/gui/dialogs/copy-source-dialog.c	27 Jan 2004 00:19:53 -0000	1.11
> > +++ calendar/gui/dialogs/copy-source-dialog.c	11 Feb 2004 18:48:40 -0000
> > @@ -18,6 +18,10 @@
> >   * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
> >   */
> >  
> > +#ifdef HAVE_CONFIG_H
> > +#include <config.h>
> > +#endif
> > +
> >  #include <gtk/gtkbox.h>
> >  #include <gtk/gtkdialog.h>
> >  #include <gtk/gtklabel.h>
> > Index: calendar/importers/icalendar-importer.c
> > ===================================================================
> > RCS file: /cvs/gnome/evolution/calendar/importers/icalendar-importer.c,v
> > retrieving revision 1.33
> > diff -u -r1.33 icalendar-importer.c
> > --- calendar/importers/icalendar-importer.c	10 Feb 2004 15:46:28 -0000	1.33
> > +++ calendar/importers/icalendar-importer.c	11 Feb 2004 18:48:40 -0000
> > @@ -20,6 +20,10 @@
> >   * Boston, MA 02111-1307, USA.
> >   */
> >  
> > +#ifdef HAVE_CONFIG_H
> > +#include <config.h>
> > +#endif
> > +
> >  #include <string.h>
> >  #include <unistd.h>
> >  #include <sys/types.h>
> > Index: e-util/e-categories-config.c
> > ===================================================================
> > RCS file: /cvs/gnome/evolution/e-util/e-categories-config.c,v
> > retrieving revision 1.15
> > diff -u -r1.15 e-categories-config.c
> > --- e-util/e-categories-config.c	22 Feb 2003 23:00:59 -0000	1.15
> > +++ e-util/e-categories-config.c	11 Feb 2004 18:48:41 -0000
> > @@ -8,6 +8,10 @@
> >   * Copyright 2001, Ximian, Inc.
> >   */
> >  
> > +#ifdef HAVE_CONFIG_H
> > +#include <config.h>
> > +#endif
> > +
> >  #include <string.h>
> >  #include <libgnomeui/gnome-dialog.h>
> >  #include <libgnome/gnome-i18n.h>
> > Index: e-util/e-component-listener.c
> > ===================================================================
> > RCS file: /cvs/gnome/evolution/e-util/e-component-listener.c,v
> > retrieving revision 1.6
> > diff -u -r1.6 e-component-listener.c
> > --- e-util/e-component-listener.c	23 Jul 2003 14:55:52 -0000	1.6
> > +++ e-util/e-component-listener.c	11 Feb 2004 18:48:41 -0000
> > @@ -8,6 +8,10 @@
> >   * Copyright 2002, Ximian, Inc.
> >   */
> >  
> > +#ifdef HAVE_CONFIG_H
> > +#include <config.h>
> > +#endif
> > +
> >  #include <bonobo/bonobo-exception.h>
> >  #include <bonobo/bonobo-object.h>
> >  #include "e-component-listener.h"
> > Index: e-util/e-dialog-utils.c
> > ===================================================================
> > RCS file: /cvs/gnome/evolution/e-util/e-dialog-utils.c,v
> > retrieving revision 1.17
> > diff -u -r1.17 e-dialog-utils.c
> > --- e-util/e-dialog-utils.c	25 Mar 2003 16:28:33 -0000	1.17
> > +++ e-util/e-dialog-utils.c	11 Feb 2004 18:48:41 -0000
> > @@ -22,6 +22,10 @@
> >   *   Ettore Perazzoli <ettore ximian com>
> >   */
> >  
> > +#ifdef HAVE_CONFIG_H
> > +#include <config.h>
> > +#endif
> > +
> >  #include "e-dialog-utils.h"
> >  
> >  #include <gdk/gdkx.h>
> > Index: smime/gui/certificate-manager.c
> > ===================================================================
> > RCS file: /cvs/gnome/evolution/smime/gui/certificate-manager.c,v
> > retrieving revision 1.7
> > diff -u -r1.7 certificate-manager.c
> > --- smime/gui/certificate-manager.c	5 Jan 2004 20:49:43 -0000	1.7
> > +++ smime/gui/certificate-manager.c	11 Feb 2004 18:48:42 -0000
> > @@ -22,6 +22,10 @@
> >  
> >  #define GLADE_FILE_NAME "smime-ui.glade"
> >  
> > +#ifdef HAVE_CONFIG_H
> > +#include <config.h>
> > +#endif
> > +
> >  #include <gtk/gtk.h>
> >  
> >  #include <libgnome/gnome-i18n.h>
> > Index: smime/gui/certificate-viewer.c
> > ===================================================================
> > RCS file: /cvs/gnome/evolution/smime/gui/certificate-viewer.c,v
> > retrieving revision 1.5
> > diff -u -r1.5 certificate-viewer.c
> > --- smime/gui/certificate-viewer.c	5 Jan 2004 19:44:42 -0000	1.5
> > +++ smime/gui/certificate-viewer.c	11 Feb 2004 18:48:42 -0000
> > @@ -20,6 +20,10 @@
> >   *
> >   */
> >  
> > +#ifdef HAVE_CONFIG_H
> > +#include <config.h>
> > +#endif
> > +
> >  #include "certificate-viewer.h"
> >  
> >  #include "e-asn1-object.h"
> > Index: smime/gui/component.c
> > ===================================================================
> > RCS file: /cvs/gnome/evolution/smime/gui/component.c,v
> > retrieving revision 1.1
> > diff -u -r1.1 component.c
> > --- smime/gui/component.c	5 Jan 2004 20:49:43 -0000	1.1
> > +++ smime/gui/component.c	11 Feb 2004 18:48:42 -0000
> > @@ -20,6 +20,10 @@
> >   *
> >   */
> >  
> > +#ifdef HAVE_CONFIG_H
> > +#include <config.h>
> > +#endif
> > +
> >  #include <libgnome/gnome-i18n.h>
> >  #include "e-cert-db.h"
> >  #include "e-util/e-passwords.h"
> > Index: smime/gui/e-cert-selector.c
> > ===================================================================
> > RCS file: /cvs/gnome/evolution/smime/gui/e-cert-selector.c,v
> > retrieving revision 1.4
> > diff -u -r1.4 e-cert-selector.c
> > --- smime/gui/e-cert-selector.c	8 Jan 2004 06:00:27 -0000	1.4
> > +++ smime/gui/e-cert-selector.c	11 Feb 2004 18:48:43 -0000
> > @@ -18,6 +18,10 @@
> >   * Boston, MA 02111-1307, USA.
> >   */
> >  
> > +#ifdef HAVE_CONFIG_H
> > +#include <config.h>
> > +#endif
> > +
> >  #include <libgnome/gnome-i18n.h>
> >  
> >  #include <gal/util/e-util.h>
> > Index: smime/lib/e-cert-db.c
> > ===================================================================
> > RCS file: /cvs/gnome/evolution/smime/lib/e-cert-db.c,v
> > retrieving revision 1.6
> > diff -u -r1.6 e-cert-db.c
> > --- smime/lib/e-cert-db.c	5 Jan 2004 21:04:02 -0000	1.6
> > +++ smime/lib/e-cert-db.c	11 Feb 2004 18:48:43 -0000
> > @@ -62,6 +62,10 @@
> >  #define CERT_NewTempCertificate __CERT_NewTempCertificate
> >  #define CERT_AddTempCertToPerm __CERT_AddTempCertToPerm
> >  
> > +#ifdef HAVE_CONFIG_H
> > +#include <config.h>
> > +#endif
> > +
> >  #include "smime-marshal.h"
> >  #include "e-cert-db.h"
> >  #include "e-cert-trust.h"
> > Index: smime/lib/e-cert.c
> > ===================================================================
> > RCS file: /cvs/gnome/evolution/smime/lib/e-cert.c,v
> > retrieving revision 1.8
> > diff -u -r1.8 e-cert.c
> > --- smime/lib/e-cert.c	5 Dec 2003 22:35:15 -0000	1.8
> > +++ smime/lib/e-cert.c	11 Feb 2004 18:48:44 -0000
> > @@ -55,6 +55,10 @@
> >   *
> >   */
> >  
> > +#ifdef HAVE_CONFIG_H
> > +#include <config.h>
> > +#endif
> > +
> >  #include <time.h>
> >  
> >  #include <libgnome/gnome-i18n.h>
> > Index: smime/lib/e-pkcs12.c
> > ===================================================================
> > RCS file: /cvs/gnome/evolution/smime/lib/e-pkcs12.c,v
> > retrieving revision 1.3
> > diff -u -r1.3 e-pkcs12.c
> > --- smime/lib/e-pkcs12.c	5 Jan 2004 20:49:44 -0000	1.3
> > +++ smime/lib/e-pkcs12.c	11 Feb 2004 18:48:44 -0000
> > @@ -55,6 +55,10 @@
> >   *
> >   */
> >  
> > +#ifdef HAVE_CONFIG_H
> > +#include <config.h>
> > +#endif
> > +
> >  #include <gtk/gtk.h>
> >  #include <libgnome/gnome-i18n.h>
> >  
>