[Xfce4-commits] <terminal:master> Don't set translation domain when libxfce4util is new enough.

[Nick Schermer]

Updating branch refs/heads/master
         to 07af38bf454e6b161114f0cd7da9b115df6e81f5 (commit)
       from 92ddac4ef97890f73d3616076452439f488ae007 (commit)

commit 07af38bf454e6b161114f0cd7da9b115df6e81f5
Author: Nick Schermer <nick at xfce.org>
Date:   Tue Feb 9 13:19:47 2010 +0100

    Don't set translation domain when libxfce4util is new enough.

 terminal/terminal-preferences-dialog.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/terminal/terminal-preferences-dialog.c b/terminal/terminal-preferences-dialog.c
index 5be77c9..c84c753 100644
--- a/terminal/terminal-preferences-dialog.c
+++ b/terminal/terminal-preferences-dialog.c
@@ -100,10 +100,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 */
+#if !LIBXFCE4UTIL_CHECK_VERSION (4, 7, 2)
+  /* restore the default translation domain. this is broken by libxfce4util
+   * < 4.7.2, after calling XFCE_LICENSE_GPL. see bug #5842. */
   xfce_textdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR, "UTF-8");
+#endif
 
   /* hack to initialize the XfceTitledDialog class */
   if (xfce_titled_dialog_get_type () == 0)