From c9a334c9743d37d248befbd2bbe37b05f7aad7db Mon Sep 17 00:00:00 2001
From: jesus <jesus@lazarus-ide.org>
Date: Sun, 5 Apr 2009 00:36:04 +0000
Subject: [PATCH] LazReport, check that we are under a KDE session before to
 handle KDE locale specifics

git-svn-id: trunk@19225 -
---
 components/lazreport/source/lazreport.lpk    |  6 +++++-
 components/lazreport/source/lazreport.pas    |  3 ++-
 components/lazreport/source/sysutilsadds.pas | 12 +++++++-----
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/components/lazreport/source/lazreport.lpk b/components/lazreport/source/lazreport.lpk
index 1114bfa0f7..4b6f7bb351 100644
--- a/components/lazreport/source/lazreport.lpk
+++ b/components/lazreport/source/lazreport.lpk
@@ -27,7 +27,7 @@ Lazarus Port: Olivier Guilbaud, Jesus Reyes A.
 See license.txt and license-lazreport.txt for details.
 "/>
     <Version Minor="9" Release="5"/>
-    <Files Count="54">
+    <Files Count="55">
       <Item1>
         <Filename Value="lr_class.pas"/>
         <UnitName Value="LR_Class"/>
@@ -245,6 +245,10 @@ See license.txt and license-lazreport.txt for details.
         <Filename Value="lr_iflds.pas"/>
         <UnitName Value="LR_IFlds"/>
       </Item54>
+      <Item55>
+        <Filename Value="sysutilsadds.pas"/>
+        <UnitName Value="SysUtilsAdds"/>
+      </Item55>
     </Files>
     <i18n>
       <EnableI18N Value="True"/>
diff --git a/components/lazreport/source/lazreport.pas b/components/lazreport/source/lazreport.pas
index ae1d668333..29b55e85ce 100644
--- a/components/lazreport/source/lazreport.pas
+++ b/components/lazreport/source/lazreport.pas
@@ -10,7 +10,8 @@ uses
   LR_Class, LR_Desgn, LR_Register, LR_Flds, LR_DBSet, LR_BarC, LR_BndEd,
   LR_PGrid, LR_View, lr_expres, lr_funct_editor_unit, lr_funct_editor_unit1, 
   LR_Prntr, LR_Edit, LR_Pars, LR_fmted, LR_Const, LR_pgopt, LR_Dopt, LR_GEdit, 
-  LR_Utils, LR_GrpEd, lr_propedit, LR_progr, LR_IFlds, LazarusPackageIntf;
+  LR_Utils, LR_GrpEd, lr_propedit, LR_progr, LR_IFlds, SysUtilsAdds,
+  LazarusPackageIntf;
 
 implementation
 
diff --git a/components/lazreport/source/sysutilsadds.pas b/components/lazreport/source/sysutilsadds.pas
index e27a18099e..06026ab1aa 100644
--- a/components/lazreport/source/sysutilsadds.pas
+++ b/components/lazreport/source/sysutilsadds.pas
@@ -179,14 +179,16 @@ Var i      : Integer;
 
 begin
 
-  DFMT := ShortDateFormat; //nl_langinfo(D_FMT)
-  TFMT := ShortTimeFormat; //nl_langinfo(T_FMT)
-  TFMTAP := LongTimeFormat; //nl_langinfo(T_FMT_AMPM)
-
+  //GNOME: GNOME_DESKTOP_SESSION_ID
   //KDE config
-  if DirectoryExistsUTF8(ExpandFileNameUTF8('~/.kde/share/config')) then
+  if (GetEnvironmentVariable('KDE_FULL_SESSION')<>'') and
+     (DirectoryExistsUTF8(ExpandFileNameUTF8('~/.kde/share/config'))) then
   begin
 
+    DFMT := ShortDateFormat; //nl_langinfo(D_FMT)
+    TFMT := ShortTimeFormat; //nl_langinfo(T_FMT)
+    TFMTAP := LongTimeFormat; //nl_langinfo(T_FMT_AMPM)
+
     Lg:=Copy(GetEnvironmentVariableUTF8('LANG'),1,2); //Langue
     LstKde:=TStringList.Create;
     try