fixed all files to include the i18n stuff correctly and don't mess up

2000-04-19  Michael Natterer  <mitch@gimp.org>

	* plug-ins/gdnytext/*: fixed all files to include the i18n stuff
	correctly and don't mess up Gimp's locale setup. Fixes #7878.

ChangeLog

@@ -1,3 +1,8 @@
+2000-04-19  Michael Natterer  <mitch@gimp.org>
+
+	* plug-ins/gdnytext/*: fixed all files to include the i18n stuff
+	correctly and don't mess up Gimp's locale setup. Fixes #7878.
+
 2000-04-18  Michael Natterer  <mitch@gimp.org>
 
 	* app/user_install.c: Creating the user's gimp directory may take

plug-ins/gdyntext/charmap.c

@@ -19,12 +19,16 @@
  *
  * $Id$
  */
+#include "config.h"
 
 #include <stdio.h>
+
 #include <gtk/gtk.h>
-#include "libgimp/stdplugins-intl.h"
+
 #include "charmap.h"
 
+#include "libgimp/stdplugins-intl.h"
+
 
 static void charmap_class_init(CharMapClass *class);
 static void charmap_init(CharMap *cm);

plug-ins/gdyntext/charmap_window.c

@@ -19,13 +19,16 @@
  *
  * $Id$
  */
+#include "config.h"
 
 #include <stdio.h>
+
 #include <gtk/gtk.h>
-#include "libgimp/stdplugins-intl.h"
+
 #include "charmap.h"
 #include "charmap_window.h"
 
+#include "libgimp/stdplugins-intl.h"
 
 static void charmap_window_class_init(CharMapWindowClass *class);
 static void charmap_window_init(CharMapWindow *mw);

plug-ins/gdyntext/font_selection.c

@@ -19,19 +19,17 @@
  *
  * $Id$
  */
+#include "config.h"
 
 #include <stdio.h>
 #include <string.h>
+
 #include <gtk/gtk.h>
-#include <gtk/gtkfeatures.h>
-#if GTK_CHECK_VERSION(1,3,0)
-#include <gdk/gdkprivate.h>	/* For gdk_error_warnings, really needed? */
-#else
-#include <gdk/gdkx.h>		/* Need Xlib headers */
-#endif
-#include "libgimp/stdplugins-intl.h"
+#include <gdk/gdkx.h>
+
 #include "font_selection.h"
 
+#include "libgimp/stdplugins-intl.h"
 
 static void font_selection_class_init(FontSelectionClass *class);
 static void font_selection_init(FontSelection *fs);

plug-ins/gdyntext/gdyntext.c

@@ -20,15 +20,19 @@
  * $Id$
  */
 
+#include "config.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <math.h>
 #include <ctype.h>
+
 #include <libgimp/gimp.h>
+
 #include "gdyntext.h"
 #include "gdyntext_ui.h"
 
+#include "libgimp/stdplugins-intl.h"
 
 char *strunescape(char *text);
 char *strescape(char *text);
@@ -528,7 +532,7 @@ void gdt_render_text_p(GdtVals *data, gboolean show_progress)
 	} else {
 		/* create a new layer */
 		data->layer_id = data->drawable_id = gimp_layer_new(data->image_id,
-			_("GDynText Layer "), layer_width, layer_height,
+			_("GDynText Layer"), layer_width, layer_height,
 			(GDrawableType)(gimp_image_base_type(data->image_id) * 2 + 1),
 			100.0, NORMAL_MODE);
 		gimp_layer_add_alpha(data->layer_id);

plug-ins/gdyntext/gdyntext.h

@@ -23,8 +23,6 @@
 #ifndef _GDYNTEXT_H_
 #define _GDYNTEXT_H_
 
-#include "libgimp/stdplugins-intl.h"
-
 #define GDYNTEXT_VERSION				"1.4.3"
 #define GDYNTEXT_MAGIC					"GDT09"
 #define GDYNTEXT_WEB_PAGE				"http://www.geocities.com/Tokyo/1474/gimp/"

plug-ins/gdyntext/gdyntext_ui.c

@@ -28,10 +28,13 @@
 #endif
 #include <stdio.h>
 #include <string.h>
+
 #include <libgimp/gimp.h>
-#include <gdk/gdk.h>
+
 #include "gdyntext_ui.h"
 
+#include "libgimp/stdplugins-intl.h"
+
 #include "graphics/antialias.xpm"
 #include "graphics/align_left.xpm"
 #include "graphics/align_center.xpm"
@@ -671,7 +674,6 @@ gdt_create_ui (GdtVals *data)
   argv = g_new0(gchar *, 1);
   argv[0] = g_strdup("gdyntext");
 
-  gtk_set_locale();
   gtk_init(&argc, &argv);
   gtk_rc_parse(gimp_gtkrc());
   gdk_set_use_xshm(gimp_use_xshm());

plug-ins/gdyntext/message_window.c

@@ -19,12 +19,15 @@
  *
  * $Id$
  */
+#include "config.h"
 
 #include <stdio.h>
+
 #include <gtk/gtk.h>
-#include "libgimp/stdplugins-intl.h"
+
 #include "message_window.h"
 
+#include "libgimp/stdplugins-intl.h"
 
 static void message_window_class_init(MessageWindowClass *class);
 static void message_window_init(MessageWindow *mw);