Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging

1 files changed, 36 insertions, 0 deletions

diff --git a/mandriva/2010.2/kdepim/kdepim-3.5.4-korganizer-use-sys-timezone.patch b/mandriva/2010.2/kdepim/kdepim-3.5.4-korganizer-use-sys-timezone.patch
new file mode 100644
index 000000000..8ed14fd3a
--- /dev/null
+++ b/mandriva/2010.2/kdepim/kdepim-3.5.4-korganizer-use-sys-timezone.patch
@@ -0,0 +1,36 @@
+--- kdepim-3.5.4/korganizer/koprefsdialog.cpp--	2006-07-27 19:50:56.000000000 +0200
++++ kdepim-3.5.4/korganizer/koprefsdialog.cpp	2006-07-27 19:58:12.000000000 +0200
+@@ -193,13 +193,27 @@ class KOPrefsDialogTime : public KPrefsM
+            pclose(f);
+           }
+     #else
+-      if((f = fopen("/etc/timezone", "r")) != NULL) {
+-        // get the currently set timezone
+-        fgets(tempstring, 100, f);
+-        tempstring[strlen(tempstring) - 1] = '\0';
+-        sCurrentlySet = TQString(tempstring);
+-        fclose(f);
++    TQFile file( "/etc/sysconfig/clock" );
++    if( file.exists())
++    {
++        TQString line;
++        if ( file.open( IO_ReadOnly ) ) {
++            TQTextStream stream( &file );
++            while ( !stream.atEnd() )
++            {
++                line = stream.readLine(); // line of text excluding '\n'
++                if( line.contains("ZONE")!=0)
++                {
++                    line = line.remove("ZONE=");
++                    break;
++                }
++            }
++            file.close();
++            }
++        if(!line.isEmpty())
++            sCurrentlySet = line;
+       }
++
+     #endif // !USE_SOLARIS
+ 
+       mTimeZoneCombo->insertItem(i18n("[No selection]"));