From 9bf800f79aaa7b3ec4767fab781eb45052ce026d Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode@fedoraproject.org>
Date: May 23 2005 15:30:22 +0000
Subject: - Let's try this gettext patch one more time--maybe, just maybe, I'll get

    it right this time (bug 155659).

---

diff --git a/gnome-desktop-2.10.0-init-i18n.patch b/gnome-desktop-2.10.0-init-i18n.patch
index b2ca777..6feb5ca 100644
--- a/gnome-desktop-2.10.0-init-i18n.patch
+++ b/gnome-desktop-2.10.0-init-i18n.patch
@@ -1,5 +1,5 @@
---- gnome-desktop-2.10.0/libgnome-desktop/gnome-desktop-item.c	30 Jan 2005 17:17:49 -0000	1.141
-+++ gnome-desktop-2.10.0/libgnome-desktop/gnome-desktop-item.c	29 Apr 2005 16:58:39 -0000
+--- 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>
@@ -9,21 +9,54 @@
  #include <libgnome/gnome-util.h>
  #include <libgnome/gnome-exec.h>
  #include <libgnome/gnome-url.h>
-@@ -348,6 +348,17 @@ GnomeDesktopItem *
- gnome_desktop_item_new (void)
- {
- 	GnomeDesktopItem *retval;
-+
-+	static gboolean _gnome_desktop_i18n_initialized = FALSE;
-+
+@@ -337,6 +337,20 @@
+ 	return GNOME_DESKTOP_ITEM_TYPE_OTHER;
+ }
+ 
++static void
++init_i18n (void) {
++	static gboolean initialized = FALSE;
++	
 +	/* initialize i18n if needed */
-+	if (!_gnome_desktop_i18n_initialized) {
++	if (!initialized) {
 +		bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
-+#    ifdef HAVE_BIND_TEXTDOMAIN_CODESET
++#ifdef HAVE_BIND_TEXTDOMAIN_CODESET
 +		bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
-+#    endif
-+		_gnome_desktop_i18n_initialized = TRUE;
++#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),
diff --git a/gnome-desktop.spec b/gnome-desktop.spec
index 6033fc2..e392356 100644
--- a/gnome-desktop.spec
+++ b/gnome-desktop.spec
@@ -11,7 +11,7 @@
 Summary: Package containing code shared among gnome-panel, gnome-session, nautilus, etc.
 Name: gnome-desktop
 Version: 2.10.0
-Release: 4
+Release: 5
 URL: http://www.gnome.org
 Source0: ftp://ftp.gnome.org/pub/GNOME/pre-gnome2/sources/gnome-desktop/%{name}-%{version}.tar.bz2
 Source1: %{name}-2.8.0-extrapo.tar.bz2
@@ -134,6 +134,10 @@ rm -rf $RPM_BUILD_ROOT
 #%{_datadir}/gtk-doc
 
 %changelog
+* Mon May 23 2005 Ray Strode <rstrode@redhat.com> - 2.10.0-5
+- Let's try this gettext patch one more time--maybe, just
+  maybe, I'll get it right this time (bug 155659).
+
 * Wed May 16 2005 Ray Strode <rstrode@redhat.com> - 2.10.0-4
 - run gettext initialization routines on startup (bug 155659)
   (use right patch).