gnome-scan r558 - in trunk: . lib modules

[bersace svn gnome org]

Author: bersace
Date: Thu Feb 28 23:13:07 2008
New Revision: 558
URL: http://svn.gnome.org/viewvc/gnome-scan?rev=558&view=rev

Log:
Use internal translation domain in library, not app one.

Added:
   trunk/lib/gnome-scan-private.h
Modified:
   trunk/ChangeLog
   trunk/lib/Makefile.am
   trunk/lib/gnome-scan-acquisition-dialog.c
   trunk/lib/gnome-scan-dialog.c
   trunk/lib/gnome-scan-job.c
   trunk/lib/gnome-scan-preview-plugin-area.c
   trunk/lib/gnome-scan-processor-common.c
   trunk/lib/gnome-scanner.c
   trunk/modules/gsfile-filenames-widget.c

Modified: trunk/lib/Makefile.am
==============================================================================
--- trunk/lib/Makefile.am	(original)
+++ trunk/lib/Makefile.am	Thu Feb 28 23:13:07 2008
@@ -80,7 +80,8 @@
 	gnome-scan-processor-common.h          \
 	gnome-scan-processor-common.c          \
 	gnome-scan-preview-plugin-rotation.h          \
-	gnome-scan-preview-plugin-rotation.c
+	gnome-scan-preview-plugin-rotation.c          \
+	gnome-scan-private.h
 
 
 gnome-scan-types.%: $(types_deps) Makefile gnome-scan-types.%.tpl

Modified: trunk/lib/gnome-scan-acquisition-dialog.c
==============================================================================
--- trunk/lib/gnome-scan-acquisition-dialog.c	(original)
+++ trunk/lib/gnome-scan-acquisition-dialog.c	Thu Feb 28 23:13:07 2008
@@ -45,6 +45,7 @@
  **/
 
 #include <glib/gi18n.h>
+#include "gnome-scan-private.h"
 #include "gnome-scan-acquisition-dialog.h"
 
 #define	GET_PRIVATE(o)	(G_TYPE_INSTANCE_GET_PRIVATE ((o), GNOME_TYPE_SCAN_ACQUISITION_DIALOG, GnomeScanAcquisitionDialogPrivate))

Modified: trunk/lib/gnome-scan-dialog.c
==============================================================================
--- trunk/lib/gnome-scan-dialog.c	(original)
+++ trunk/lib/gnome-scan-dialog.c	Thu Feb 28 23:13:07 2008
@@ -35,6 +35,7 @@
 
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <glib/gi18n.h>
+#include "gnome-scan-private.h"
 #include "gnome-scan-init.h"
 #include "gnome-scan-dialog.h"
 #include "gnome-scan-acquisition-dialog.h"

Modified: trunk/lib/gnome-scan-job.c
==============================================================================
--- trunk/lib/gnome-scan-job.c	(original)
+++ trunk/lib/gnome-scan-job.c	Thu Feb 28 23:13:07 2008
@@ -37,6 +37,7 @@
  * execution in a worker thread.
  **/
 #include <glib/gi18n.h>
+#include "gnome-scan-private.h"
 #include <gegl.h>
 #include "gnome-scan-processor-common.h"
 #include "gnome-scan-job.h"

Modified: trunk/lib/gnome-scan-preview-plugin-area.c
==============================================================================
--- trunk/lib/gnome-scan-preview-plugin-area.c	(original)
+++ trunk/lib/gnome-scan-preview-plugin-area.c	Thu Feb 28 23:13:07 2008
@@ -20,6 +20,7 @@
 */
 
 #include <glib/gi18n.h>
+#include "gnome-scan-private.h"
 #include "gnome-scan-preview-plugin-area.h"
 #include "gnome-scan-preview-area.h"
 

Added: trunk/lib/gnome-scan-private.h
==============================================================================
--- (empty file)
+++ trunk/lib/gnome-scan-private.h	Thu Feb 28 23:13:07 2008
@@ -0,0 +1,31 @@
+/*
+ * This program 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.
+ * 
+ * This program 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 main.c; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor Boston, MA 02110-1301,  USA
+ */
+ 
+#ifndef _GNOME_SCAN_PRIVATE___H
+#define _GNOME_SCAN_PRIVATE___H
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <glib/gi18n.h>
+
+#undef  _
+#define _(string)   dgettext(GETTEXT_PACKAGE, string)
+
+
+#endif /* GNOME_SCAN_PRIVATE___H */
+

Modified: trunk/lib/gnome-scan-processor-common.c
==============================================================================
--- trunk/lib/gnome-scan-processor-common.c	(original)
+++ trunk/lib/gnome-scan-processor-common.c	Thu Feb 28 23:13:07 2008
@@ -20,6 +20,10 @@
  * 	Boston, MA  02110-1301, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <glib/gi18n.h>
 #include "gnome-scan-param-specs.h"
 #include "gnome-scan-utils.h"
@@ -70,6 +74,7 @@
 								   GS_PARAM_GROUP_PROCESSING_COMMON,
 								   TRUE,
 								   G_PARAM_WRITABLE);
+	gs_param_spec_set_domain (pspec, GETTEXT_PACKAGE);
 	gnome_scan_plugin_params_add (GNOME_SCAN_PLUGIN (object), pspec);
 }
 

Modified: trunk/lib/gnome-scanner.c
==============================================================================
--- trunk/lib/gnome-scanner.c	(original)
+++ trunk/lib/gnome-scanner.c	Thu Feb 28 23:13:07 2008
@@ -34,6 +34,7 @@
  **/
 
 #include <glib/gi18n.h>
+#include "gnome-scan-private.h"
 #include "gnome-scanner.h"
 #include "gnome-scan-types.h"
 #define	GET_PRIVATE(o)	(G_TYPE_INSTANCE_GET_PRIVATE ((o), GNOME_TYPE_SCANNER, GnomeScannerPrivate))

Modified: trunk/modules/gsfile-filenames-widget.c
==============================================================================
--- trunk/modules/gsfile-filenames-widget.c	(original)
+++ trunk/modules/gsfile-filenames-widget.c	Thu Feb 28 23:13:07 2008
@@ -20,11 +20,19 @@
  * 	Boston, MA  02110-1301, USA.
  */
 
+#ifdef  HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <glib/gi18n.h>
 #include "gsfile-pspec.h"
 #include "gsfile-filenames-widget.h"
 
 #define	GET_PRIVATE(o)	(G_TYPE_INSTANCE_GET_PRIVATE ((o), GSFILE_TYPE_FILENAMES_WIDGET, GSFileFilenamesWidgetPrivate))
+
+#undef  _
+#define _(string)   dgettext(GETTEXT_PACKAGE, string)
+
 #define	PREVIEW_SIZE	96
 
 typedef struct _GSFileFilenamesWidgetPrivate GSFileFilenamesWidgetPrivate;