gegl r2015 - in trunk: . gegl gegl/module operations/color

[neo svn gnome org]

Author: neo
Date: Wed Feb 13 07:17:52 2008
New Revision: 2015
URL: http://svn.gnome.org/viewvc/gegl?rev=2015&view=rev

Log:
2008-02-13  Sven Neumann  <sven gimp org>

	* configure.ac: define GETTEXT_PACKAGE here so it ends up being
	defined in config.h.

	* gegl/gegl-plugin.h: glib/gi18n-lib.h must not be included in
	a public header file.

	* gegl/module/geglmodule.c
	* operations/color/brightness-contrast.c: changed accordingly.



Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/gegl/gegl-plugin.h
   trunk/gegl/module/geglmodule.c
   trunk/operations/color/brightness-contrast.c

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Wed Feb 13 07:17:52 2008
@@ -129,6 +129,15 @@
 AM_MAINTAINER_MODE
 
 
+######################
+# gettext i18n support
+######################
+
+GETTEXT_PACKAGE=gegl-$GEGL_API_VERSION
+AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",
+                   [The prefix for our gettext translation domains.])
+
+
 ###############
 # Generic stuff
 ###############

Modified: trunk/gegl/gegl-plugin.h
==============================================================================
--- trunk/gegl/gegl-plugin.h	(original)
+++ trunk/gegl/gegl-plugin.h	Wed Feb 13 07:17:52 2008
@@ -20,14 +20,9 @@
 #ifndef __GEGL_PLUGIN_H__
 #define __GEGL_PLUGIN_H__
 
-#ifndef GETTEXT_PACKAGE
-#define GETTEXT_PACKAGE "gegl-0.0"
-#endif
-
 #include <string.h>
 #include <glib-object.h>
 #include <gegl.h>
-#include <glib/gi18n-lib.h>
 
 /* Extra types needed when coding operations */
 typedef struct _GeglOperation        GeglOperation;
@@ -112,15 +107,17 @@
 
 /***
  * GeglOperation:
- * 
- * All the image processing code in GEGL is implemented as GeglOperations,
- * GEGL oeprations are implemented as GObject with a convenience API called
- * chanting that abstracts away the boiler plater needed to generate introspectable
- * named properties of different types.
  *
- * Most types of operations like: filters, composers, sources, sinks, point
- * operations, compositing operations, and spatial operations with fixed
- * neighbourhoods. These base classes builds on top of the GeglOperationsClass:
+ * All the image processing code in GEGL is implemented as
+ * GeglOperations, GEGL oeprations are implemented as GObject with a
+ * convenience API called chanting that abstracts away the boiler
+ * plater needed to generate introspectable named properties of
+ * different types.
+ *
+ * Most types of operations like: filters, composers, sources, sinks,
+ * point operations, compositing operations, and spatial operations
+ * with fixed neighbourhoods. These base classes builds on top of the
+ * GeglOperationsClass:
  *
  * See <a href='gegl-operation.h.html'>gegl-operation.h</a> for details.
  */

Modified: trunk/gegl/module/geglmodule.c
==============================================================================
--- trunk/gegl/module/geglmodule.c	(original)
+++ trunk/gegl/module/geglmodule.c	Wed Feb 13 07:17:52 2008
@@ -16,23 +16,18 @@
  * gimpmodule.c: * (C) 1999 Austin Donnelly <austin gegl org>
  */
 
+#include "config.h"
 
 #include <string.h>
 
 #include <glib-object.h>
+#include <glib/gi18n-lib.h>
 
 #include "geglmodule.h"
 
-#if 0
-/* define hacks to make it compile with as small modifications as possible
- * from geglmodule
- */
-#define _(string)                       (string)
-#define N_(string)                      (string)
-#define gettext(string)                 (string)
-#endif
 
 #define gegl_filename_to_utf8(filename) (filename)
+
 enum
 {
   MODIFIED,

Modified: trunk/operations/color/brightness-contrast.c
==============================================================================
--- trunk/operations/color/brightness-contrast.c	(original)
+++ trunk/operations/color/brightness-contrast.c	Wed Feb 13 07:17:52 2008
@@ -16,6 +16,8 @@
  * Copyright 2006 Ãyvind KolÃs <pippin gimp org>
  */
 
+#include "config.h"
+#include <glib/gi18n-lib.h>
 
 /* Followed by this #if ... */
 #ifdef GEGL_CHANT_PROPERTIES