--- gnome-desktop-2.10.0/libgnome-desktop/gnome-desktop-item.c.init-i18n	2005-05-23 11:18:59.000000000 -0400
+++ gnome-desktop-2.10.0/libgnome-desktop/gnome-desktop-item.c	2005-05-23 11:18:59.000000000 -0400
@@ -38,7 +38,7 @@
 #include <unistd.h>
 #include <time.h>
 #include <string.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 #include <libgnome/gnome-util.h>
 #include <libgnome/gnome-exec.h>
 #include <libgnome/gnome-url.h>
@@ -337,6 +337,20 @@
 	return GNOME_DESKTOP_ITEM_TYPE_OTHER;
 }
 
+static void
+init_i18n (void) {
+	static gboolean initialized = FALSE;
+	
+	/* initialize i18n if needed */
+	if (!initialized) {
+		bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
+#ifdef HAVE_BIND_TEXTDOMAIN_CODESET
+		bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+#endif
+		initialized = TRUE;
+	}
+}
+
 /**
  * gnome_desktop_item_new:
  *
@@ -349,6 +363,8 @@
 {
 	GnomeDesktopItem *retval;
 
+	init_i18n ();
+
 	retval = g_new0 (GnomeDesktopItem, 1);
 
 	retval->refcount++;
--- gnome-desktop-2.10.0/libgnome-desktop/gnome-ditem-edit.c.init-i18n	2004-11-18 12:42:53.000000000 -0500
+++ gnome-desktop-2.10.0/libgnome-desktop/gnome-ditem-edit.c	2005-05-23 11:20:17.000000000 -0400
@@ -28,7 +28,7 @@
 #include <stdio.h>
 #include <ctype.h>
 #include <string.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 #include <gtk/gtk.h>
 
 #include <libgnome/gnome-macros.h>
@@ -124,6 +124,9 @@
         object_class = (GtkObjectClass*) klass;
         gobject_class = (GObjectClass*) klass;
 
+        bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
+        bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+
         ditem_edit_signals[CHANGED] =
                 g_signal_new ("changed",
                                 G_TYPE_FROM_CLASS (object_class),