|
 |
b5cc75 |
diff --git a/kcontrol/dateandtime/helper.h b/kcontrol/dateandtime/helper.h
|
|
|
b5cc75 |
index 1cbf103..7a20496 100644
|
|
|
b5cc75 |
--- a/kcontrol/dateandtime/helper.h
|
|
|
b5cc75 |
+++ b/kcontrol/dateandtime/helper.h
|
|
|
b5cc75 |
@@ -47,6 +47,8 @@ class ClockHelper : public QObject
|
|
|
b5cc75 |
int date(const QString& newdate, const QString& olddate);
|
|
|
b5cc75 |
int tz(const QString& selectedzone);
|
|
|
b5cc75 |
int tzreset();
|
|
|
b5cc75 |
+
|
|
|
b5cc75 |
+ void toHwclock();
|
|
|
b5cc75 |
};
|
|
|
b5cc75 |
|
|
|
b5cc75 |
#endif // CLOCK_HELPER_H
|
|
|
b5cc75 |
--
|
|
|
b5cc75 |
1.8.3.1
|
|
|
b5cc75 |
|
|
|
b5cc75 |
From 80f2c60ba59db71d4fc40170cdc561f9136690cc Mon Sep 17 00:00:00 2001
|
|
|
b5cc75 |
From: Martin Briza <mbriza@redhat.com>
|
|
|
b5cc75 |
Date: Mon, 7 Oct 2013 14:53:00 +0200
|
|
|
b5cc75 |
Subject: [PATCH] kcontrol/dateandtime: Propagate NTP clock to hwclock, too
|
|
|
b5cc75 |
|
|
|
b5cc75 |
---
|
|
|
b5cc75 |
kcontrol/dateandtime/helper.cpp | 15 +++++++++++----
|
|
|
b5cc75 |
kcontrol/dateandtime/helper.h | 2 ++
|
|
|
b5cc75 |
2 files changed, 13 insertions(+), 4 deletions(-)
|
|
|
b5cc75 |
|
|
|
b5cc75 |
diff --git a/kcontrol/dateandtime/helper.cpp b/kcontrol/dateandtime/helper.cpp
|
|
|
b5cc75 |
index 9168db3..d2473a5 100644
|
|
|
b5cc75 |
--- a/kcontrol/dateandtime/helper.cpp
|
|
|
b5cc75 |
+++ b/kcontrol/dateandtime/helper.cpp
|
|
|
b5cc75 |
@@ -82,6 +82,8 @@ int ClockHelper::ntp( const QStringList& ntpServers, bool ntpEnabled,
|
|
|
b5cc75 |
proc << ntpUtility << timeServer;
|
|
|
b5cc75 |
if ( proc.execute() != 0 ) {
|
|
|
b5cc75 |
ret |= NTPError;
|
|
|
b5cc75 |
+ } else {
|
|
|
b5cc75 |
+ toHwclock();
|
|
|
b5cc75 |
}
|
|
|
b5cc75 |
} else if( ntpEnabled ) {
|
|
|
b5cc75 |
ret |= NTPError;
|
|
|
b5cc75 |
@@ -100,10 +102,7 @@ int ClockHelper::date( const QString& newdate, const QString& olddate )
|
|
|
b5cc75 |
return DateError;
|
|
|
b5cc75 |
}
|
|
|
b5cc75 |
|
|
|
b5cc75 |
- QString hwclock = KStandardDirs::findExe("hwclock", exePath);
|
|
|
b5cc75 |
- if (!hwclock.isEmpty()) {
|
|
|
b5cc75 |
- KProcess::execute(hwclock, QStringList() << "--systohc");
|
|
|
b5cc75 |
- }
|
|
|
b5cc75 |
+ toHwclock();
|
|
|
b5cc75 |
return 0;
|
|
|
b5cc75 |
}
|
|
|
b5cc75 |
|
|
|
b5cc75 |
@@ -215,6 +214,14 @@ int ClockHelper::tzreset()
|
|
|
b5cc75 |
return 0;
|
|
|
b5cc75 |
}
|
|
|
b5cc75 |
|
|
|
b5cc75 |
+void ClockHelper::toHwclock()
|
|
|
b5cc75 |
+{
|
|
|
b5cc75 |
+ QString hwclock = KStandardDirs::findExe("hwclock", exePath);
|
|
|
b5cc75 |
+ if (!hwclock.isEmpty()) {
|
|
|
b5cc75 |
+ KProcess::execute(hwclock, QStringList() << "--systohc");
|
|
|
b5cc75 |
+ }
|
|
|
b5cc75 |
+}
|
|
|
b5cc75 |
+
|
|
|
b5cc75 |
ActionReply ClockHelper::save(const QVariantMap &args)
|
|
|
b5cc75 |
{
|
|
|
b5cc75 |
bool _ntp = args.value("ntp").toBool();
|