diff options
| author | TingPing <tingping@tingping.se> | 2014-06-21 23:10:18 -0400 |
|---|---|---|
| committer | TingPing <tingping@tingping.se> | 2014-06-21 23:10:18 -0400 |
| commit | c3c6b46230df853b51b0979c1c5a561517b000a0 (patch) | |
| tree | b660ff7ed34b400e168f817135113f692ac706cf | |
| parent | 47b4b0da8a3f7203951f9c9bd76dbd559eeb17a5 (diff) | |
Clean up includes for gettext
It is always enabled.
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | src/common/hexchat.h | 15 | ||||
| -rw-r--r-- | src/fe-gtk/fe-gtk.h | 16 |
3 files changed, 2 insertions, 30 deletions
diff --git a/configure.ac b/configure.ac index fdcf4fb9..7afe3224 100644 --- a/configure.ac +++ b/configure.ac @@ -843,7 +843,6 @@ echo D-Bus support ......... : $dbus echo libnotify support ..... : $libnotify echo libcanberra support ... : $libcanberra echo Plugin interface ...... : $plugin -echo NLS/gettext ........... : $USE_NLS echo IPv6 support .......... : $ipv6 echo MS Proxy NTLM \(ISA\) ... : $have_ntlm echo libproxy support ...... : $libproxy diff --git a/src/common/hexchat.h b/src/common/hexchat.h index 445455d2..c0a7d253 100644 --- a/src/common/hexchat.h +++ b/src/common/hexchat.h @@ -21,6 +21,7 @@ #include <glib.h> #include <glib/gstdio.h> +#include <glib/gi18n.h> #include <time.h> /* need time_t */ @@ -92,20 +93,6 @@ #define USERNAMELEN 10 #define HIDDEN_CHAR 8 /* invisible character for xtext */ -#if defined(ENABLE_NLS) && !defined(_) -# include <libintl.h> -# define _(x) gettext(x) -# ifdef gettext_noop -# define N_(String) gettext_noop (String) -# else -# define N_(String) (String) -# endif -#endif -#if !defined(_) -# define N_(String) (String) -# define _(x) (x) -#endif - struct nbexec { int myfd; diff --git a/src/fe-gtk/fe-gtk.h b/src/fe-gtk/fe-gtk.h index c93ec1c6..17d1ab4d 100644 --- a/src/fe-gtk/fe-gtk.h +++ b/src/fe-gtk/fe-gtk.h @@ -28,21 +28,7 @@ #include <sys/types.h> #endif -#if defined(ENABLE_NLS) && !defined(_) -# include <libintl.h> -# define _(x) gettext(x) -# ifdef gettext_noop -# define N_(String) gettext_noop (String) -# else -# define N_(String) (String) -# endif -#endif -#if !defined(ENABLE_NLS) && defined(_) -# undef _ -# define N_(String) (String) -# define _(x) (x) -#endif - +#include <glib/gi18n.h> #include <gtk/gtk.h> #ifdef HAVE_GTK_MAC |