diff --git a/gnome-desktop-2.10.0-init-i18n.patch b/gnome-desktop-2.10.0-init-i18n.patch new file mode 100644 index 0000000..b2ca777 --- /dev/null +++ b/gnome-desktop-2.10.0-init-i18n.patch @@ -0,0 +1,29 @@ +--- 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 +@@ -38,7 +38,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include +@@ -348,6 +348,17 @@ GnomeDesktopItem * + gnome_desktop_item_new (void) + { + GnomeDesktopItem *retval; ++ ++ static gboolean _gnome_desktop_i18n_initialized = FALSE; ++ ++ /* initialize i18n if needed */ ++ if (!_gnome_desktop_i18n_initialized) { ++ bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR); ++# ifdef HAVE_BIND_TEXTDOMAIN_CODESET ++ bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); ++# endif ++ _gnome_desktop_i18n_initialized = TRUE; ++ } + + retval = g_new0 (GnomeDesktopItem, 1); + diff --git a/gnome-desktop.spec b/gnome-desktop.spec index 616deff..6033fc2 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: 3 +Release: 4 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 @@ -24,6 +24,7 @@ BuildRoot: %{_tmppath}/%{name}-root Patch1: gnome-desktop-2.1.90-kdetheme.patch Patch2: gnome-desktop-2.9.91-desktop.patch +Patch3: gnome-desktop-2.10.0-init-i18n.patch Requires: redhat-artwork Requires: redhat-menus @@ -77,6 +78,7 @@ libgnomedesktop %patch1 -p1 -b .kdetheme %patch2 -p1 -b .menu +%patch3 -p1 -b .init-i18n cp -f %{SOURCE2} pixmaps/ cp -f %{SOURCE3} pixmaps/ @@ -132,6 +134,10 @@ rm -rf $RPM_BUILD_ROOT #%{_datadir}/gtk-doc %changelog +* Wed May 16 2005 Ray Strode - 2.10.0-4 +- run gettext initialization routines on startup (bug 155659) + (use right patch). + * Thu May 5 2005 Ray Strode - 2.10.0-3 - Revert previous patch--it was wrong(bug 155659).