[gnome-scan] Add missing #include <config.h> to make translations work
- From: Étienne Bersac <bersace src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-scan] Add missing #include <config.h> to make translations work
- Date: Sun, 3 Apr 2011 10:48:37 +0000 (UTC)
commit d38b6ddb43ce3a59d8ba7d7dede7c9314cc008e2
Author: Kjartan Maraas <kmaraas gnome org>
Date: Sun Apr 3 12:38:08 2011 +0200
Add missing #include <config.h> to make translations work
modules/gsane/gsane-common.h | 11 +++--------
modules/gsane/gsane-option-handler-generic.c | 12 +++++++++---
modules/gsane/gsane-option-handler.c | 12 +++++++++---
3 files changed, 21 insertions(+), 14 deletions(-)
---
diff --git a/modules/gsane/gsane-common.h b/modules/gsane/gsane-common.h
index 01c8991..7959ddc 100644
--- a/modules/gsane/gsane-common.h
+++ b/modules/gsane/gsane-common.h
@@ -2,17 +2,17 @@
/*
* gnome-scan
* Copyright (C) Ã?tienne Bersac 2007 <bersace03 laposte net>
- *
+ *
* gnome-scan is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
- *
+ *
* gnome-scan is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public
* License along with gnome-scan. If not, write to:
* The Free Software Foundation, Inc.,
@@ -23,12 +23,7 @@
#ifndef _GSANE_COMMON_H_
#define _GSANE_COMMON_H_
-#if HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <glib.h>
-#include <glib/gi18n-lib.h>
#include <sane/sane.h>
#include <gnome-scan.h>
diff --git a/modules/gsane/gsane-option-handler-generic.c b/modules/gsane/gsane-option-handler-generic.c
index ab641f2..732978a 100644
--- a/modules/gsane/gsane-option-handler-generic.c
+++ b/modules/gsane/gsane-option-handler-generic.c
@@ -1,16 +1,16 @@
-/* GSane - SANE GNOME Scan backend
+/* GSane - SANE GNOME Scan backend
* Copyright © 2007-2008 �tienne Bersac <bersace gnome org>
*
* GSane is free software; you can redistribute it and/or modify it
* under the terms of the GNU Lesser General Public License as
* published by the Free Software Foundation; either version 2.1 of
* the License, or (at your option) any later version.
- *
+ *
* GSane is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public
* License along with GSane. If not, write to:
*
@@ -19,7 +19,13 @@
* Boston, MA 02110-1301, USA
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <glib/gi18n-lib.h>
#include <gnome-scan.h>
+
#include "gsane-common.h"
#include "gsane-option-handler-generic.h"
diff --git a/modules/gsane/gsane-option-handler.c b/modules/gsane/gsane-option-handler.c
index 545c0ee..d62aa03 100644
--- a/modules/gsane/gsane-option-handler.c
+++ b/modules/gsane/gsane-option-handler.c
@@ -1,16 +1,16 @@
-/* GSane - SANE GNOME Scan backend
+/* GSane - SANE GNOME Scan backend
* Copyright © 2007-2008 �tienne Bersac <bersace gnome org>
*
* GSane is free software; you can redistribute it and/or modify it
* under the terms of the GNU Lesser General Public License as
* published by the Free Software Foundation; either version 2.1 of
* the License, or (at your option) any later version.
- *
+ *
* GSane is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public
* License along with GSane. If not, write to:
*
@@ -19,6 +19,12 @@
* Boston, MA 02110-1301, USA
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <glib/gi18n-lib.h>
+
#include "gsane-option-handler.h"
#include "gsane-scanner.h"
#include "gsane-common.h"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]