From 261d5404386a176a6a209d3deee08dc9b94f2d1a Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 18 May 2004 19:52:41 +0000 Subject: [PATCH] Include glib/gi18n-lib.h and only define the P_() macros ourselves. 2004-05-18 Matthias Clasen * gtk/gtkintl.h: Include glib/gi18n-lib.h and only define the P_() macros ourselves. --- ChangeLog | 3 +++ ChangeLog.pre-2-10 | 3 +++ ChangeLog.pre-2-6 | 3 +++ ChangeLog.pre-2-8 | 3 +++ gtk/gtkintl.h | 20 ++------------------ 5 files changed, 14 insertions(+), 18 deletions(-) diff --git a/ChangeLog b/ChangeLog index 514ae5d960..f50fab73b8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2004-05-18 Matthias Clasen + * gtk/gtkintl.h: Include glib/gi18n-lib.h and only define + the P_() macros ourselves. + * gtk/gtkentrycompletion.c (_gtk_entry_completion_resize_popup): Restrict the width of the popup to be no larger than the monitor. (#142678, DmD Ljungmark) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 514ae5d960..f50fab73b8 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,8 @@ 2004-05-18 Matthias Clasen + * gtk/gtkintl.h: Include glib/gi18n-lib.h and only define + the P_() macros ourselves. + * gtk/gtkentrycompletion.c (_gtk_entry_completion_resize_popup): Restrict the width of the popup to be no larger than the monitor. (#142678, DmD Ljungmark) diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 514ae5d960..f50fab73b8 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,5 +1,8 @@ 2004-05-18 Matthias Clasen + * gtk/gtkintl.h: Include glib/gi18n-lib.h and only define + the P_() macros ourselves. + * gtk/gtkentrycompletion.c (_gtk_entry_completion_resize_popup): Restrict the width of the popup to be no larger than the monitor. (#142678, DmD Ljungmark) diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 514ae5d960..f50fab73b8 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,5 +1,8 @@ 2004-05-18 Matthias Clasen + * gtk/gtkintl.h: Include glib/gi18n-lib.h and only define + the P_() macros ourselves. + * gtk/gtkentrycompletion.c (_gtk_entry_completion_resize_popup): Restrict the width of the popup to be no larger than the monitor. (#142678, DmD Ljungmark) diff --git a/gtk/gtkintl.h b/gtk/gtkintl.h index 9f66ec1e7f..d29723bb92 100644 --- a/gtk/gtkintl.h +++ b/gtk/gtkintl.h @@ -2,28 +2,12 @@ #define __GTKINTL_H__ #include "config.h" -#include +#include #ifdef ENABLE_NLS -#include -#define _(String) dgettext(GETTEXT_PACKAGE,String) #define P_(String) dgettext(GETTEXT_PACKAGE "-properties",String) -#define Q_(String) g_strip_context ((String), gettext (String)) -#ifdef gettext_noop -#define N_(String) gettext_noop(String) -#else -#define N_(String) (String) -#endif -#else /* NLS is disabled */ -#define _(String) (String) +#else #define P_(String) (String) -#define N_(String) (String) -#define Q_(String) (String) -#define textdomain(String) (String) -#define gettext(String) (String) -#define dgettext(Domain,String) (String) -#define dcgettext(Domain,String,Type) (String) -#define bindtextdomain(Domain,Directory) (Domain) #endif #endif