[gst-cvs] wtay gstreamer: gstreamer/ gstreamer/gst/ gstreamer/tools/

[<wt...@ke...>]

CVS Root:       /cvs/gstreamer
Module:         gstreamer
Changes by:     wtay
Date:           Mon Jul 03 2006  14:15:00 UTC

Log message:
Patch by: Peter Kjellerstedt <pkj at axis dot com>
* gst/gst-i18n-app.h:
* gst/gst-i18n-lib.h:
* tools/gst-inspect.c: (print_signal_info):
The attached patch will make the inclusion of gettext.h unconditional in
gst/gst-i18n-app.h and gst/gst-i18n-lib.h, and it will remove the inclusion of
libintl.h in tools/gst-inspect.c.
This allows use of --disable-nls again and fixes #344642.

Modified files:
    .               : ChangeLog
    gst             : gst-i18n-app.h gst-i18n-lib.h
    tools           : gst-inspect.c

Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/ChangeLog.diff?r1=1.2640&r2=1.2641
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/gst-i18n-app.h.diff?r1=1.8&r2=1.9
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/gst-i18n-lib.h.diff?r1=1.8&r2=1.9
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/tools/gst-inspect.c.diff?r1=1.117&r2=1.118

====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /cvs/gstreamer/gstreamer/ChangeLog,v
retrieving revision 1.2640
retrieving revision 1.2641
diff -u -d -r1.2640 -r1.2641
--- ChangeLog	3 Jul 2006 10:30:49 -0000	1.2640
+++ ChangeLog	3 Jul 2006 14:14:48 -0000	1.2641
@@ -1,3 +1,15 @@
+2006-07-03  Wim Taymans  <wi...@fl...>
+
+	Patch by: Peter Kjellerstedt <pkj at axis dot com>
+	* gst/gst-i18n-app.h:
+	* gst/gst-i18n-lib.h:
+	* tools/gst-inspect.c: (print_signal_info):
+	The attached patch will make the inclusion of gettext.h unconditional in
+	gst/gst-i18n-app.h and gst/gst-i18n-lib.h, and it will remove the inclusion of
+	libintl.h in tools/gst-inspect.c.
+	This allows use of --disable-nls again and fixes #344642.
 2006-07-03  Edward Hervey  <ed...@fl...>
 
 	* gst/gstpad.c: (handle_pad_block), (gst_pad_push_event):
Index: gst-i18n-app.h
RCS file: /cvs/gstreamer/gstreamer/gst/gst-i18n-app.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- gst-i18n-app.h	12 Jun 2004 10:45:54 -0000	1.8
+++ gst-i18n-app.h	3 Jul 2006 14:14:48 -0000	1.9
@@ -23,9 +23,10 @@
 #ifndef __GST_I18N_APP_H__
 #define __GST_I18N_APP_H__
-#ifdef ENABLE_NLS
 #include "gettext.h" /* included with gettext distribution and copied */
+#ifdef ENABLE_NLS
 /* we want to use shorthand _() for translating and N_() for marking */
 #define _(String) gettext (String)
 #define N_(String) gettext_noop (String)
Index: gst-i18n-lib.h
RCS file: /cvs/gstreamer/gstreamer/gst/gst-i18n-lib.h,v
--- gst-i18n-lib.h	1 Apr 2006 09:41:43 -0000	1.8
+++ gst-i18n-lib.h	3 Jul 2006 14:14:48 -0000	1.9
@@ -27,10 +27,10 @@
 #error You must include config.h before including this header.
 #endif
-
 #define _(String) dgettext (GETTEXT_PACKAGE, String)
Index: gst-inspect.c
RCS file: /cvs/gstreamer/gstreamer/tools/gst-inspect.c,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -d -r1.117 -r1.118
--- gst-inspect.c	12 Jun 2006 08:51:20 -0000	1.117
+++ gst-inspect.c	3 Jul 2006 14:14:48 -0000	1.118
@@ -31,7 +31,6 @@
 #include <string.h>
 #include <locale.h>
-#include <libintl.h>
 #include <glib/gprintf.h>
 static char *_name;