summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Natterer <mitch@imendio.com>2008-06-12 13:53:55 +0000
committerMichael Natterer <mitch@src.gnome.org>2008-06-12 13:53:55 +0000
commit128a478b9bca9a3455eb6af153a227b26dcfb84f (patch)
tree4c3a9c5d556a8265c535a42bfa71e4af1e7fd91b
parente242d89ed39d65b28087751911aec31f87666db9 (diff)
downloadgtk+-128a478b9bca9a3455eb6af153a227b26dcfb84f.tar.gz
gtk/gtkmain.c don't #include <libintl.h>, it's pulled in via "gtkintl.h"
2008-06-12 Michael Natterer <mitch@imendio.com> * gtk/gtkmain.c * gtk/gtktrayicon-x11.c: don't #include <libintl.h>, it's pulled in via "gtkintl.h" from <glib/gi18n-lib.h>. svn path=/trunk/; revision=20362
-rw-r--r--ChangeLog6
-rw-r--r--gtk/gtkmain.c4
-rwxr-xr-xgtk/gtktrayicon-x11.c1
3 files changed, 6 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 1fbbe5c784..348686fb35 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-06-12 Michael Natterer <mitch@imendio.com>
+
+ * gtk/gtkmain.c
+ * gtk/gtktrayicon-x11.c: don't #include <libintl.h>, it's pulled
+ in via "gtkintl.h" from <glib/gi18n-lib.h>.
+
2008-06-12 Matthias Clasen <mclasen@redhat.com>
RH bug 248245 and 449379: cups client printing from gnome
diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index 234deb684a..f844af22c4 100644
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -31,10 +31,6 @@
#include <locale.h>
-#ifdef HAVE_BIND_TEXTDOMAIN_CODESET
-#include <libintl.h>
-#endif
-
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/gtk/gtktrayicon-x11.c b/gtk/gtktrayicon-x11.c
index b8bec7d7df..10a97c8256 100755
--- a/gtk/gtktrayicon-x11.c
+++ b/gtk/gtktrayicon-x11.c
@@ -24,7 +24,6 @@
#include <config.h>
#include <string.h>
-#include <libintl.h>
#include "gtkintl.h"
#include "gtkprivate.h"