[PATCH] File-Roller Include Fixes

From: Christian Neumair <chris gnome-de org>
To: desktop-devel-list gnome org
Cc: Paolo Bacchilega <paolo bacch tin it>
Subject: [PATCH] File-Roller Include Fixes
Date: Fri, 13 Feb 2004 17:05:52 +0100

This is a nitpicking patch. Some file-roller source files that use i18n
(aka gettext calls) don't include config.h which is needed for an
ENABLED_NLS check. Others don't have the HAVE_CONFIG_H condition around
the config.h include line.
This patch tries to fix those two trivial issues for the fr-specific (i.
e. non-c'n'p) source files.

regs,
 Chris

Index: component/file-roller-component.c
===================================================================
RCS file: /cvs/gnome/file-roller/component/file-roller-component.c,v
retrieving revision 1.4
diff -u -r1.4 file-roller-component.c
--- component/file-roller-component.c	20 Jan 2003 18:23:19 -0000	1.4
+++ component/file-roller-component.c	13 Feb 2004 16:01:38 -0000
@@ -21,7 +21,9 @@
  * Author:  James Willcox  <jwillcox gnome org>
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <string.h>
 #include <gtk/gtk.h>
Index: component/libmain.c
===================================================================
RCS file: /cvs/gnome/file-roller/component/libmain.c,v
retrieving revision 1.1
diff -u -r1.1 libmain.c
--- component/libmain.c	12 Nov 2002 00:49:40 -0000	1.1
+++ component/libmain.c	13 Feb 2004 16:01:39 -0000
@@ -24,7 +24,10 @@
 /* libmain.c - object activation infrastructure for shared library
    version of tree view. */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
+
 #include <string.h>
 #include "file-roller-component.h"
 #include <bonobo.h>
Index: src/dlg-add.c
===================================================================
RCS file: /cvs/gnome/file-roller/src/dlg-add.c,v
retrieving revision 1.26
diff -u -r1.26 dlg-add.c
--- src/dlg-add.c	25 Jan 2004 16:31:49 -0000	1.26
+++ src/dlg-add.c	13 Feb 2004 16:01:40 -0000
@@ -20,7 +20,10 @@
  *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
+
 #include <string.h>
 
 #include <gtk/gtk.h>
Index: src/dlg-batch-add.c
===================================================================
RCS file: /cvs/gnome/file-roller/src/dlg-batch-add.c,v
retrieving revision 1.14
diff -u -r1.14 dlg-batch-add.c
--- src/dlg-batch-add.c	16 Jan 2004 13:43:07 -0000	1.14
+++ src/dlg-batch-add.c	13 Feb 2004 16:01:40 -0000
@@ -20,7 +20,10 @@
  *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
+
 #include <string.h>
 #include <math.h>
 
Index: src/dlg-delete.c
===================================================================
RCS file: /cvs/gnome/file-roller/src/dlg-delete.c,v
retrieving revision 1.9
diff -u -r1.9 dlg-delete.c
--- src/dlg-delete.c	22 Nov 2003 13:27:03 -0000	1.9
+++ src/dlg-delete.c	13 Feb 2004 16:01:40 -0000
@@ -20,7 +20,10 @@
  *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
+
 #include <gtk/gtk.h>
 #include <glade/glade.h>
 #include <libgnomeui/gnome-file-entry.h>
Index: src/dlg-extract.c
===================================================================
RCS file: /cvs/gnome/file-roller/src/dlg-extract.c,v
retrieving revision 1.18
diff -u -r1.18 dlg-extract.c
--- src/dlg-extract.c	14 Jan 2004 17:58:11 -0000	1.18
+++ src/dlg-extract.c	13 Feb 2004 16:01:40 -0000
@@ -20,7 +20,10 @@
  *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
+
 #include <string.h>
 
 #include <gnome.h>
Index: src/dlg-open-with.c
===================================================================
RCS file: /cvs/gnome/file-roller/src/dlg-open-with.c,v
retrieving revision 1.6
diff -u -r1.6 dlg-open-with.c
--- src/dlg-open-with.c	25 Jan 2004 16:31:49 -0000	1.6
+++ src/dlg-open-with.c	13 Feb 2004 16:01:40 -0000
@@ -20,7 +20,10 @@
  *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
+
 #include <string.h>
 #include <gtk/gtk.h>
 #include <gnome.h>
Index: src/dlg-password.c
===================================================================
RCS file: /cvs/gnome/file-roller/src/dlg-password.c,v
retrieving revision 1.4
diff -u -r1.4 dlg-password.c
--- src/dlg-password.c	17 May 2003 18:01:28 -0000	1.4
+++ src/dlg-password.c	13 Feb 2004 16:01:40 -0000
@@ -20,7 +20,10 @@
  *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
+
 #include <string.h>
 
 #include <gtk/gtk.h>
Index: src/dlg-prop.c
===================================================================
RCS file: /cvs/gnome/file-roller/src/dlg-prop.c,v
retrieving revision 1.9
diff -u -r1.9 dlg-prop.c
--- src/dlg-prop.c	25 Jan 2004 16:31:49 -0000	1.9
+++ src/dlg-prop.c	13 Feb 2004 16:01:40 -0000
@@ -20,7 +20,10 @@
  *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
+
 #include <string.h>
 
 #include <gtk/gtk.h>
Index: src/dlg-viewer-or-app.c
===================================================================
RCS file: /cvs/gnome/file-roller/src/dlg-viewer-or-app.c,v
retrieving revision 1.2
diff -u -r1.2 dlg-viewer-or-app.c
--- src/dlg-viewer-or-app.c	13 Nov 2002 18:13:12 -0000	1.2
+++ src/dlg-viewer-or-app.c	13 Feb 2004 16:01:40 -0000
@@ -20,7 +20,10 @@
  *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
+
 #include <string.h>
 
 #include <gnome.h>
Index: src/dlg-viewer.c
===================================================================
RCS file: /cvs/gnome/file-roller/src/dlg-viewer.c,v
retrieving revision 1.8
diff -u -r1.8 dlg-viewer.c
--- src/dlg-viewer.c	4 Oct 2003 12:05:16 -0000	1.8
+++ src/dlg-viewer.c	13 Feb 2004 16:01:41 -0000
@@ -20,7 +20,10 @@
  *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
+
 #include <string.h>
 
 #include <gtk/gtk.h>
Index: src/file-data.c
===================================================================
RCS file: /cvs/gnome/file-roller/src/file-data.c,v
retrieving revision 1.2
diff -u -r1.2 file-data.c
--- src/file-data.c	19 Aug 2002 14:28:38 -0000	1.2
+++ src/file-data.c	13 Feb 2004 16:01:41 -0000
@@ -20,7 +20,10 @@
  *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
+
 #include <gnome.h>
 #include <libgnomevfs/gnome-vfs-mime-handlers.h>
 #include "file-data.h"
Index: src/file-utils.c
===================================================================
RCS file: /cvs/gnome/file-roller/src/file-utils.c,v
retrieving revision 1.14
diff -u -r1.14 file-utils.c
--- src/file-utils.c	22 Nov 2003 13:27:03 -0000	1.14
+++ src/file-utils.c	13 Feb 2004 16:01:41 -0000
@@ -20,6 +20,10 @@
  *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <pwd.h>
 #include <stdio.h>
 #include <stdlib.h>
Index: src/fr-archive.c
===================================================================
RCS file: /cvs/gnome/file-roller/src/fr-archive.c,v
retrieving revision 1.29
diff -u -r1.29 fr-archive.c
--- src/fr-archive.c	16 Jan 2004 13:43:08 -0000	1.29
+++ src/fr-archive.c	13 Feb 2004 16:01:41 -0000
@@ -20,6 +20,10 @@
  *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <unistd.h>
 #include <string.h>
 #include <stdio.h>
Index: src/fr-command-rpm.c
===================================================================
RCS file: /cvs/gnome/file-roller/src/fr-command-rpm.c,v
retrieving revision 1.3
diff -u -r1.3 fr-command-rpm.c
--- src/fr-command-rpm.c	8 Feb 2004 10:31:30 -0000	1.3
+++ src/fr-command-rpm.c	13 Feb 2004 16:01:42 -0000
@@ -20,6 +20,10 @@
  *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
Index: src/fr-command-tar.c
===================================================================
RCS file: /cvs/gnome/file-roller/src/fr-command-tar.c,v
retrieving revision 1.13
diff -u -r1.13 fr-command-tar.c
--- src/fr-command-tar.c	8 Feb 2004 10:31:30 -0000	1.13
+++ src/fr-command-tar.c	13 Feb 2004 16:01:42 -0000
@@ -20,7 +20,9 @@
  *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <stdlib.h>
 #include <string.h>
Index: src/fr-command-zip.c
===================================================================
RCS file: /cvs/gnome/file-roller/src/fr-command-zip.c,v
retrieving revision 1.13
diff -u -r1.13 fr-command-zip.c
--- src/fr-command-zip.c	8 Feb 2004 10:31:30 -0000	1.13
+++ src/fr-command-zip.c	13 Feb 2004 16:01:42 -0000
@@ -20,6 +20,10 @@
  *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
Index: src/fr-stock.c
===================================================================
RCS file: /cvs/gnome/file-roller/src/fr-stock.c,v
retrieving revision 1.2
diff -u -r1.2 fr-stock.c
--- src/fr-stock.c	14 Jan 2004 17:58:11 -0000	1.2
+++ src/fr-stock.c	13 Feb 2004 16:01:42 -0000
@@ -26,7 +26,6 @@
 #include "fr-stock.h"
 #include "icons/pixbufs.h"
 
-
 static gboolean stock_initialized = FALSE;
 
 
Index: src/gconf-utils.c
===================================================================
RCS file: /cvs/gnome/file-roller/src/gconf-utils.c,v
retrieving revision 1.2
diff -u -r1.2 gconf-utils.c
--- src/gconf-utils.c	9 Aug 2003 16:26:22 -0000	1.2
+++ src/gconf-utils.c	13 Feb 2004 16:01:42 -0000
@@ -44,7 +44,10 @@
 
 /* Modified by Paolo Bacchilega <paolo bacch tin it> for File Roller. */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
+
 #include <string.h>
 #include <gnome.h>
 #include <gconf/gconf-client.h>
Index: src/gtk-utils.c
===================================================================
RCS file: /cvs/gnome/file-roller/src/gtk-utils.c,v
retrieving revision 1.8
diff -u -r1.8 gtk-utils.c
--- src/gtk-utils.c	15 Nov 2003 13:47:53 -0000	1.8
+++ src/gtk-utils.c	13 Feb 2004 16:01:42 -0000
@@ -20,7 +20,10 @@
  *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
+
 #include <string.h>
 #include <gtk/gtk.h>
 #include <libgnome/libgnome.h>
Index: src/main.c
===================================================================
RCS file: /cvs/gnome/file-roller/src/main.c,v
retrieving revision 1.20
diff -u -r1.20 main.c
--- src/main.c	5 Feb 2004 16:44:55 -0000	1.20
+++ src/main.c	13 Feb 2004 16:01:42 -0000
@@ -20,7 +20,10 @@
  *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
+
 #include <gnome.h>
 #include <libgnomeui/gnome-window-icon.h>
 #include <libgnomevfs/gnome-vfs-init.h>
Index: src/menu-callbacks.c
===================================================================
RCS file: /cvs/gnome/file-roller/src/menu-callbacks.c,v
retrieving revision 1.35
diff -u -r1.35 menu-callbacks.c
--- src/menu-callbacks.c	25 Jan 2004 16:31:49 -0000	1.35
+++ src/menu-callbacks.c	13 Feb 2004 16:01:43 -0000
@@ -20,8 +20,10 @@
  *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
  */
 
-
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
+
 #include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
Index: src/utf8-fnmatch.c
===================================================================
RCS file: /cvs/gnome/file-roller/src/utf8-fnmatch.c,v
retrieving revision 1.3
diff -u -r1.3 utf8-fnmatch.c
--- src/utf8-fnmatch.c	22 Nov 2003 13:27:03 -0000	1.3
+++ src/utf8-fnmatch.c	13 Feb 2004 16:01:43 -0000
@@ -65,7 +65,9 @@
  * Compares a filename or pathname to a pattern.
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <stdio.h>
 #include <ctype.h>
Index: src/window.c
===================================================================
RCS file: /cvs/gnome/file-roller/src/window.c,v
retrieving revision 1.70
diff -u -r1.70 window.c
--- src/window.c	5 Feb 2004 16:44:55 -0000	1.70
+++ src/window.c	13 Feb 2004 16:01:45 -0000
@@ -20,7 +20,10 @@
  *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
+
 #include <math.h>
 #include <string.h>
 #include <gnome.h>

[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]