rpms/Terminal/devel Terminal-0.4.2-set-correct-gettext-domain.patch, NONE, 1.1 Terminal.spec, 1.32, 1.33

[Christoph Wickert]

Author: cwickert

Update of /cvs/pkgs/rpms/Terminal/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19310

Modified Files:
	Terminal.spec 
Added Files:
	Terminal-0.4.2-set-correct-gettext-domain.patch 
Log Message:
* Thu Oct 08 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.2-2
- Fix locale problems in the UI (bugzilla.xfce.org #5842)


Terminal-0.4.2-set-correct-gettext-domain.patch:
 terminal-preferences-dialog.c |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

--- NEW FILE Terminal-0.4.2-set-correct-gettext-domain.patch ---
>From 5c955bb0435dca6d7114903d246cf2e4a215cc5e Mon Sep 17 00:00:00 2001
From: Nick Schermer <nick at xfce.org>
Date: Thu, 08 Oct 2009 09:44:36 +0000
Subject: Set the correct translation domain before reading the ui file (bug #5842).

---
diff --git a/terminal/terminal-preferences-dialog.c b/terminal/terminal-preferences-dialog.c
index 7836032..c3bc2cf 100644
--- a/terminal/terminal-preferences-dialog.c
+++ b/terminal/terminal-preferences-dialog.c
@@ -101,6 +101,11 @@ terminal_preferences_dialog_init (TerminalPreferencesDialog *dialog)
 
   dialog->preferences = terminal_preferences_get ();
 
+  /* make sure the correct translation domain is set, since other programs
+   * could reset it, like for example the XFCE_LICENSE_GPL in terminal-dialogs.c,
+   * see http://bugzilla.xfce.org/show_bug.cgi?id=5842 */
+  xfce_textdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR, "UTF-8");
+
   /* hack to initialize the XfceTitledDialog class */
   if (xfce_titled_dialog_get_type () == 0)
     return;
--
cgit v0.8.2.1


Index: Terminal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Terminal/devel/Terminal.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- Terminal.spec	6 Oct 2009 21:39:19 -0000	1.32
+++ Terminal.spec	8 Oct 2009 10:16:29 -0000	1.33
@@ -1,10 +1,13 @@
 Summary: X Terminal Emulator
 Name: Terminal
 Version: 0.4.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 URL: http://www.xfce.org/projects/terminal/
 Source0:  http://archive.xfce.org/src/apps/terminal/0.4/Terminal-%{version}.tar.bz2
+# http://bugzilla.xfce.org/show_bug.cgi?id=5842 was fixed with
+# http://git.xfce.org/apps/terminal/commit/?id=5c955bb0435dca6d7114903d246cf2e4a215cc5e
+Patch0: Terminal-0.4.2-set-correct-gettext-domain.patch
 Group: User Interface/Desktops
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: vte-devel >= 0.17.1
@@ -22,6 +25,7 @@ it unique among X terminal emulators. 
 
 %prep
 %setup -q
+%patch0 -p1 -b .orig
 
 %build
 %configure
@@ -68,6 +72,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_libexecdir}/TerminalHelp
 
 %changelog
+* Thu Oct 08 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.2-2
+- Fix locale problems in the UI (bugzilla.xfce.org #5842)
+
 * Tue Oct 06 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.2-1
 - Update to 0.4.2
 - Update icon cache scriptlets