? depcomp
? gnome-desktop-2.10.1-i18n.patch.bz2
? gnome-desktop-i18n1.patch
? stamp-h1
? libgnome-desktop/.gnome-desktop-item.c.swp
? libgnome-desktop/gnome-desktop-i18n.patch
Index: libgnome-desktop/ChangeLog
===================================================================
RCS file: /cvs/gnome/gnome-desktop/libgnome-desktop/ChangeLog,v
retrieving revision 1.192
diff -u -p -r1.192 ChangeLog
--- libgnome-desktop/ChangeLog	10 May 2005 01:53:40 -0000	1.192
+++ libgnome-desktop/ChangeLog	11 May 2005 15:58:30 -0000
@@ -1,3 +1,10 @@
+2005-05-11  Frederic Crozat  <fcrozat@mandriva.com>
+
+	* gnome-desktop-item.c: (init_i18n), (gnome_desktop_item_new):
+	* gnome-ditem-edit.c: (gnome_ditem_edit_class_init):
+	Initialize i18n before using it, remove textdomain
+	call, it is evil in a library.
+
 2005-05-09  Dennis Cranston <dennis_cranston@yahoo.com>
 
 	* libgnome/gnome-desktop-item.h: s/file_id/basename.
Index: libgnome-desktop/gnome-desktop-item.c
===================================================================
RCS file: /cvs/gnome/gnome-desktop/libgnome-desktop/gnome-desktop-item.c,v
retrieving revision 1.142
diff -u -p -r1.142 gnome-desktop-item.c
--- libgnome-desktop/gnome-desktop-item.c	9 May 2005 19:42:18 -0000	1.142
+++ libgnome-desktop/gnome-desktop-item.c	11 May 2005 15:58:30 -0000
@@ -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 @@ type_from_string (const char *type)
 	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:
  *
@@ -348,6 +362,8 @@ GnomeDesktopItem *
 gnome_desktop_item_new (void)
 {
 	GnomeDesktopItem *retval;
+
+	init_i18n ();
 
 	retval = g_new0 (GnomeDesktopItem, 1);
 
Index: libgnome-desktop/gnome-ditem-edit.c
===================================================================
RCS file: /cvs/gnome/gnome-desktop/libgnome-desktop/gnome-ditem-edit.c,v
retrieving revision 1.79
diff -u -p -r1.79 gnome-ditem-edit.c
--- libgnome-desktop/gnome-ditem-edit.c	13 Apr 2005 07:40:05 -0000	1.79
+++ libgnome-desktop/gnome-ditem-edit.c	11 May 2005 15:58:30 -0000
@@ -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>
@@ -125,8 +125,9 @@ gnome_ditem_edit_class_init (GnomeDItemE
         gobject_class = (GObjectClass*) klass;
 
         bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
+#    ifdef HAVE_BIND_TEXTDOMAIN_CODESET
         bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
-        textdomain (GETTEXT_PACKAGE);
+#    endif
 
         ditem_edit_signals[CHANGED] =
                 g_signal_new ("changed",
